diff --git a/.github/workflows/container-image.yml b/.github/workflows/container-image.yml
index a14875e..cae6e72 100644
--- a/.github/workflows/container-image.yml
+++ b/.github/workflows/container-image.yml
@@ -1,4 +1,4 @@
-name: Build Container Image
+name: Build and release container
 
 on:
   push:
@@ -14,33 +14,11 @@ on:
   workflow_dispatch:
 
 jobs:
-
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
-
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v2
-      with:
-       registry: ghcr.io
-       username: ${{ github.actor }}
-       password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-
-    - name: Build and push to ghcr
-      id: docker_build
-      uses: docker/build-push-action@v4
-      with:
-        platforms: linux/arm64, linux/amd64
-        file: Containerfile
-        push: true
-        tags: ghcr.io/bbusse/swayvnc-firefox:latest
-
-    - name: Image digest
-      run: echo ${{ steps.docker_build.outputs.digest }}
+  container-build-push:
+    uses: bbusse/github-workflows/.github/workflows/container-build-push.yaml@dev
+    with:
+      image_name: 'swayvnc-firefox'
+      image_repository: 'bbusse/swayvnc-firefox'
+      image_tags: ghcr.io/bbusse/swayvnc-firefox:${{ github.sha }},ghcr.io/bbusse/swayvnc-firefox:latest
+      container_registry: 'ghcr'
+      container_push_to_registry: true