diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 2d260b4..eea7e55 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -14,6 +14,22 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag backup-server:${{ github.sha }}
+        run: docker build . --file Dockerfile --tag backup-server:latest
+    - name: Login to GitHub Package Repository
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_PAT }}
+        run: docker login docker.pkg.github.com -u amdavidson -p ${GH_TOKEN}
+    - name: Tag the Docker image
+        run: |
+          docker tag backup-server:latest docker.pkg.github.com/amdavidson/backup-server/backup-server:$(date +%s)
+          docker tag backup-server:latest docker.pkg.github.com/amdavidson/backup-server/backup-server:${GITHUB_SHA:0:39}
     - name: Push the Docker image
-      run: docker push docker.pkg.github.com/amdavidson/backup-server/backup-server:${{ github.sha }}
+        run: docker push docker.pkg.github.com/amdavidson/backup-server/backup-server
+    - name: Push the Docker image
+        run: docker push docker.pkg.github.com/amdavidson/backup-server/backup-server:${{ github.sha }}
+    - name: Tag latest if master
+        if: github.ref == 'refs/heads/master'
+        run: |
+          # we push latest separate so it shows up as latest in the UI
+          docker tag eb:latest docker.pkg.github.com/amdavidson/backup-server/backup-server:latest
+          docker push docker.pkg.github.com/amdavidson/backup-server/backup-server:latest