diff --git a/.gitea/workflows/build-and-push.yaml b/.gitea/workflows/build-and-push.yaml
index c7af448..f1feeec 100644
--- a/.gitea/workflows/build-and-push.yaml
+++ b/.gitea/workflows/build-and-push.yaml
@@ -10,20 +10,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Setup Buildah
-      run: |
-        apt -y update
-        apt -y install buildah
 
     - uses: actions/checkout@v3
 
-    - name: Buildah Action
-      uses: redhat-actions/buildah-build@v2
+    # https://github.com/marketplace/actions/push-to-ghcr
+    - name: Build and publish a Docker image for ${{ gitea.repository }}
+      uses: macbre/push-to-ghcr@v13
       with:
-        image: my-new-image
-        tags: latest ${{ github.sha }}
-        containerfiles: |
-          ./Dockerfile
-        build-args: |
-          TARGETARCH=amd64
-          BUILD_DATE=$(date +%Y%m%d%H%M)
\ No newline at end of file
+        image_name: ${{ gitea.repository }}  # it will be lowercased internally
+        #  github_token: ${{ secrets.GITHUB_TOKEN }}
+        # optionally push to the Docker Hub (docker.io)
+        docker_io_token: ${{ secrets.DOCKER_IO_ACCESS_TOKEN }}  # see https://hub.docker.com/settings/security
+        # customize the username to be used when pushing to the Docker Hub
+        docker_io_user: tandrade  # see https://github.com/macbre/push-to-ghcr/issues/14