diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 684d7f2..58fc498 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -3,34 +3,29 @@ name: docker-build
 on:
   workflow_dispatch:
 
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+permissions:
+  contents: read
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
+jobs:
+  build:
+    uses: docker/github-builder/.github/workflows/build.yml@v1
+    permissions:
+      contents: read
+      id-token: write
+    with:
+      context: .
+      build-args: |
+        node_version=20
+      output: image
+      push: true
+      platforms: linux/amd64,linux/arm64
+      distribute: true
+      sign: auto
+      meta-images: cardiacmodelling/ap-nimbus-app-manager
+      meta-tags: |
+        type=semver,pattern={{version}},value=2.0.0
+    secrets:
+      registry-auths: |
+        - registry: docker.io
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          pull: true
-          push: true
-          build-args: |
-            node_version=20
-          tags: |
-            cardiacmodelling/ap-nimbus-app-manager:2.0.0
-            cardiacmodelling/ap-nimbus-app-manager:latest
diff --git a/.gitignore b/.gitignore
index 0ca97a6..a063464 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 /run/
 /.project
 /node_modules
+
+.DS_Store
diff --git a/Dockerfile b/Dockerfile
index c5db62d..fd9f2ac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,15 @@
+# Building the image locally:
+# docker build -t cardiacmodelling/ap-nimbus-app-manager:local .
+
+# Starting a container:
+# docker run --init -it -p 8080:8080 cardiacmodelling/ap-nimbus-app-manager:local
+
 # If the FROM is changed then server.js's OPTION's help facility may require
 # modification to reflect different ApPredict help or lookup availability.
 FROM cardiacmodelling/appredict-with-emulators:2.0.0
 
+LABEL version="2.0.0"
+
 ARG node_version=20
 
 USER root