diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
new file mode 100644
index 0000000..fe468da
--- /dev/null
+++ b/.github/workflows/ci.yaml
@@ -0,0 +1,27 @@
+name: Build and release container
+
+on:
+  push:
+    paths-ignore:
+      - '**.md'
+    branches:
+      - '**'
+  pull_request:
+    paths-ignore:
+      - '**.md'
+    branches:
+      - '**'
+  workflow_dispatch:
+
+jobs:
+  container-build-push:
+    uses: bbusse/github-workflows/.github/workflows/container-build-push.yaml@dev
+    with:
+      image_name: 'swayvnc-build'
+      image_repository: 'bbusse/swayvnc-build'
+      #image_tags: ${{ github.run_number }}_${{ github.ref_name }}_${{ github.sha }}
+      image_tags: ghcr.io/bbusse/swayvnc-build:${{ github.sha }},ghcr.io/bbusse/swayvnc-build:latest
+      container_registry: 'ghcr'
+      container_push_to_registry: true
+    #secrets:
+    #  custom_github_token: ${{ secrets.APK_SIGNING_KEY }}
diff --git a/.github/workflows/container-extract-artifact.yml b/.github/workflows/container-extract-artifact.yml
index bceb06d..b8f53fe 100644
--- a/.github/workflows/container-extract-artifact.yml
+++ b/.github/workflows/container-extract-artifact.yml
@@ -42,7 +42,7 @@ jobs:
       uses: lewagon/wait-on-check-action@v1.3.1
       with:
         ref: ${{ github.ref }}
-        check-name: 'build-and-release-container'
+        check-name: 'container-build-push'
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         wait-interval: 10
 
diff --git a/.github/workflows/container-image.yml b/.github/workflows/container-image.yml
deleted file mode 100644
index dc4f1cd..0000000
--- a/.github/workflows/container-image.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: Build and release container
-
-on:
-  push:
-    paths-ignore:
-      - '**.md'
-    branches:
-      - '**'
-  pull_request:
-    paths-ignore:
-      - '**.md'
-    branches:
-      - '**'
-  workflow_dispatch:
-
-jobs:
-
-  build-and-release-container:
-    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-build:latest
-
-    - name: Image digest
-      run: echo ${{ steps.docker_build.outputs.digest }}