diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index 55f3a84..9543ac3 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -27,6 +27,13 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{github.actor}}
+          password: ${{secrets.PAT_TOKEN}}
       -
         name: Build and push
         uses: docker/bake-action@v2.3.0
diff --git a/README.md b/README.md
index 315614e..2780493 100644
--- a/README.md
+++ b/README.md
@@ -4,15 +4,18 @@ The simplest and fastest way to get S6 supervisor in your image
 
 ### Usage
 ```Docker
-COPY --from=nlss/s6-rootfs:latest ["/", "/"]
+COPY --from=ghcr.io/n0rthernl1ghts/s6-rootfs:latest ["/", "/"]
 ```
 or with fixed version:
 ```Docker
-COPY --from=nlss/s6-rootfs:3.1.2.1 ["/", "/"]
+COPY --from=ghcr.io/n0rthernl1ghts/s6-rootfs:3.1.2.1 ["/", "/"]
 ```
 
 That's it!
 
+Note: We're moving to ghcr.io. `docker.io/nlss/s6-rootfs` will be kept up-to-date until May 2023, when is Docker sunsetting free teams.<br/>
+It is highly recommended that you start using `ghcr.io/n0rthernl1ghts/s6-rootfs`.
+
 ###### Recommended way to integrate with your image (example)
 ```Docker
 # ---------------------
@@ -24,7 +27,7 @@ FROM scratch AS rootfs
 COPY ["./rootfs", "/"]
 
 # Install S6
-COPY --from=nlss/s6-rootfs:3.1.2.1 ["/", "/"]
+COPY --from=ghcr.io/n0rthernl1ghts/s6-rootfs:3.1.2.1 ["/", "/"]
 
 
 # ---------------------
@@ -44,4 +47,3 @@ ENV S6_CMD_RECEIVE_SIGNALS=1
 # Important, this is required for S6 to work
 ENTRYPOINT ["/init"]
 ```
-
diff --git a/build/docker-bake.hcl b/build/docker-bake.hcl
index 4515a04..7007522 100644
--- a/build/docker-bake.hcl
+++ b/build/docker-bake.hcl
@@ -68,11 +68,13 @@ function "get-tags" {
   params = [version, extra_versions]
   result = concat(
     [
-      "docker.io/nlss/s6-rootfs:${version}"
+      "docker.io/nlss/s6-rootfs:${version}",
+      "ghcr.io/n0rthernl1ghts/s6-rootfs:${version}"
     ],
     flatten([
       for extra_version in extra_versions : [
-        "docker.io/nlss/s6-rootfs:${extra_version}"
+        "docker.io/nlss/s6-rootfs:${extra_version}",
+        "ghcr.io/n0rthernl1ghts/s6-rootfs:${extra_version}"
       ]
     ])
   )