diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml
index 728b67d..a5cb897 100644
--- a/.forgejo/workflows/build.yaml
+++ b/.forgejo/workflows/build.yaml
@@ -50,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/delete.yaml b/.forgejo/workflows/delete.yaml
deleted file mode 100644
index f685492..0000000
--- a/.forgejo/workflows/delete.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: delete
-
-on:
-  workflow_run:
-    workflows: [build]
-    types:
-      - completed
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-22.04
-
-    steps:
-      - 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: Delete action
-        uses: https://edp.buildth.ing/DevFW-CICD/edge-connect-delete-action@main
-        id: delete
-        with:
-          configFile: ./EdgeConnectConfig.yaml
-          baseUrl: https://hub.apps.edge.platform.mg3.mdb.osc.live
-          username: ${{ secrets.EDGEXR_PLATFORM_USERNAME }}
-          password: ${{ secrets.EDGEXR_PLATFORM_PASSWORD }}
diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index db43a60..8fef05d 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -1,10 +1,7 @@
 name: deploy
 
 on:
-  workflow_run:
-    workflows: [build]
-    types:
-      - completed
+  workflow_call:
   workflow_dispatch:
 
 jobs:
diff --git a/EdgeConnectConfig.yaml b/EdgeConnectConfig.yaml
index 931f029..4c3fe02 100644
--- a/EdgeConnectConfig.yaml
+++ b/EdgeConnectConfig.yaml
@@ -3,17 +3,17 @@
 kind: edgeconnect-deployment
 metadata:
   name: "edge-app-demo" # name could be used for appName
-  appVersion: "1.0.0"
-  organization: "edp2"
 spec:
   # dockerApp: # Docker is OBSOLETE
   #   appVersion: "1.0.0"
   #   manifestFile: "./docker-compose.yaml"
   #   image: "https://registry-1.docker.io/library/nginx:latest"
   k8sApp:
+    appVersion: "1.0.0"
     manifestFile: "./k8s-deployment.yaml" # store hash of the manifest file in annotation field. Annotations is a comma separated map of arbitrary key value pairs,
   infraTemplate:
-    - region: "EU"
+    - organization: "dev-framework"
+      region: "EU"
       cloudletOrg: "TelekomOP"
       cloudletName: "Munich"
       flavorName: "EU.small"