diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml
index 728b67d..3d1a205 100644
--- a/.forgejo/workflows/build.yaml
+++ b/.forgejo/workflows/build.yaml
@@ -26,9 +26,6 @@ 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
diff --git a/.forgejo/workflows/createapp.yaml b/.forgejo/workflows/createapp.yaml
new file mode 100644
index 0000000..beb83a6
--- /dev/null
+++ b/.forgejo/workflows/createapp.yaml
@@ -0,0 +1,136 @@
+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  
+
+env:
+  EDGEXR_PLATFORM_USERNAME: ${{ secrets.EDGEXR2_PLATFORM_USERNAME }}
+  EDGEXR_PLATFORM_PASSWORD: ${{ secrets.EDGEXR2_PLATFORM_PASSWORD }}
+  APP_REGION: ${{ inputs.a_app_region }}
+  APP_FLAVOR: ${{ inputs.b_app_flavor }}
+  CLOUDLET: ${{ inputs.c_cloudlet }}
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+
+    steps:
+      -
+        name: Repository meta
+        id: repository
+        run: |
+          registry=${{ github.server_url }}
+          registry=${registry##http*://}
+          echo "registry=${registry}" >> "$GITHUB_OUTPUT"
+          echo "registry=${registry}"
+          repository="$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')"
+          echo "repository=${repository}" >> "$GITHUB_OUTPUT"
+          echo "repository=${repository}"
+      -
+        name: Docker meta
+        uses: docker/metadata-action@v5
+        id: docker
+        with:
+          images: ${{ steps.repository.outputs.registry }}/${{ steps.repository.outputs.repository }}
+      - 
+        name: Install Dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y curl jq
+      -
+        name: Create Edge Connect App
+        run: |
+          set -e
+          echo login 
+          EDGEXR_TOKEN="$(curl -X POST https://mc.orca.platform.mg3.mdb.osc.live/api/v1/login -H 'Content-Type: application/json' --data '{"password": "'${EDGEXR_PLATFORM_PASSWORD}'","username": "'${EDGEXR_PLATFORM_USERNAME}'"}' -sSf | jq -r .token)"
+
+          CREATEAPP_JSON=$(cat <<EOF
+          {
+            "region": "${APP_REGION}",
+            "app": {
+              "key": {
+                "organization": "dev-framework",
+                "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')",
+                "version": "${{ steps.docker.outputs.version }}"
+              },
+              "deployment": "kubernetes",
+              "image_type": "Docker",
+              "image_path": "${{ steps.repository.outputs.registry }}/${{ steps.repository.outputs.repository }}:${{ steps.docker.outputs.version }}",
+              "allow_serverless": true,
+              "defaultFlavor": {
+                "name": "${APP_FLAVOR}"
+              },
+              "serverless_config": {},
+              "deployment_generator": "kubernetes-basic", 
+              "deployment_manifest": "apiVersion: v1\nkind: Service\nmetadata:\n  name: $(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')-tcp\n  labels:\n    run: $(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')\nspec:\n  type: LoadBalancer\n  ports:\n  - name: tcp80\n    protocol: TCP\n    port: 80\n    targetPort: 80\n  selector:\n    run: $(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')\n---\napiVersion: apps/v1\nkind: Deployment\nmetadata:\n  name: $(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')-deployment\nspec:\n  replicas: 1\n  selector:\n    matchLabels:\n      run: $(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')\n  template:\n    metadata:\n      labels:\n        run: $(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')\n        mexDeployGen: kubernetes-basic\n    spec:\n      volumes:\n      containers:\n      - name: $(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')\n        image: ${{ steps.repository.outputs.registry }}/${{ steps.repository.outputs.repository }}:${{ steps.docker.outputs.version }}\n        imagePullPolicy: Always\n        ports:\n        - containerPort: 80\n          protocol: TCP\n\n"
+            }
+          }
+          EOF
+          )
+
+          echo $CREATEAPP_JSON
+
+          echo create app
+          curl -X POST https://mc.orca.platform.mg3.mdb.osc.live/api/v1/auth/ctrl/CreateApp -H 'Content-Type: application/json' -H "Authorization: Bearer $EDGEXR_TOKEN" -S --data "$CREATEAPP_JSON" --fail-with-body
+      -
+        name: Create Edge Connect App Instance
+        run: |
+          set -e
+          EDGEXR_TOKEN="$(curl -X POST https://mc.orca.platform.mg3.mdb.osc.live/api/v1/login -H 'Content-Type: application/json' --data '{"password": "'${EDGEXR_PLATFORM_PASSWORD}'","username": "'${EDGEXR_PLATFORM_USERNAME}'"}' -sSf | jq -r .token)"
+
+          CREATEAPPINSTANCE_JSON=$(cat <<EOF
+          {
+            "region": "${APP_REGION}",
+            "appinst": {
+              "key": {
+                "organization": "dev-framework",
+                "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')-instance",
+                "cloudlet_key": {
+                  "organization": "TelekomOP",
+                  "name": "${CLOUDLET}"
+                }
+              },
+              "app_key": {
+                "organization": "dev-framework",
+                "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')",
+                "version": "${{ steps.docker.outputs.version }}"
+              },
+              "flavor": {
+                "name": "${APP_FLAVOR}"
+              }
+            }
+          }
+          EOF
+          )
+
+          echo $CREATEAPPINSTANCE_JSON
+
+          echo create app instance
+          curl -X POST https://mc.orca.platform.mg3.mdb.osc.live/api/v1/auth/ctrl/CreateAppInst -H 'Content-Type: application/json' -H "Authorization: Bearer $EDGEXR_TOKEN" -S --data "$CREATEAPPINSTANCE_JSON" --fail-with-body
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/deleteapp.yaml b/.forgejo/workflows/deleteapp.yaml
new file mode 100644
index 0000000..3c721d2
--- /dev/null
+++ b/.forgejo/workflows/deleteapp.yaml
@@ -0,0 +1,116 @@
+name: deleteapp
+
+on:
+  workflow_dispatch:
+    inputs:
+      a_app_region:
+        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:
+    runs-on: ubuntu-22.04
+
+    steps:
+      -
+        name: Repository meta
+        id: repository
+        run: |
+          registry=${{ github.server_url }}
+          registry=${registry##http*://}
+          echo "registry=${registry}" >> "$GITHUB_OUTPUT"
+          echo "registry=${registry}"
+          repository="$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')"
+          echo "repository=${repository}" >> "$GITHUB_OUTPUT"
+          echo "repository=${repository}"
+      -
+        name: Docker meta
+        uses: docker/metadata-action@v5
+        id: docker
+        with:
+          images: ${{ steps.repository.outputs.registry }}/${{ steps.repository.outputs.repository }}
+      - 
+        name: Install Dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y curl jq
+      -
+        name: Delete Edge Connect App Instance
+        run: |
+          set -e
+          echo login 
+          EDGEXR_TOKEN="$(curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/login -H 'Content-Type: application/json' --data '{"password": "'${EDGEXR_PLATFORM_PASSWORD}'","username": "'${EDGEXR_PLATFORM_USERNAME}'"}' -sSf | jq -r .token)"
+
+          DELETEAPPINSTANCE_JSON=$(cat <<EOF
+          {
+            "region": "${APP_REGION}",
+            "appinst": {
+              "key": {
+                "organization": "edp-developer-framework",
+                "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')-instance",
+                "cloudlet_key": {
+                  "organization": "TelekomOP",
+                  "name": "${CLOUDLET}"
+                }
+              },
+              "app_key": {
+                "organization": "edp-developer-framework",
+                "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')",
+                "version": "${{ steps.docker.outputs.version }}"
+              }
+            }
+          }
+          EOF
+          )
+
+          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 || true
+      -
+        name: Delete Edge Connect App
+        run: |
+          set -e
+          echo login 
+          EDGEXR_TOKEN="$(curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/login -H 'Content-Type: application/json' --data '{"password": "'${EDGEXR_PLATFORM_PASSWORD}'","username": "'${EDGEXR_PLATFORM_USERNAME}'"}' -sSf | jq -r .token)"
+
+          DELETEAPP_JSON=$(cat <<EOF
+          {
+            "App": {
+              "key": {
+                "organization": "edp-developer-framework",
+                "name": "$(echo ${{ steps.repository.outputs.repository }} | sed -e 's|^.*/||')",
+                "version": "${{ steps.docker.outputs.version }}"
+              }
+            },
+            "Region": "${APP_REGION}"
+          }
+          EOF
+          )
+
+          echo $DELETEAPP_JSON
+
+          echo delete app
+          curl -X POST https://hub.apps.edge.platform.mg3.mdb.osc.live/api/v1/auth/ctrl/DeleteApp -H 'Content-Type: application/json' -H "Authorization: Bearer $EDGEXR_TOKEN" -S --data "$DELETEAPP_JSON" --fail-with-body
diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
deleted file mode 100644
index db43a60..0000000
--- a/.forgejo/workflows/deploy.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: deploy
-
-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: Deploy action
-        uses: https://edp.buildth.ing/DevFW-CICD/edge-connect-deploy-action@main
-        id: deploy
-        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/EdgeConnectConfig.yaml b/EdgeConnectConfig.yaml
deleted file mode 100644
index 931f029..0000000
--- a/EdgeConnectConfig.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Is there a swagger file for the new EdgeConnect API?
-# How does it differ from the EdgeXR API?
-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:
-    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"
-      cloudletOrg: "TelekomOP"
-      cloudletName: "Munich"
-      flavorName: "EU.small"
-  network:
-    outboundConnections:
-      - protocol: "tcp"
-        portRangeMin: 80
-        portRangeMax: 80
-        remoteCIDR: "0.0.0.0/0"
-      - protocol: "tcp"
-        portRangeMin: 443
-        portRangeMax: 443
-        remoteCIDR: "0.0.0.0/0"
diff --git a/k8s-deployment.yaml b/k8s-deployment.yaml
deleted file mode 100644
index 15dd6d6..0000000
--- a/k8s-deployment.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: edgeconnect-coder-tcp
-  labels:
-    run: edgeconnect-coder
-spec:
-  type: LoadBalancer
-  ports:
-    - name: tcp80
-      protocol: TCP
-      port: 80
-      targetPort: 80
-  selector:
-    run: edgeconnect-coder
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: edgeconnect-coder-deployment
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      run: edgeconnect-coder
-  template:
-    metadata:
-      labels:
-        run: edgeconnect-coder
-        mexDeployGen: kubernetes-basic
-    spec:
-      volumes:
-      containers:
-        - name: edgeconnect-coder
-          image: ###IMAGETAG###
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 80
-              protocol: TCP