diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 0fd94764..c737fca6 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -12,8 +12,8 @@ jobs:
          name: Docker Login
          uses: docker/login-action@v1
          with:
-           username: ${{ secrets.DockerUsername }}
-           password: ${{ secrets.DockerPassword }}
+           username: ${{ secrets.DOCKER_USERNAME }}
+           password: ${{ secrets.DOCKER_PASSWORD }}
       -
         name: Checkout
         uses: actions/checkout@v2
@@ -51,8 +51,8 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           push: true
           tags: |
-            ${{ secrets.DockerUsername }}/${{ secrets.DockerRepository }}:latest
-            ${{ secrets.DockerUsername }}/${{ secrets.DockerRepository }}:${{ github.sha }}
+            ${{ secrets.DOCKER_USERNAME }}/archivebox:latest
+            ${{ secrets.DOCKER_USERNAME }}/archivebox:${{ github.sha }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
           platforms: linux/arm64,linux/arm/v7