diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml
index 84772de..466794a 100644
--- a/.github/workflows/build-containers.yml
+++ b/.github/workflows/build-containers.yml
@@ -33,11 +33,11 @@ jobs:
         with:
           username: flowforge
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-      - 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: docker-compose/flowforge-docker
-          file: docker-compose/flowforge-docker/Dockerfile
+          context: docker-compose/flowfuse-docker
+          file: docker-compose/flowfuse-docker/Dockerfile
           platforms: linux/amd64, linux/arm64, linux/arm/v7
           tags: ${{ steps.meta.outputs.tags }}
           push: true
diff --git a/README.md b/README.md
index 3d1d43e..e976766 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ To build the required containers simply run `./build-containers.sh`.
 
 This will build and tag `flowfuse/forge-docker` and `flowfuse/node-red` and `flowfuse/file-server`.
 
-#### flowfuse/flowforge-docker
+#### flowfuse/forge-docker
 
 This container holds the FlowFuse App and the Docker Driver.
 
diff --git a/build-containers.sh b/build-containers.sh
index 08f8d20..007aa79 100755
--- a/build-containers.sh
+++ b/build-containers.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-docker build flowforge-docker -t flowfuse/forge-docker
+docker build flowfuse-docker -t flowfuse/forge-docker
 docker build node-red-container -t flowfuse/node-red
 docker build file-server -t flowfuse/file-server
diff --git a/file-server/Dockerfile b/file-server/Dockerfile
index fe48b2f..b9b440e 100644
--- a/file-server/Dockerfile
+++ b/file-server/Dockerfile
@@ -17,7 +17,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/file-server" \
-    org.label-schema.docker.dockerfile="flowforge-container/Dockerfile" \
+    org.label-schema.docker.dockerfile="flowfuse-docker/Dockerfile" \
     org.schema-label.description="Collaborative, low code integration and automation environment" \
     authors="FlowFuse Inc."
 
diff --git a/flowforge-docker/Dockerfile b/flowfuse-docker/Dockerfile
similarity index 100%
rename from flowforge-docker/Dockerfile
rename to flowfuse-docker/Dockerfile
diff --git a/flowforge-docker/install-device-cache.sh b/flowfuse-docker/install-device-cache.sh
similarity index 100%
rename from flowforge-docker/install-device-cache.sh
rename to flowfuse-docker/install-device-cache.sh
diff --git a/flowforge-docker/package.json b/flowfuse-docker/package.json
similarity index 100%
rename from flowforge-docker/package.json
rename to flowfuse-docker/package.json