diff --git a/.github/workflows/docker-deploy.yml b/.github/workflows/docker-deploy.yml
index e0d6405..826624f 100644
--- a/.github/workflows/docker-deploy.yml
+++ b/.github/workflows/docker-deploy.yml
@@ -10,20 +10,14 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-
-    - name: Build and push Docker image
-      env:
-        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-        RELEASE_VERSION: ${{ github.event.release.tag_name }}
-      run: |
-        docker build -t joshnotwright/nhlscoreboard .
-        docker tag joshnotwright/nhlscoreboard:latest joshnotwright/nhlscoreboard:${RELEASE_VERSION}
-        docker tag joshnotwright/nhlscoreboard:latest joshnotwright/nhlscoreboard:latest
-        docker push joshnotwright/nhlscoreboard:${RELEASE_VERSION}
-        docker push joshnotwright/nhlscoreboard:latest
+    - uses: mr-smithers-excellent/docker-build-push@v6.3
+      name: Build & push Docker image
+      with:
+        image: joshnotwright/nhlscoreboard
+        tags: ${{ github.event.release.tag_name }}, latest
+        registry: docker.io
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}