diff --git a/.github/workflows/build_main.yml b/.github/workflows/build_main.yml
index d495fd9..191bdda 100755
--- a/.github/workflows/build_main.yml
+++ b/.github/workflows/build_main.yml
@@ -17,6 +17,13 @@ jobs:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
 
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GHCR_ACCESS_TOKEN }}
+
       - name: Set up variables
         run: |
           VER=$(cat ./docker-build/VERSION)
@@ -41,3 +48,5 @@ jobs:
           tags: | 
             ${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:${{ env.VERSION }}
             ${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:latest
+            ghcr.io/${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:${{ env.VERSION }}
+            ghcr.io/${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:latest
diff --git a/README.md b/README.md
index 6980019..c6acd7e 100755
--- a/README.md
+++ b/README.md
@@ -16,15 +16,16 @@
 > Read https://github.com/pi-hole/docker-pi-hole
 
 > [!tip]
-> Firstly pull the new image with `docker pull ghcr.io/sujiba/pihole-unbound-hyperlocal:2025.03.0`.
-> Then stop the old container. 
-> Follow the steps described bellow. For the transition you're going to have two folders
+> Firstly pull the new image with `docker pull ghcr.io/sujiba/pihole-unbound-hyperlocal:latest`.
+> Next stop the old container with `docker compose down`. 
+> Follow the steps described under [First startup](#first-startup). 
+> For the upgrade transition you're going to have two folders
 > - old: pihole-unbound-hyperlocal
 > - new: pihole-unbound-hyperlocal-v6
 > 
-> When everything is running, you can delete the old folder.
+> You can delete the old folder if everything is up and running,
 
-## Overview 
+## Overview
 
 - [Pihole + Unbound + Hyperlocal](#pihole--unbound--hyperlocal)
   - [Overview](#overview)
@@ -67,7 +68,7 @@ cp example.pihole.env pihole.env
 vi pihole.env
 
 # Change the ports if you're running a reverse proxy on ports 80 and 443
-vi compose.yml
+vi docker-compose.yml
 ```
 
 Start the container
diff --git a/compose.yml b/docker-compose.yml
similarity index 91%
rename from compose.yml
rename to docker-compose.yml
index 46cb09d..6b87f61 100755
--- a/compose.yml
+++ b/docker-compose.yml
@@ -2,8 +2,8 @@
 # More info at https://github.com/pi-hole/docker-pi-hole/ and https://docs.pi-hole.net/
 services:
   pihole-unbound:
-    # You can also use latest | 2025.03.0 | dev | 2025.03.0-dev
-    image: ghcr.io/sujiba/pihole-unbound-hyperlocal:2025.03.0
+    # You can also use latest | yyyy.mm.x | dev | yyyy.mm.x-dev
+    image: ghcr.io/sujiba/pihole-unbound-hyperlocal:latest
     container_name: pihole-unbound
     hostname: raspi-01
     ports: