diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index 2c475285d..52c73b446 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -28,6 +28,7 @@ jobs:
           bake-target: ${{ matrix.target }}
           images: |
             ghcr.io/libretime/libretime-${{ matrix.target }}
+            docker.io/libretime/libretime-${{ matrix.target }}
           tags: |
             type=ref,event=branch
             type=semver,pattern={{version}}
@@ -57,6 +58,14 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Login docker.io
+        if: github.event_name == 'push'
+        uses: docker/login-action@v2
+        with:
+          registry: docker.io
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Download all metadata bake files
         uses: actions/download-artifact@v3