diff --git a/.github/workflows/image-build.yml b/.github/workflows/image-build.yml
new file mode 100644
index 0000000000..02924642a8
--- /dev/null
+++ b/.github/workflows/image-build.yml
@@ -0,0 +1,56 @@
+name: Lagoon Image Build - buildx
+
+on:
+  push:
+    branches:
+      - 'gh_actions**'
+  pull_request:
+    branches:
+      - 'gh_actions**'
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v4
+      -
+        name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build
+        uses: docker/bake-action@v6
+        env:
+            PLATFORMS: "linux/amd64,linux/arm64"
+            TAG: "gh_actions"
+        with:
+          files: |
+            ./docker-bake.hcl
+          targets: default
+          push: true
+          set: |
+            *.cache-from=type=gha
+            *.cache-to=type=gha,mode=max
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 30df12fd1e..c85cf1ef59 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -4,7 +4,7 @@ variable "IMAGE_REPO" {
 }
 
 variable "TAG" {
-  default = "latest"
+  default = "gh_action"
 }
 
 variable "LAGOON_VERSION" {