diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml
index 5719c26..cfd3e11 100644
--- a/.github/workflows/build_docker.yml
+++ b/.github/workflows/build_docker.yml
@@ -5,34 +5,52 @@ on:
     types:
       - completed
     branches: [ main ]
+  workflow_dispatch:
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
 jobs:
-  build-docker:
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+  build-and-push-image:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
     steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PW }}
-      - name: Build and push
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Build and push Docker image
         uses: docker/build-push-action@v3
         with:
           push: true
-          tags: mlevental/openhls:latest
-  test-docker:
-    needs: build-docker
-    runs-on: ubuntu-latest
-    container:
-      image: mlevental/openhls:latest
-    steps:
-      - name: Check the built docker image
-        run: |
-          cd /openhls
-          export OPENHLS_CONFIG_FP=$(pwd)/openhls_config.ini
-          python examples/simple_nns.py linear --size 11
-          openhls_compiler $(pwd)/examples/linear_11/linear.mlir -t -r -s -v -b -n 10 --threshold 0.1
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+#  test-docker:
+#    needs: build-docker
+#    runs-on: ubuntu-latest
+#    container:
+#      image: mlevental/openhls:latest
+#    steps:
+#      - name: Check the built docker image
+#        run: |
+#          cd /openhls
+#          export OPENHLS_CONFIG_FP=$(pwd)/openhls_config.ini
+#          python examples/simple_nns.py linear --size 11
+#          openhls_compiler $(pwd)/examples/linear_11/linear.mlir -t -r -s -v -b -n 10 --threshold 0.1