diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index d18c6a5..2407b5e 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -27,7 +27,7 @@ jobs:
       uses: docker/build-push-action@v5
       with:
         push: true
-        tags: ${{github.repository_owner}}/ledgersmb_circleci-perl:${{ matrix.version }}
+        tags: ghcr.io/${{github.repository_owner}}/ledgersmb_circleci-perl:${{ matrix.version }}
         build-args: |
           perl=${{ matrix.version }}
           branches=${{ matrix.branches }}
@@ -41,15 +41,19 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
-    - name: Build and push to Docker Hub
-      uses: whoan/docker-build-with-cache-action@next
+    - name: Setup Docker 'buildx'
+      uses: docker/setup-buildx-action@v3
+    - name: Login to GitHub Container Repository
+      uses: docker/login-action@v3
       with:
+        registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
-        image_name: ${{github.repository_owner}}/ledgersmb_circleci-postgres
-        image_tag: ${{ matrix.version }}
-        build_extra_args: "--build-arg version=${{ matrix.version }}"
-        context: postgres
-        registry: ghcr.io
-        pull_image_and_stages: false
-        push_image_and_stages: true
+    - name: Build and push
+      uses: docker/build-push-action@v5
+      with:
+        push: true
+        tags: ghcr.io/${{github.repository_owner}}/ledgersmb_circleci-postgres:${{ matrix.version }}
+        build-args: |
+          version=${{ matrix.version }}
+        context: "{{defaultContext}}:postgres"