diff --git a/.github/workflows/publish-to-dockerhub.yml b/.github/workflows/publish-to-dockerhub.yml
index 4526d19..14b0e70 100644
--- a/.github/workflows/publish-to-dockerhub.yml
+++ b/.github/workflows/publish-to-dockerhub.yml
@@ -14,6 +14,11 @@ jobs:
         runs-on: self-hosted
 
         steps:
+            - name: Login to Dockerhub
+              uses: docker/login-action@v1
+              with:
+                  username: ${{ secrets.DOCKER_USERNAME }}
+                  password: ${{ secrets.DOCKER_PASSWORD }}
             - uses: actions/checkout@v3
             - uses: actions/setup-node@v3
               with:
@@ -46,11 +51,6 @@ jobs:
               uses: docker/setup-qemu-action@v2
             - name: Set up Docker Buildx
               uses: docker/setup-buildx-action@v2
-            - name: Publish to Dockerhub
-              uses: elgohr/Publish-Docker-Github-Action@v5
-              with:
-                  name: daithihearn/cards-110-frontend
-                  username: ${{ secrets.DOCKER_USERNAME }}
-                  password: ${{ secrets.DOCKER_PASSWORD }}
-                  platforms: linux/amd64,linux/arm64/v8
-                  tags: "latest, ${{ github.ref_name }}"
+            - name: Build and publish Docker image
+              run: |
+                  docker buildx build --platform linux/amd64,linux/arm64/v8 -t daithihearn/cards-110-frontend:latest -t daithihearn/cards-110-frontend:${{ github.ref_name }} --push .