diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml
index a0a7091..dc2754a 100644
--- a/.github/workflows/build_docker.yml
+++ b/.github/workflows/build_docker.yml
@@ -2,8 +2,7 @@ name: Build Docker Image
 on:
     push:
       branches:
-        - master
-        - main
+        - '*'
 
 jobs:
   build_docker:
@@ -21,6 +20,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - run: docker build -t ghcr.io/$GITHUB_REPOSITORY:latest .
+      - run: ./scripts/build_docker.sh $GITHUB_REPOSITORY_OWNER ${{ github.event.repository.name }}
       - name: Push built image
-        run: docker push ghcr.io/$GITHUB_REPOSITORY --all-tags
\ No newline at end of file
+        if: github.ref_name == 'main' || github.ref_name == 'master'
+        run: docker push ghcr.io/$GITHUB_REPOSITORY_OWNER/${{ github.event.repository.name }} --all-tags
diff --git a/scripts/build_docker.sh b/scripts/build_docker.sh
new file mode 100755
index 0000000..93b659c
--- /dev/null
+++ b/scripts/build_docker.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [ $# -ne 2 ]; then
+    echo "Usage: $0 <username> <repo-name>"
+    exit 1
+fi
+
+username="$1"
+
+reponame="$2"
+
+docker build -t ghcr.io/$username/$reponame:latest .