diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..bff04d3
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,30 @@
+---
+name: Build and Publish
+
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64,linux/arm64
+          tags: ${{ secrets.DOCKER_USERNAME }}/github-runner-linux:${{ github.event.release.tag_name }},${{ secrets.DOCKER_USERNAME }}/github-runner-linux:latest
diff --git a/.github/workflows/test-runner.yml b/.github/workflows/test.yml
similarity index 97%
rename from .github/workflows/test-runner.yml
rename to .github/workflows/test.yml
index 6d55e60..d908303 100644
--- a/.github/workflows/test-runner.yml
+++ b/.github/workflows/test.yml
@@ -1,4 +1,4 @@
-name: Local runner test
+name: Test Runner
 
 on:
   push:
diff --git a/README.md b/README.md
index 4716d68..e3afc47 100644
--- a/README.md
+++ b/README.md
@@ -2,13 +2,7 @@
 
 Build a self-hosted GitHub action runner as an Ubuntu linux container
 
-### Build
-
-```shell
-docker build -t runner .
-```
-
-### Run
+## Development
 
 Set latest `RUNNER_VERSION`
 
@@ -19,11 +13,19 @@ export RUNNER_VERSION=$(curl -sL \
       https://api.github.com/repos/actions/runner/releases/latest | jq .tag_name --raw-output)
 ```
 
+#### Build
+
+```shell
+docker build --build-arg RUNNER_VERSION=$RUNNER_VERSION -t runner .
+```
+
+#### Run
+
 ```shell
 docker compose up -d
 ```
 
-### Exec
+#### Exec
 
 ```shell
 docker exec -it container-name sh