diff --git a/.github/workflows/relay.yml b/.github/workflows/relay.yml
index c6b07abb..52d581c2 100644
--- a/.github/workflows/relay.yml
+++ b/.github/workflows/relay.yml
@@ -43,4 +43,46 @@ jobs:
                 context: ./
                 push: false
                 load: true
-                tags: nestri:relay
\ No newline at end of file
+                tags: nestri:relay
+    
+    build-docker-main:
+        name: Build image on release
+        if: ${{ github.event_name == 'release' || (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
+        runs-on: ubuntu-latest
+        permissions:
+            contents: read
+            packages: write
+        steps:
+            -
+              name: Checkout repo
+              uses: actions/checkout@v4
+            - 
+              name: Log into registry ${{ env.REGISTRY }}
+              uses: docker/login-action@v3
+              with:
+                registry: ${{ env.REGISTRY }}
+                username: ${{ github.actor }}
+                password: ${{ github.token }}
+            - 
+              name: Extract Container metadata
+              id: meta
+              uses: docker/metadata-action@v5
+              with:
+                images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.BASE_TAG_PREFIX }}
+                #
+                #tag on release, and a nightly build for 'dev'
+                tags: |
+                  type=raw,value=nightly,enable={{is_default_branch}}
+                  type=ref,event=tag
+                  type=semver,pattern={{version}}
+                  type=semver,pattern={{major}}.{{minor}}
+                  type=semver,pattern={{major}}
+            - 
+              name: Build Docker image
+              uses: docker/build-push-action@v5
+              with:
+                file:  containers/relay.Containerfile
+                context: ./
+                push: true
+                tags: ${{ steps.meta.outputs.tags }}
+                labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
diff --git a/.github/workflows/runner.yml b/.github/workflows/runner.yml
index 279a9d94..ac17776c 100644
--- a/.github/workflows/runner.yml
+++ b/.github/workflows/runner.yml
@@ -24,6 +24,11 @@ env:
     IMAGE_NAME: nestrilabs/nestri
     BASE_TAG_PREFIX: runner
 
+# This makes our release ci quit prematurely
+# concurrency:
+#     group: ci-${{ github.ref }}
+#     cancel-in-progress: true
+
 jobs:
     build-docker-pr:
         name: Build image on PR
@@ -44,4 +49,46 @@ jobs:
                 context: ./
                 push: false
                 load: true
-                tags: nestri:runner
\ No newline at end of file
+                tags: nestri:runner
+
+    build-docker-main:
+        name: Build image on release
+        if: ${{ github.event_name == 'release' || (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
+        runs-on: ubuntu-latest
+        permissions:
+            contents: read
+            packages: write
+        steps:
+            -
+              name: Checkout repo
+              uses: actions/checkout@v4
+            - 
+              name: Log into registry ${{ env.REGISTRY }}
+              uses: docker/login-action@v3
+              with:
+                registry: ${{ env.REGISTRY }}
+                username: ${{ github.actor }}
+                password: ${{ github.token }}
+            - 
+              name: Extract Container metadata
+              id: meta
+              uses: docker/metadata-action@v5
+              with:
+                images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.BASE_TAG_PREFIX }}
+                #
+                #tag on release, and a nightly build for 'dev'
+                tags: |
+                  type=raw,value=nightly,enable={{is_default_branch}}
+                  type=ref,event=tag
+                  type=semver,pattern={{version}}
+                  type=semver,pattern={{major}}.{{minor}}
+                  type=semver,pattern={{major}}
+            - 
+              name: Build Docker image
+              uses: docker/build-push-action@v5
+              with:
+                file:  containers/runner.Containerfile
+                context: ./
+                push: true
+                tags: ${{ steps.meta.outputs.tags }}
+                labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file