diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml
index 3d1a205..a5cb897 100644
--- a/.forgejo/workflows/build.yaml
+++ b/.forgejo/workflows/build.yaml
@@ -26,6 +26,9 @@ jobs:
         id: docker
         with:
           images: ${{ steps.repository.outputs.registry }}/${{ steps.repository.outputs.repository }}
+          tags: |
+            type=sha,prefix=
+            type=ref,event=tag
       -
         name: Login to registry
         uses: docker/login-action@v3
@@ -47,3 +50,7 @@ jobs:
           allow: network.host
           network: host
           tags: ${{ steps.docker.outputs.tags }}
+
+      - name: Deploy
+        uses: ./.forgejo/workflows/deploy.yaml
+        if: startsWith(github.ref, 'refs/tags/v')
diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index aafe9c6..8fef05d 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -1,6 +1,7 @@
 name: deploy
 
 on:
+  workflow_call:
   workflow_dispatch:
 
 jobs:
@@ -11,6 +12,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Replace Image Version
+        run: |
+          sha="${{ github.sha }}"
+          shortSha="${sha:0:7}"
+          echo "Setting image version to: edp.buildth.ing/devfw-cicd/edgeconnect-action-demo:${shortSha}"
+          sed -i "s@###IMAGETAG###@edp.buildth.ing/devfw-cicd/edgeconnect-action-demo:${shortSha}@g" ./k8s-deployment.yaml
+
       - name: Deploy action
         uses: https://edp.buildth.ing/DevFW-CICD/edge-connect-deploy-action@main
         id: deploy
diff --git a/k8s-deployment.yaml b/k8s-deployment.yaml
index 348b6f8..15dd6d6 100644
--- a/k8s-deployment.yaml
+++ b/k8s-deployment.yaml
@@ -32,7 +32,7 @@ spec:
       volumes:
       containers:
         - name: edgeconnect-coder
-          image: nginx:latest
+          image: ###IMAGETAG###
           imagePullPolicy: Always
           ports:
             - containerPort: 80