diff --git a/.github/workflows/deploy-helm-chart.yml b/.github/workflows/deploy-helm-chart.yml
deleted file mode 100644
index 5649b1c..0000000
--- a/.github/workflows/deploy-helm-chart.yml
+++ /dev/null
@@ -1,95 +0,0 @@
-name: Deploy Helm Chart on JK-Cluster
-on:
-  workflow_dispatch:
-    inputs:
-      chart-version:
-        required: true
-        type: string
-        description: "version of the helm chart to be deployed"
-      deployment-identifier:
-        required: true
-        type: choice
-        description: "identifier of the helm deployment"
-        options:
-          - zipline
-          - calibre-web-automated
-          - cluster-tika
-          - cluster-smb
-          - teamspeak-server
-          - urlaubsverwaltung-petrus-kh
-          - cluster-gotenberg
-          - homeassistant
-          - satisfactory
-          - cyberchef
-          - matrix-synapse
-  workflow_call:
-    inputs:
-      chart-version:
-        required: true
-        type: string
-      deployment-identifier:
-        required: true
-        type: string
-    secrets:
-      OP_CONNECT_TOKEN:
-        required: true
-jobs:
-  deploy-helm-chart:
-    runs-on: ubuntu-latest
-    environment: jk-cluster
-    steps:
-      - name: "Install Helm"
-        uses: azure/setup-helm@v4
-      - name: "Configure OP-Connect"
-        uses: 1password/load-secrets-action/configure@v2
-        with:
-          connect-host: https://op-connect.jk-dev.de
-      - name: "Load Cluster-Config Checkout Credentials"
-        uses: 1password/load-secrets-action@v2
-        env:
-          OP_CONNECT_TOKEN: ${{ secrets.OP_CONNECT_TOKEN }}
-          GH_CC_CHECKOUT_TOKEN: op://GitHub-Actions/github-cluster-config-checkout-token/credential
-      - name: "Checkout Repository"
-        uses: actions/checkout@v2
-        with:
-          repository: 'MeepMr/cluster-config'
-          token: '${{ env.GH_CC_CHECKOUT_TOKEN }}'
-      - name: "Load Deployment-Information"
-        uses: 1password/load-secrets-action@v2
-        env:
-          OP_CONNECT_TOKEN: ${{ secrets.OP_CONNECT_TOKEN }}
-          DEPLOYMENT_NAME: op://GitHub-Actions/deployment-infos-${{ inputs.deployment-identifier }}/deployment-name
-          DEPLOYMENT_NAMESPACE: op://GitHub-Actions/deployment-infos-${{ inputs.deployment-identifier }}/namespace
-          DEPLOYMENT_VALUES_FILE: op://GitHub-Actions/deployment-infos-${{ inputs.deployment-identifier }}/values-file
-          CHART_NAME: op://GitHub-Actions/deployment-infos-${{ inputs.deployment-identifier }}/chart-name
-          DEPLOYMENT_CONFIG_DIR: op://GitHub-Actions/deployment-infos-${{ inputs.deployment-identifier }}/config-dir
-      - name: "Load KubeConfig-Information"
-        uses: 1password/load-secrets-action@v2
-        env:
-          OP_CONNECT_TOKEN: ${{ secrets.OP_CONNECT_TOKEN }}
-          CLUSTER_URL: op://GitHub-Actions/jk-cluster-upgrade-connection/cluster-url
-          CLUSTER_TOKEN: op://GitHub-Actions/jk-cluster-upgrade-connection/credential
-      - name: "Load Helm Registry Credentials"
-        id: load-jk-cr-creds
-        uses: 1password/load-secrets-action@v2
-        env:
-          OP_CONNECT_TOKEN: ${{ secrets.OP_CONNECT_TOKEN }}
-          JK_CR_TOKEN: op://GitHub-Actions/jk-registry-access/password
-          JK_CR_USERNAME: op://GitHub-Actions/jk-registry-access/username
-          JK_CR_CHARTS_LOCATION: op://GitHub-Actions/jk-registry-access/charts-location
-          JK_CR_HELM_REGISTRY: op://GitHub-Actions/jk-registry-access/helm-registry
-      - name: "Login to JK-Registry"
-        run: echo ${{ env.JK_CR_TOKEN }} | helm registry login ${{ env.JK_CR_HELM_REGISTRY }} -u ${{ env.JK_CR_USERNAME }} --password-stdin
-      - name: "Deploy Helm Chart"
-        run: |-
-          helm upgrade ${{ env.DEPLOYMENT_NAME }} oci://${{ env.JK_CR_HELM_REGISTRY }}/charts/${{ env.CHART_NAME }} \
-          --version ${{ inputs.chart-version }} \
-          --namespace ${{ env.DEPLOYMENT_NAMESPACE }} \
-          -f ${{ env.DEPLOYMENT_VALUES_FILE }} \
-          --kube-apiserver ${{ env.CLUSTER_URL }} \
-          --kube-token ${{ env.CLUSTER_TOKEN }} \
-          --wait
-        working-directory: ${{ env.DEPLOYMENT_CONFIG_DIR }}
-      - name: "Logout from JK-Registry"
-        run: helm registry logout ${{ env.JK_CR_HELM_REGISTRY }}
-
diff --git a/.github/workflows/publish-apache-tika.yml b/.github/workflows/publish-apache-tika.yml
index ee74bec..ba97629 100644
--- a/.github/workflows/publish-apache-tika.yml
+++ b/.github/workflows/publish-apache-tika.yml
@@ -11,11 +11,3 @@ jobs:
     with:
       chart-name: 'apache-tika'
     secrets: inherit
-  deploy-cluster-tika:
-    name: Deploy Cluster-Tika
-    needs: publish-apache-tika
-    uses: ./.github/workflows/deploy-helm-chart.yml
-    with:
-      deployment-identifier: 'cluster-tika'
-      chart-version: ${{ needs.publish-apache-tika.outputs.chart-version }}
-    secrets: inherit
diff --git a/.github/workflows/publish-calibre-web-automated.yml b/.github/workflows/publish-calibre-web-automated.yml
index 11c04be..32a3330 100644
--- a/.github/workflows/publish-calibre-web-automated.yml
+++ b/.github/workflows/publish-calibre-web-automated.yml
@@ -11,11 +11,3 @@ jobs:
     with:
       chart-name: 'calibre-web-automated'
     secrets: inherit
-  deploy-calibre-web-automated:
-    name: Deploy Calibre Web Automated Helm Chart
-    needs: publish-calibre-web-automated
-    uses: ./.github/workflows/deploy-helm-chart.yml
-    with:
-      deployment-identifier: 'calibre-web-automated'
-      chart-version: ${{ needs.publish-calibre-web-automated.outputs.chart-version }}
-    secrets: inherit
diff --git a/.github/workflows/publish-cyberchef.yml b/.github/workflows/publish-cyberchef.yml
index 7076e8c..39b526e 100644
--- a/.github/workflows/publish-cyberchef.yml
+++ b/.github/workflows/publish-cyberchef.yml
@@ -11,11 +11,3 @@ jobs:
     with:
       chart-name: 'cyberchef'
     secrets: inherit
-#  deploy-cyberchef:
-#    name: Deploy Cyberchef Helm Chart
-#    needs: publish-cyberchef
-#    uses: ./.github/workflows/deploy-helm-chart.yml
-#    with:
-#      deployment-identifier: 'cyberchef'
-#      chart-version: ${{ needs.publish-cyberchef.outputs.chart-version }}
-#    secrets: inherit
diff --git a/.github/workflows/publish-gotenberg.yml b/.github/workflows/publish-gotenberg.yml
index 349feb4..22f2677 100644
--- a/.github/workflows/publish-gotenberg.yml
+++ b/.github/workflows/publish-gotenberg.yml
@@ -11,11 +11,3 @@ jobs:
     with:
       chart-name: 'gotenberg'
     secrets: inherit
-  deploy-cluster-gotenberg:
-    name: Deploy Cluster-Gotenberg
-    needs: publish-gotenberg
-    uses: ./.github/workflows/deploy-helm-chart.yml
-    with:
-      deployment-identifier: 'cluster-gotenberg'
-      chart-version: ${{ needs.publish-gotenberg.outputs.chart-version }}
-    secrets: inherit
diff --git a/.github/workflows/publish-homeassistant.yml b/.github/workflows/publish-homeassistant.yml
index 819b98d..21db2b6 100644
--- a/.github/workflows/publish-homeassistant.yml
+++ b/.github/workflows/publish-homeassistant.yml
@@ -11,11 +11,3 @@ jobs:
     with:
       chart-name: 'homeassistant'
     secrets: inherit
-#  deploy-homeassistant-jk:
-#    name: Deploy Homeassistant JK Chart
-#    needs: publish-homeassistant
-#    uses: ./.github/workflows/deploy-helm-chart.yml
-#    with:
-#      deployment-identifier: 'homeassistant-jk'
-#      chart-version: ${{ needs.publish-homeassistant.outputs.chart-version }}
-#    secrets: inherit
diff --git a/.github/workflows/publish-matrix-synapse.yml b/.github/workflows/publish-matrix-synapse.yml
index 7c766d6..4f9c67b 100644
--- a/.github/workflows/publish-matrix-synapse.yml
+++ b/.github/workflows/publish-matrix-synapse.yml
@@ -11,11 +11,3 @@ jobs:
     with:
       chart-name: 'matrix-synapse'
     secrets: inherit
-#  deploy-matrix-synapse:
-#    name: Deploy Matrix Synapse Helm Chart
-#    needs: publish-matrix-synapse
-#    uses: ./.github/workflows/deploy-helm-chart.yml
-#    with:
-#      deployment-identifier: 'matrix-synapse'
-#      chart-version: ${{ needs.publish-matrix-synapse.outputs.chart-version }}
-#    secrets: inherit
diff --git a/.github/workflows/publish-samba.yml b/.github/workflows/publish-samba.yml
index d3b8546..d5363f2 100644
--- a/.github/workflows/publish-samba.yml
+++ b/.github/workflows/publish-samba.yml
@@ -11,11 +11,3 @@ jobs:
     with:
       chart-name: 'samba'
     secrets: inherit
-  deploy-samba:
-    name: Deploy Samba Helm Chart
-    needs: publish-samba
-    uses: ./.github/workflows/deploy-helm-chart.yml
-    with:
-      deployment-identifier: 'cluster-smb'
-      chart-version: ${{ needs.publish-samba.outputs.chart-version }}
-    secrets: inherit
diff --git a/.github/workflows/publish-satisfactory.yml b/.github/workflows/publish-satisfactory.yml
index 6212af7..5fbda78 100644
--- a/.github/workflows/publish-satisfactory.yml
+++ b/.github/workflows/publish-satisfactory.yml
@@ -11,11 +11,3 @@ jobs:
     with:
       chart-name: 'satisfactory'
     secrets: inherit
-#  deploy-satisfactory:
-#    name: Deploy Satisfactory Helm Chart
-#    needs: publish-satisfactory
-#    uses: ./.github/workflows/deploy-helm-chart.yml
-#    with:
-#      deployment-identifier: 'satisfactory'
-#      chart-version: ${{ needs.publish-satisfactory.outputs.chart-version }}
-#    secrets: inherit
diff --git a/.github/workflows/publish-teamspeak-server.yml b/.github/workflows/publish-teamspeak-server.yml
index e1ff79a..23b4260 100644
--- a/.github/workflows/publish-teamspeak-server.yml
+++ b/.github/workflows/publish-teamspeak-server.yml
@@ -11,11 +11,3 @@ jobs:
     with:
       chart-name: 'teamspeak-server'
     secrets: inherit
-  deploy-teamspeak-server:
-    name: Deploy TeamSpeak Server Helm Chart
-    needs: publish-teamspeak-server
-    uses: ./.github/workflows/deploy-helm-chart.yml
-    with:
-      deployment-identifier: 'teamspeak-server'
-      chart-version: ${{ needs.publish-teamspeak-server.outputs.chart-version }}
-    secrets: inherit
diff --git a/.github/workflows/publish-urlaubsverwaltung.yml b/.github/workflows/publish-urlaubsverwaltung.yml
index 2edace7..c960d61 100644
--- a/.github/workflows/publish-urlaubsverwaltung.yml
+++ b/.github/workflows/publish-urlaubsverwaltung.yml
@@ -11,11 +11,3 @@ jobs:
     with:
       chart-name: 'urlaubsverwaltung'
     secrets: inherit
-  deploy-urlaubsverwaltung-petrus-kh:
-    name: Deploy Urlaubsverwaltung Helm Chart
-    needs: publish-urlaubsverwaltung
-    uses: ./.github/workflows/deploy-helm-chart.yml
-    with:
-      deployment-identifier: 'urlaubsverwaltung-petrus-kh'
-      chart-version: ${{ needs.publish-urlaubsverwaltung.outputs.chart-version }}
-    secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/publish-zipline.yml b/.github/workflows/publish-zipline.yml
index 4b20568..a8c1bb7 100644
--- a/.github/workflows/publish-zipline.yml
+++ b/.github/workflows/publish-zipline.yml
@@ -11,11 +11,3 @@ jobs:
     with:
       chart-name: 'zipline'
     secrets: inherit
-  deploy-zipline:
-    name: Deploy Zipline Helm Chart
-    needs: publish-zipline
-    uses: ./.github/workflows/deploy-helm-chart.yml
-    with:
-      deployment-identifier: 'zipline'
-      chart-version: ${{ needs.publish-zipline.outputs.chart-version }}
-    secrets: inherit