diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml
index 1f9ef14b..38ecb1fb 100644
--- a/.github/workflows/fileserver-container.yml
+++ b/.github/workflows/fileserver-container.yml
@@ -112,39 +112,3 @@ jobs:
           git add ./production/flowfuse-values.yaml
           git commit -m "Update file-server production image to ${{ needs.upload-production-image.outputs.image }}"
           git push origin main
-
-  deploy-stage:
-    # if: github.ref_name == 'main'
-    if: false
-    name: Deploy to staging environment
-    needs: build
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.37.0
-    with:
-      environment: stage
-      service_name: 'file-server'
-      deployment_name: 'flowforge-file'
-      container_name: 'file-storage'
-      image: ${{ needs.build.outputs.image }}
-    secrets:
-      aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      aws_secret_access_key: ${{ secrets.AWS_ACCESS_KEY_SECRET }}
-      temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
-      eks_cluster_name: ${{ secrets.EKS_CLUSTER_NAME }}
-
-  deploy-prod:
-    # if: github.ref_name == 'main'
-    if: false
-    name: Deploy to production environment
-    needs: [build, deploy-stage]
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.37.0
-    with:
-      environment: production
-      service_name: 'file-server'
-      deployment_name: 'flowforge-file'
-      container_name: 'file-storage'
-      image: ${{ needs.build.outputs.image }}
-    secrets:
-      aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      aws_secret_access_key: ${{ secrets.AWS_ACCESS_KEY_SECRET }}
-      temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
-      eks_cluster_name: ${{ secrets.EKS_CLUSTER_NAME }}
diff --git a/.github/workflows/flowforge-container.yml b/.github/workflows/flowforge-container.yml
index b8c0118c..6b144ccc 100644
--- a/.github/workflows/flowforge-container.yml
+++ b/.github/workflows/flowforge-container.yml
@@ -118,39 +118,3 @@ jobs:
           git add ./production/flowfuse-values.yaml
           git commit -m "Update forge production image to ${{ needs.upload-production-image.outputs.image }}"
           git push origin main
-  
-  deploy-stage:
-    # if: github.ref_name == 'main'
-    if: false
-    name: Deploy to staging environment
-    needs: build
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.37.0
-    with:
-      environment: stage
-      service_name: 'forge-k8s'
-      deployment_name: flowforge
-      container_name: forge
-      image: ${{ needs.build-multi-architecture.outputs.image }}
-    secrets:
-      aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      aws_secret_access_key: ${{ secrets.AWS_ACCESS_KEY_SECRET }}
-      temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
-      eks_cluster_name: ${{ secrets.EKS_CLUSTER_NAME }}
-  
-  deploy-prod:
-    # if: github.ref_name == 'main'
-    if: false
-    name: Deploy to production environment
-    needs: [build, deploy-stage]
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.37.0
-    with:
-      environment: production
-      service_name: 'forge-k8s'
-      deployment_name: flowforge
-      container_name: forge
-      image: ${{ needs.build-multi-architecture.outputs.image }}
-    secrets:
-      aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      aws_secret_access_key: ${{ secrets.AWS_ACCESS_KEY_SECRET }}
-      temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
-      eks_cluster_name: ${{ secrets.EKS_CLUSTER_NAME }}