diff --git a/.github/workflows/fileserver-container.yml b/.github/workflows/fileserver-container.yml
index 1771531f..9a1cdc58 100644
--- a/.github/workflows/fileserver-container.yml
+++ b/.github/workflows/fileserver-container.yml
@@ -29,24 +29,23 @@ concurrency:
 jobs:
   build:
     name: Build single-architecture container images
-    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.33.0
     with:
       image_name: 'file-server'
       package_dependencies: |
-        @flowfuse/file-server
+        @flowfuse/file-server=nightly
       build_context: 'file-server'
       build_platform: "linux/amd64"
       npm_registry_url: ${{ vars.PUBLIC_NPM_REGISTRY_URL }}
       scan_image: false
     secrets:
-      npm_registry_auth_token: ${{ secrets.NPM_PUBLISH_TOKEN }}
       temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
 
   upload-stage-image:
     if: github.ref_name == 'main'
     name: Upload image to staging registry
     needs: build
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.33.0
     with:
       environment: stage
       service_name: 'file-server'
@@ -64,7 +63,7 @@ jobs:
     if: github.ref_name == 'main'
     name: Upload image to production registry
     needs: build
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.33.0
     with:
       environment: production
       service_name: 'file-server'
@@ -119,7 +118,7 @@ jobs:
     if: false
     name: Deploy to staging environment
     needs: build
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.33.0
     with:
       environment: stage
       service_name: 'file-server'
@@ -137,7 +136,7 @@ jobs:
     if: false
     name: Deploy to production environment
     needs: [build, deploy-stage]
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.33.0
     with:
       environment: production
       service_name: 'file-server'
diff --git a/.github/workflows/flowforge-container.yml b/.github/workflows/flowforge-container.yml
index d0a41770..ff1098ae 100644
--- a/.github/workflows/flowforge-container.yml
+++ b/.github/workflows/flowforge-container.yml
@@ -30,18 +30,17 @@ concurrency:
 jobs:
   build:
     name: Build single-architecture container images
-    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.33.0
     with:
       image_name: 'forge-k8s'
       package_dependencies: |
-        @flowfuse/flowfuse
-        @flowfuse/driver-kubernetes
+        @flowfuse/flowfuse=nightly
+        @flowfuse/driver-kubernetes=nightly
       build_context: 'flowforge-container'
       build_platform: "linux/amd64"
       npm_registry_url: ${{ vars.PUBLIC_NPM_REGISTRY_URL }}
       scan_image: false
     secrets:
-      npm_registry_auth_token: ${{ secrets.NPM_PUBLISH_TOKEN }}
       temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
 
   upload-stage-image:
@@ -49,7 +48,7 @@ jobs:
     name: Upload image to staging registry
     needs: build
     # needs: build-multi-architecture
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.33.0
     with:
       environment: stage
       service_name: 'forge-k8s'
@@ -69,7 +68,7 @@ jobs:
     name: Upload image to production registry
     # needs: build-multi-architecture
     needs: build
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.33.0
     with:
       environment: production
       service_name: 'forge-k8s'
@@ -125,7 +124,7 @@ jobs:
     if: false
     name: Deploy to staging environment
     needs: build
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.33.0
     with:
       environment: stage
       service_name: 'forge-k8s'
@@ -143,7 +142,7 @@ jobs:
     if: false
     name: Deploy to production environment
     needs: [build, deploy-stage]
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.33.0
     with:
       environment: production
       service_name: 'forge-k8s'
diff --git a/.github/workflows/nodered-container.yml b/.github/workflows/nodered-container.yml
index 336beb64..a15a6ec6 100644
--- a/.github/workflows/nodered-container.yml
+++ b/.github/workflows/nodered-container.yml
@@ -29,26 +29,27 @@ concurrency:
 jobs:
   build-302:
     name: Build 3.0.2 container images
-    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.33.0
     with:
       image_name: 'node-red'
       dockerfile_path: Dockerfile
       image_tag_prefix: '3.0.2-'
       package_dependencies: |
-        @flowforge/nr-project-nodes
+        @flowforge/nr-project-nodes=nightly
       build_context: 'node-red-container'
       build_platform: "linux/arm64"
+      build_arguments: |
+        BUILD_TAG=nightly
       npm_registry_url: ${{ vars.PUBLIC_NPM_REGISTRY_URL }}
       scan_image: false
     secrets:
-      npm_registry_auth_token: ${{ secrets.NPM_PUBLISH_TOKEN }}
       temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
 
   upload-302-stage:
     name: Upload image to staging ECR
     if: github.ref_name == 'main'
     needs: build-302
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.33.0
     with:
       environment: stage
       service_name: 'node-red'
@@ -66,7 +67,7 @@ jobs:
     name: Upload image to production ECR
     if: github.ref_name == 'main'
     needs: build-302
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.33.0
     with:
       environment: production
       service_name: 'node-red'
@@ -83,25 +84,26 @@ jobs:
 
   build-223:
     name: Build 2.2.3 container images
-    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.33.0
     with:
       image_name: 'node-red'
       dockerfile_path: Dockerfile-2.2.x
       image_tag_prefix: '2.2.3-'
       package_dependencies: |
-        @flowforge/nr-project-nodes
+        @flowforge/nr-project-nodes=nightly
       build_context: 'node-red-container'
       build_platform: "linux/arm64"
+      build_arguments: |
+        BUILD_TAG=nightly
       npm_registry_url: ${{ vars.PUBLIC_NPM_REGISTRY_URL }}
       scan_image: false
     secrets:
-      npm_registry_auth_token: ${{ secrets.NPM_PUBLISH_TOKEN }}
       temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
   upload-223-stage:
     name: Upload image to staging ECR
     if: github.ref_name == 'main'
     needs: build-223
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.33.0
     with:
       environment: stage
       service_name: 'node-red'
@@ -119,7 +121,7 @@ jobs:
     name: Upload image to production ECR
     if: github.ref_name == 'main'
     needs: build-223
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.33.0
     with:
       environment: production
       service_name: 'node-red'
@@ -136,25 +138,26 @@ jobs:
 
   build-310:
     name: Build 3.1.x container images
-    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.33.0
     with:
       image_name: 'node-red'
       dockerfile_path: Dockerfile-3.1
       image_tag_prefix: '3.1.x-'
       package_dependencies: |
-        @flowforge/nr-project-nodes
+        @flowforge/nr-project-nodes=nightly
       build_context: 'node-red-container'
       build_platform: "linux/arm64"
+      build_arguments: |
+        BUILD_TAG=nightly
       npm_registry_url: ${{ vars.PUBLIC_NPM_REGISTRY_URL }}
       scan_image: false
     secrets:
-      npm_registry_auth_token: ${{ secrets.NPM_PUBLISH_TOKEN }}
       temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
   upload-310-stage:
     name: Upload image to staging ECR
     if: github.ref_name == 'main'
     needs: build-310
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.33.0
     with:
       environment: stage
       service_name: 'node-red'
@@ -172,7 +175,7 @@ jobs:
     name: Upload image to production ECR
     if: github.ref_name == 'main'
     needs: build-310
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.33.0
     with:
       environment: production
       service_name: 'node-red'
@@ -189,25 +192,26 @@ jobs:
 
   build-40:
     name: Build 4.0.x container images
-    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/build_container_image.yml@v0.33.0
     with:
       image_name: 'node-red'
       dockerfile_path: Dockerfile-4.0
       image_tag_prefix: '4.0.x-'
       package_dependencies: |
-        @flowforge/nr-project-nodes
+        @flowforge/nr-project-nodes=nightly
       build_context: 'node-red-container'
       build_platform: "linux/arm64"
+      build_arguments: |
+        BUILD_TAG=nightly
       npm_registry_url: ${{ vars.PUBLIC_NPM_REGISTRY_URL }}
       scan_image: false
     secrets:
-      npm_registry_auth_token: ${{ secrets.NPM_PUBLISH_TOKEN }}
       temporary_registry_token: ${{ secrets.GITHUB_TOKEN }}
   upload-40-stage:
     name: Upload image to staging ECR
     if: github.ref_name == 'main'
     needs: build-40
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.33.0
     with:
       environment: stage
       service_name: 'node-red'
@@ -225,7 +229,7 @@ jobs:
     name: Upload image to production ECR
     if: github.ref_name == 'main'
     needs: build-40
-    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.30.0
+    uses: flowfuse/github-actions-workflows/.github/workflows/deploy_container_image.yml@v0.33.0
     with:
       environment: production
       service_name: 'node-red'