diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml
index a5cb897..728b67d 100644
--- a/.forgejo/workflows/build.yaml
+++ b/.forgejo/workflows/build.yaml
@@ -50,7 +50,3 @@ 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
new file mode 100644
index 0000000..f685492
--- /dev/null
+++ b/.forgejo/workflows/delete.yaml
@@ -0,0 +1,32 @@
+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 8fef05d..db43a60 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -1,7 +1,10 @@
 name: deploy
 
 on:
-  workflow_call:
+  workflow_run:
+    workflows: [build]
+    types:
+      - completed
   workflow_dispatch:
 
 jobs:
diff --git a/EdgeConnectConfig.yaml b/EdgeConnectConfig.yaml
index 4c3fe02..931f029 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:
-    - organization: "dev-framework"
-      region: "EU"
+    - region: "EU"
       cloudletOrg: "TelekomOP"
       cloudletName: "Munich"
       flavorName: "EU.small"