diff --git a/.github/workflows/build-nightly.yml b/.github/workflows/build-nightly.yml
index 1cf08b3..b59a7b0 100755
--- a/.github/workflows/build-nightly.yml
+++ b/.github/workflows/build-nightly.yml
@@ -32,8 +32,10 @@ jobs:
           ref: nightly
 
       - name: Call common build workflow
-        uses: ./.github/workflows/common-docker-build.yml
+        uses: ./.github/actions/common-docker-build
         with:
           build_tags: jierka/obscreen:nightly
           manifest_tags: type=semver,pattern=nightly
           flavor: ""
+          docker_username: ${{ secrets.DOCKER_USERNAME }}
+          docker_password: ${{ secrets.DOCKER_PASSWORD }}
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index 29d0888..dcdf78b 100755
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -8,6 +8,7 @@ on:
       - master
       - develop
       - nightly
+  workflow_dispatch:
 
 jobs:
   build-and-push-pr:
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index 24bd8cd..80b6f45 100755
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -27,3 +27,5 @@ jobs:
             jierka/obscreen:latest
           manifest_tags: type=semver,pattern=v${{ steps.version.outputs.VERSION }}
           flavor: latest=true
+          docker_username: ${{ secrets.DOCKER_USERNAME }}
+          docker_password: ${{ secrets.DOCKER_PASSWORD }}
diff --git a/.github/workflows/common-docker-build.yml b/.github/workflows/common-docker-build.yml
deleted file mode 100755
index d80f2a9..0000000
--- a/.github/workflows/common-docker-build.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: Common Docker Build
-
-on: [workflow_call]
-
-jobs:
-  build-and-push-common:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: ${{ inputs.build_tags }}
-          platforms: linux/amd64, linux/arm64/v8, linux/arm/v7
-
-      - name: Create and push manifest
-        uses: docker/metadata-action@v3
-        with:
-          images: jierka/obscreen
-          tags: ${{ inputs.manifest_tags }}
-          flavor: ${{ inputs.flavor }}