diff --git a/.forgejo/workflows/delete.yaml b/.forgejo/workflows/delete.yaml
index 94e1cbb..f685492 100644
--- a/.forgejo/workflows/delete.yaml
+++ b/.forgejo/workflows/delete.yaml
@@ -1,39 +1,12 @@
 name: delete
 
 on:
+  workflow_run:
+    workflows: [build]
+    types:
+      - completed
   workflow_dispatch:
-    inputs:
-      a_name:
-        type: string
-        description: "App name to delete"
-        required: true
-        default: ""
-      b_appVersion:
-        type: string
-        description: "Version of the app to delete"
-        required: true
-        default: ""
-      c_org:
-        type: string
-        description: "Organization of the app to delete"
-        required: true
-        default: ""
-      d_region:
-        type: string
-        description: "Region of the app to delete"
-        required: true
-        default: ""
-      e_cloudletOrg:
-        type: string
-        description: "Cloudlet organization of the app to delete"
-        required: true
-        default: ""
-      f_cloudlet:
-        type: string
-        description: "Cloudlet of the app to delete"
-        required: true
-        default: ""
-  
+
 jobs:
   build:
     runs-on: ubuntu-22.04
@@ -42,16 +15,18 @@ 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: Delete action
         uses: https://edp.buildth.ing/DevFW-CICD/edge-connect-delete-action@main
         id: delete
         with:
-          name: ${{ inputs.a_name }}
-          appVersion: ${{ inputs.b_appVersion }}
-          org: ${{ inputs.c_org }}
-          region: ${{ inputs.d_region }}
-          cloudletOrg: ${{ inputs.e_cloudletOrg }}
-          cloudlet: ${{ inputs.f_cloudlet }}
+          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/EdgeConnectConfig.yaml b/EdgeConnectConfig.yaml
index 37bde30..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: "edp2"
-      region: "EU"
+    - region: "EU"
       cloudletOrg: "TelekomOP"
       cloudletName: "Munich"
       flavorName: "EU.small"