diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index a6fc541..0000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Build docker image
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: hermit-os
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          target: toolchain
-          no-cache: true
-          push: true
-          tags: |
-            ghcr.io/hermit-os/hermit-toolchain:rskernel
-            ghcr.io/hermit-os/hermit-toolchain:latest
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 0000000..628b295
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,22 @@
+name: Publish
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  docker:
+    name: Build and push Docker image
+    runs-on: ubuntu-latest
+    steps:
+      - uses: docker/setup-buildx-action@v3
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - uses: docker/build-push-action@v5
+        with:
+          push: true
+          tags: ghcr.io/hermit-os/hermit-toolchain:latest