diff --git a/.github/workflows/amd64.yaml b/.github/workflows/amd64.yaml
index 8c03568..710ccdc 100644
--- a/.github/workflows/amd64.yaml
+++ b/.github/workflows/amd64.yaml
@@ -1,8 +1,8 @@
 name: AMD64
 
 on:
-  push:
-    branches: [ main ]
+  release:
+    types: [published]
 
 jobs:
   build:
@@ -24,6 +24,6 @@ jobs:
     - name: Available platforms
       run: echo ${{ steps.buildx.outputs.platforms }}
     - name: Run Buildx
-      run: docker buildx build --platform linux/amd64 -t kerberos/base:amd64-$(echo $GITHUB_SHA | cut -c1-7) --push . 
+      run: docker buildx build --platform linux/amd64 -t kerberos/base:amd64-${{ github.event.release.tag_name }} --push . 
     - name: Create new and append to manifest
-      run: docker buildx imagetools create -t kerberos/base:$(echo $GITHUB_SHA | cut -c1-7) kerberos/base:amd64-$(echo $GITHUB_SHA | cut -c1-7)
\ No newline at end of file
+      run: docker buildx imagetools create -t kerberos/base:${{ github.event.release.tag_name }} kerberos/base:amd64-${{ github.event.release.tag_name }}
\ No newline at end of file
diff --git a/.github/workflows/arm64.yaml b/.github/workflows/arm64.yaml
index 42ed696..9e5e5e9 100644
--- a/.github/workflows/arm64.yaml
+++ b/.github/workflows/arm64.yaml
@@ -1,8 +1,8 @@
 name: ARM64
 
 on:
-  push:
-    branches: [ main ]
+  release:
+    types: [published]
 
 jobs:
   build:
@@ -16,4 +16,4 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Build and push Docker image
-      run: docker build -t kerberos/base:arm64-$(echo $GITHUB_SHA | cut -c1-7) . && docker push kerberos/base:arm64-$(echo $GITHUB_SHA | cut -c1-7)
+      run: docker build -t kerberos/base:arm64-${{ github.event.release.tag_name }} . && docker push kerberos/base:arm64-${{ github.event.release.tag_name }}
diff --git a/.github/workflows/armv7.yaml b/.github/workflows/armv7.yaml
index 34e029b..1d1289b 100644
--- a/.github/workflows/armv7.yaml
+++ b/.github/workflows/armv7.yaml
@@ -1,12 +1,11 @@
 name: ARMv7
-
 on:
-  push:
-    branches: [ main ]
+  release:
+    types: [published]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm 
     steps:
     - name: Login to DockerHub
       uses: docker/login-action@v2
@@ -16,14 +15,6 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Set up Docker Buildx
-      id: buildx
-      uses: crazy-max/ghaction-docker-buildx@v3
-      with:
-        buildx-version: latest
-        qemu-version: latest
-    - name: Available platforms
-      run: echo ${{ steps.buildx.outputs.platforms }}
-    - name: Run Buildx
-      run: docker buildx build --platform linux/arm/v7 -t kerberos/base:armv7-$(echo $GITHUB_SHA | cut -c1-7) --push . 
-    - name: Append manifest
-      run: docker buildx imagetools create --append -t kerberos/base:$(echo $GITHUB_SHA | cut -c1-7) kerberos/base:armv7-$(echo $GITHUB_SHA | cut -c1-7)
\ No newline at end of file
+      uses: docker/setup-buildx-action@v2
+    - name: Build and push ARMv7 Docker image
+      run: docker buildx build --platform linux/arm/v7 -t kerberos/base:armv7-${{ github.event.release.tag_name }} --push .