diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
new file mode 100644
index 0000000000..92980fd424
--- /dev/null
+++ b/.github/workflows/docker_build.yml
@@ -0,0 +1,53 @@
+name: docker
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  contents: write
+
+jobs:
+  docker:
+    name: Docker
+    runs-on: 8CoreUbuntu
+    environment:
+      name: Docker Hub
+      url: https://hub.docker.com/r/intergral/grafana
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      # https://github.com/docker/setup-qemu-action
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64
+      # https://github.com/docker/setup-buildx-action
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          build-args: |
+            BINGO=false
+            COMMIT_SHA=${{ github.sha }}
+            BUILD_BRANCH=main
+          push: true
+          tags: intergral/grafana:${{ github.event.pull_request.head.ref }}
diff --git a/.github/workflows/on_release.yml b/.github/workflows/on_release.yml
index 64bae9f6d9..965d20b00a 100644
--- a/.github/workflows/on_release.yml
+++ b/.github/workflows/on_release.yml
@@ -11,7 +11,7 @@ permissions:
 jobs:
   release:
     name: Release
-    runs-on: ubuntu-latest-m
+    runs-on: 8CoreUbuntu
     steps:
       - name: Checkout
         uses: actions/checkout@v4