diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fd30bd3..86dcddd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,7 +5,6 @@ on:
     types: [published]
 
 env:
-  REGISTRY: ghcr.io
   TAG_NAME: ${{ github.ref_name }}
 
 jobs:
@@ -23,11 +22,12 @@ jobs:
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           # list of Docker images to use as base name for tags
           images: |
-            ${{ env.REGISTRY }}/${{ github.repository }}
+            ghcr.io/${{ github.repository }}
+            docker.io/${{ github.repository }}
           # generate Docker tags based on the following events/attributes
           tags: |
             type=ref,event=branch
@@ -39,14 +39,20 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Login to Github packages
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Login to Dockerhub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_REGISTRY_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_REGISTRY_PASSWORD }}
 
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: Dockerfile
diff --git a/README.md b/README.md
index 6c7c6dc..ef5d3fb 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ version: "3.9"
 
 services:
   windows-github-runner-vm:
-    image: ghcr.io/vaggeliskls/windows-github-custom-runner:latest
+    image: docker.io/vaggeliskls/windows-github-custom-runner:latest
     env_file: .env
     stdin_open: true
     tty: true
diff --git a/docker-compose.yml b/docker-compose.yml
index fbde435..7697485 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
   windows-github-runner-vm:
-    image: ghcr.io/vaggeliskls/windows-github-custom-runner:latest
+    image: docker.io/vaggeliskls/windows-github-custom-runner:latest
     build:
       dockerfile: ./Dockerfile
       context: .