diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index eb1bca888..b7828a7dc 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -23,13 +23,6 @@ jobs:
     name: Build Docker images
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        image:
-          - name: target-manager
-          - name: vws
-          - name: vwq
-
     steps:
       - uses: actions/checkout@v6
         with:
@@ -41,24 +34,12 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Build Docker image
-        uses: docker/build-push-action@v6.19.2
+      - name: Check Docker bake definition
+        uses: docker/bake-action@v6.10.0
         with:
-          platforms: linux/amd64,linux/arm64
-          file: src/mock_vws/_flask_server/Dockerfile
-          push: false
-          target: ${{ matrix.image.name }}
-          tags: |-
-            adamtheturtle/vuforia-${{ matrix.image.name }}-mock:latest
+          call: check
 
-  completion-docker:
-    needs: build
-    runs-on: ubuntu-latest
-    if: always()  # Run even if one matrix job fails
-    steps:
-      - name: Check matrix job status
-        run: |-
-          if ! ${{ needs.build.result == 'success' }}; then
-            echo "One or more matrix jobs failed"
-            exit 1
-          fi
+      - name: Build Docker images
+        uses: docker/bake-action@v6.10.0
+        with:
+          push: false
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a5d074c96..365d226bc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -135,20 +135,10 @@ jobs:
           verbose: true
 
   docker:
-    name: Publish Docker image (${{ matrix.image.target }})
+    name: Publish Docker images
     needs: release
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        image:
-          - target: target-manager
-            repo: adamtheturtle/vuforia-target-manager-mock
-          - target: vws
-            repo: adamtheturtle/vuforia-vws-mock
-          - target: vwq
-            repo: adamtheturtle/vuforia-vwq-mock
-
     permissions: {}
 
     steps:
@@ -169,13 +159,9 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v6.19.2
+      - name: Build and push Docker images
+        uses: docker/bake-action@v6.10.0
         with:
-          file: src/mock_vws/_flask_server/Dockerfile
-          platforms: linux/amd64,linux/arm64
           push: true
-          target: ${{ matrix.image.target }}
-          tags: |-
-            ${{ matrix.image.repo }}:latest
-            ${{ matrix.image.repo }}:${{ needs.release.outputs.version }}
+        env:
+          VERSION: ${{ needs.release.outputs.version }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index dc9bf5224..5993b1976 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -415,3 +415,11 @@ repos:
         language: python
         types_or: [markdown, rst]
         additional_dependencies: [uv==0.9.5]
+
+      - id: hclfmt
+        name: hclfmt
+        entry: hclfmt -w
+        language: golang
+        types: [hcl]
+        additional_dependencies: [github.com/hashicorp/hcl/v2/cmd/hclfmt@v2.24.0]
+        stages: [pre-commit]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 9588916d5..2a5183345 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,6 +4,10 @@ Changelog
 Next
 ----
 
+2026.02.15.5
+------------
+
+
 2026.02.15.4
 ------------
 
diff --git a/docker-bake.hcl b/docker-bake.hcl
new file mode 100644
index 000000000..46abc827e
--- /dev/null
+++ b/docker-bake.hcl
@@ -0,0 +1,39 @@
+variable "VERSION" {
+  default = "latest"
+}
+
+group "default" {
+  targets = ["vws", "vwq", "target-manager"]
+}
+
+target "_base" {
+  dockerfile = "src/mock_vws/_flask_server/Dockerfile"
+  platforms  = ["linux/amd64", "linux/arm64"]
+}
+
+target "vws" {
+  inherits = ["_base"]
+  target   = "vws"
+  tags = [
+    "adamtheturtle/vuforia-vws-mock:latest",
+    "adamtheturtle/vuforia-vws-mock:${VERSION}",
+  ]
+}
+
+target "vwq" {
+  inherits = ["_base"]
+  target   = "vwq"
+  tags = [
+    "adamtheturtle/vuforia-vwq-mock:latest",
+    "adamtheturtle/vuforia-vwq-mock:${VERSION}",
+  ]
+}
+
+target "target-manager" {
+  inherits = ["_base"]
+  target   = "target-manager"
+  tags = [
+    "adamtheturtle/vuforia-target-manager-mock:latest",
+    "adamtheturtle/vuforia-target-manager-mock:${VERSION}",
+  ]
+}