diff --git a/README.md b/README.md
index 2780493..2d4d10c 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,7 @@ 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`.
+Note: We have moved to ghcr.io. `docker.io/nlss/s6-rootfs` is discontinued.<br/>
 
 ###### Recommended way to integrate with your image (example)
 ```Docker
diff --git a/build/docker-bake.hcl b/build/docker-bake.hcl
index 35795fc..09d1402 100644
--- a/build/docker-bake.hcl
+++ b/build/docker-bake.hcl
@@ -6,7 +6,7 @@ group "default" {
     "3_1_0_0", "3_1_0_1", "3_1_1_0",
     "3_1_1_1", "3_1_1_2", "3_1_2_0",
     "3_1_2_1", "3_1_3_0", "3_1_4_0",
-    "3_1_4_1", "3_1_4_2", "3_1_5_0", 
+    "3_1_4_1", "3_1_4_2", "3_1_5_0",
     "3_1_6_0", "3_1_6_1", "3_1_6_2"
   ]
 }
@@ -28,7 +28,7 @@ target "build-common" {
 }
 
 variable "REGISTRY_CACHE" {
-  default = "docker.io/nlss/s6-rootfs-cache"
+  default = "ghcr.io/n0rthernl1ghts/s6-rootfs-cache"
 }
 
 ######################
@@ -77,12 +77,10 @@ function "get-tags" {
   params = [version, extra_versions]
   result = concat(
     [
-      "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}",
         "ghcr.io/n0rthernl1ghts/s6-rootfs:${extra_version}"
       ]
     ])
@@ -283,4 +281,4 @@ target "3_1_6_2" {
   cache-to   = get-cache-to("3.1.6.2")
   tags       = get-tags("3.1.6.2", ["3.1", "3.1.6", "latest"])
   args       = get-args("3.1.6.2")
-}
\ No newline at end of file
+}