diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0460dd77..fe2ca956 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,14 +47,15 @@ jobs:
           if [[ ${GITHUB_REF} == *"alpha"* ]] || [[ ${GITHUB_REF} == *"beta"* ]]; then
             echo "PRE_RELEASE=true" >> $GITHUB_ENV
           fi
-
-      - name: Build Docker Image
-        uses: docker/build-push-action@v2
+        
+      - name: Build and Publish to Registry
+        uses: elgohr/Publish-Docker-Github-Action@3.04
         with:
-          push: true
-          tags: |
-            ghcr.io/penguin-statistics/frontend-v2:latest,
-            ghcr.io/penguin-statistics/frontend-v2:${{ env.GIT_TAG }}
+          name: penguin-statistics/frontend-v2
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: ghcr.io
+          tags: "latest,${{ env.GIT_TAG }}"
 
       - name: Create GitHub Release
         uses: marvinpinto/action-automatic-releases@v1.2.1
diff --git a/Dockerfile b/Dockerfile
index 106c73b2..c0dd1ff0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,8 @@ COPY yarn.lock .
 # Setup yarn
 RUN yarn install
 
+COPY . .
+
 # Build the app
 RUN yarn build:web