diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml
index 018267fd..d82fb608 100644
--- a/.github/workflows/build-containers.yml
+++ b/.github/workflows/build-containers.yml
@@ -45,11 +45,11 @@ jobs:
           username: flowforge
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
       # builds container
-      - name: Build and push FlowForge Application container
+      - name: Build and push FlowFuse Application container
         uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
         with:
-          context: helm/flowforge-container
-          file: helm/flowforge-container/Dockerfile
+          context: helm/flowfuse-container
+          file: helm/flowfuse-container/Dockerfile
           platforms: linux/amd64, linux/arm64, linux/arm/v7 
           tags: ${{ steps.meta.outputs.tags }}
           push: true
@@ -59,14 +59,14 @@ jobs:
           repository: flowforge/forge-k8s
           username: flowforge
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-          readme-filepath: ./helm/flowforge-container/README.md
+          readme-filepath: ./helm/flowfuse-container/README.md
       - name: Push README flowfuse
         uses: peter-evans/dockerhub-description@432a30c9e07499fd01da9f8a49f0faf9e0ca5b77 # v4.0.2
         with:
           repository: flowfuse/forge-k8s
           username: flowfuse
           password: ${{ secrets.DOCKER_HUB_PASSWORD_FLOWFUSE }}
-          readme-filepath: ./helm/flowforge-container/README.md
+          readme-filepath: ./helm/flowfuse-container/README.md
 
   build_nodered_container:
     runs-on: ubuntu-latest
@@ -351,7 +351,7 @@ jobs:
         with:
           username: flowforge
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-      - name: Build and push FlowForge File Server container
+      - name: Build and push FlowFuse File Server container
         uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
         with:
           context: helm/file-server
diff --git a/.github/workflows/flowforge-container.yml b/.github/workflows/flowfuse-container.yml
similarity index 91%
rename from .github/workflows/flowforge-container.yml
rename to .github/workflows/flowfuse-container.yml
index e77fa7e1..74dcd07d 100644
--- a/.github/workflows/flowforge-container.yml
+++ b/.github/workflows/flowfuse-container.yml
@@ -2,25 +2,25 @@ name: Flowforge - build and deploy
 on:
   workflow_dispatch:
     inputs:
-      flowforge_release_name:
-        description: 'flowforge package version'
+      flowfuse_release_name:
+        description: 'flowfuse package version'
         required: false
         default: 'nightly'
-      flowforge_ref:
-        description: 'flowforge package ref'
+      flowfuse_ref:
+        description: 'flowfuse package ref'
         required: false
   push:
     branches:
       - main
     paths:
-      - 'flowforge-container/**'
-      - '.github/workflows/flowforge-container.yml'
+      - 'flowfuse-container/**'
+      - '.github/workflows/flowfuse-container.yml'
   pull_request:
     branches:
       - main
     paths:
-      - 'flowforge-container/**'
-      - '.github/workflows/flowforge-container.yml'
+      - 'flowfuse-container/**'
+      - '.github/workflows/flowfuse-container.yml'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}
@@ -36,7 +36,7 @@ jobs:
       package_dependencies: |
         @flowfuse/flowfuse=nightly
         @flowfuse/driver-kubernetes=nightly
-      build_context: 'flowforge-container'
+      build_context: 'flowfuse-container'
       build_platform: "linux/amd64"
       npm_registry_url: ${{ vars.PUBLIC_NPM_REGISTRY_URL }}
       scan_image: false
diff --git a/build-containers.sh b/build-containers.sh
index f765235a..03bdc1a6 100755
--- a/build-containers.sh
+++ b/build-containers.sh
@@ -6,7 +6,7 @@ REGISTRY=$1
 
 if [ ! -z "$REGISTRY" ]; then
 
-  docker build flowforge-container -t $REGISTRY/flowforge/forge-k8s:$TAG
+  docker build flowfuse-container -t $REGISTRY/flowforge/forge-k8s:$TAG
   docker build node-red-container -t $REGISTRY/flowforge/node-red:$TAG
   docker build file-server -t %REGISTRY/flowforge/file-server:$TAG
 
diff --git a/file-server/Dockerfile b/file-server/Dockerfile
index 80527737..b3f9a28e 100644
--- a/file-server/Dockerfile
+++ b/file-server/Dockerfile
@@ -20,7 +20,7 @@ LABEL org.label-schema.name="FlowFuse File Storage" \
     org.label-schema.url="https://flowfuse.com" \
     org.label-schema.vcs-type="Git" \
     org.label-schema.vcs-url="https://github.com/flowfuse/helm" \
-    org.label-schema.docker.dockerfile="fileserver/Dockerfile" \
+    org.label-schema.docker.dockerfile="file-server/Dockerfile" \
     org.schema-label.description="Collaborative, low code integration and automation environment" \
     authors="FlowFuse Inc."
 
diff --git a/flowforge-container/Dockerfile b/flowfuse-container/Dockerfile
similarity index 94%
rename from flowforge-container/Dockerfile
rename to flowfuse-container/Dockerfile
index 9a7888de..03973a14 100644
--- a/flowforge-container/Dockerfile
+++ b/flowfuse-container/Dockerfile
@@ -25,7 +25,7 @@ LABEL org.label-schema.name="FlowFuse Kubernetes" \
     org.label-schema.url="https://flowfuse.com" \
     org.label-schema.vcs-type="Git" \
     org.label-schema.vcs-url="https://github.com/flowfuse/helm" \
-    org.label-schema.docker.dockerfile="flowforge-container/Dockerfile" \
+    org.label-schema.docker.dockerfile="flowfuse-container/Dockerfile" \
     org.schema-label.description="Collaborative, low code integration and automation environment" \
     authors="FlowFuse Inc."
 
diff --git a/flowforge-container/README.md b/flowfuse-container/README.md
similarity index 100%
rename from flowforge-container/README.md
rename to flowfuse-container/README.md
diff --git a/flowforge-container/install-device-cache.sh b/flowfuse-container/install-device-cache.sh
similarity index 100%
rename from flowforge-container/install-device-cache.sh
rename to flowfuse-container/install-device-cache.sh
diff --git a/flowforge-container/package.json b/flowfuse-container/package.json
similarity index 100%
rename from flowforge-container/package.json
rename to flowfuse-container/package.json