diff --git a/.forgejo/workflows/createaction.yaml b/.forgejo/workflows/createaction.yaml
new file mode 100644
index 0000000..6405403
--- /dev/null
+++ b/.forgejo/workflows/createaction.yaml
@@ -0,0 +1,47 @@
+name: createapp
+
+on:
+  workflow_dispatch:
+    inputs:
+      a_app_region:
+        type: string
+        description: "Application Region e.g. EU"
+        default: EU
+        required: true  
+      b_app_flavor:
+        type: string
+        description: "Application Flavor e.g. EU.small"
+        default: EU.small    
+        required: true  
+      c_cloudlet:
+        type: choice
+        options:
+          - Amsterdam-OTC
+          - Hamburg
+          - Leipzig
+          - Munich
+          - Berlin
+          - Frankfurt
+          - Magdeburg-OTC
+          - Bonn
+          - Magdeburg
+          - crm-vm-2
+        description: "Cloudlet location"
+        default: Munich
+        required: true  
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+
+    steps:
+      -
+        name: Deploy action
+        uses: https://edp.buildth.ing/DevFW-CICD/edge-connect-action/deploy@main
+        id: deploy
+        with:
+          region: ${{ inputs.a_app_region }}
+          flavor: ${{ inputs.b_app_flavor }}
+          cloudlet: ${{ inputs.c_cloudlet }}
+          edgexr_platform_username: ${{ secrets.EDGEXR_PLATFORM_USERNAME }}
+          edgexr_platform_password: ${{ secrets.EDGEXR_PLATFORM_PASSWORD }}
diff --git a/.forgejo/workflows/createapp.yaml b/.forgejo/workflows/createapp.yaml
index cc6fcf2..52dbab8 100644
--- a/.forgejo/workflows/createapp.yaml
+++ b/.forgejo/workflows/createapp.yaml
@@ -25,6 +25,7 @@ on:
           - Magdeburg-OTC
           - Bonn
           - Magdeburg
+          - crm-vm-2
         description: "Cloudlet location"
         default: Munich
         required: true  
@@ -75,7 +76,7 @@ jobs:
             "region": "${APP_REGION}",
             "app": {
               "key": {
-                "organization": "edp-developer-framework",
+                "organization": "dev-framework",
                 "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')",
                 "version": "${{ steps.docker.outputs.version }}"
               },
@@ -109,7 +110,7 @@ jobs:
             "region": "${APP_REGION}",
             "appinst": {
               "key": {
-                "organization": "edp-developer-framework",
+                "organization": "dev-framework",
                 "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')-instance",
                 "cloudlet_key": {
                   "organization": "TelekomOP",
@@ -117,7 +118,7 @@ jobs:
                 }
               },
               "app_key": {
-                "organization": "edp-developer-framework",
+                "organization": "dev-framework",
                 "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')",
                 "version": "${{ steps.docker.outputs.version }}"
               },
diff --git a/.forgejo/workflows/deleteapp.yaml b/.forgejo/workflows/deleteapp.yaml
index f132c86..3c721d2 100644
--- a/.forgejo/workflows/deleteapp.yaml
+++ b/.forgejo/workflows/deleteapp.yaml
@@ -7,11 +7,27 @@ on:
         type: string
         description: "Application Region e.g. EU"
         default: EU  
+      b_cloudlet:
+        type: choice
+        options:
+          - Amsterdam-OTC
+          - Hamburg
+          - Leipzig
+          - Munich
+          - Berlin
+          - Frankfurt
+          - Magdeburg-OTC
+          - Bonn
+          - Magdeburg
+        description: "Cloudlet e.g. EU.small"
+        default: Munich
+        required: true  
 
 env:
   EDGEXR_PLATFORM_USERNAME: ${{ secrets.EDGEXR_PLATFORM_USERNAME }}
   EDGEXR_PLATFORM_PASSWORD: ${{ secrets.EDGEXR_PLATFORM_PASSWORD }}
   APP_REGION: ${{ inputs.a_app_region }}
+  CLOUDLET: ${{ inputs.b_cloudlet }}
 
 jobs:
   build:
@@ -53,7 +69,11 @@ jobs:
             "appinst": {
               "key": {
                 "organization": "edp-developer-framework",
-                "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')-instance"
+                "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')-instance",
+                "cloudlet_key": {
+                  "organization": "TelekomOP",
+                  "name": "${CLOUDLET}"
+                }
               },
               "app_key": {
                 "organization": "edp-developer-framework",
@@ -68,7 +88,7 @@ jobs:
           echo $DELETEAPPINSTANCE_JSON
 
           echo delete app instance
-          curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/ctrl/DeleteAppInst -H 'Content-Type: application/json' -H "Authorization: Bearer $EDGEXR_TOKEN" -S --data "$DELETEAPPINSTANCE_JSON" --fail-with-body
+          curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/ctrl/DeleteAppInst -H 'Content-Type: application/json' -H "Authorization: Bearer $EDGEXR_TOKEN" -S --data "$DELETEAPPINSTANCE_JSON" --fail-with-body || true
       -
         name: Delete Edge Connect App
         run: |