diff --git a/.circleci/config.yml b/.circleci/config.yml
index 22f1347c57..330566a4c2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -484,7 +484,7 @@ _environments:
 executors:
   release_exec:
     docker:
-      - image: ghcr.io/ros-planning/navigation2:main
+      - image: ghcr.io/ros-navigation/navigation2:main
     resource_class: large
     working_directory: /opt/overlay_ws
     environment:
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index e3d34c3b12..77a326648d 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -4,7 +4,7 @@
         "dockerfile": "../Dockerfile",
         "context": "..",
         "target": "dever",
-        "cacheFrom": "ghcr.io/ros-planning/navigation2:main"
+        "cacheFrom": "ghcr.io/ros-navigation/navigation2:main"
     },
     "runArgs": [
         "--name=nav2"
diff --git a/README.md b/README.md
index ab34c01ce3..49ce011c96 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ For detailed instructions on how to:
 - [Configure](https://docs.nav2.org/configuration/index.html)
 - [Navigation Plugins](https://docs.nav2.org/plugins/index.html)
 - [Migration Guides](https://docs.nav2.org/migration/index.html)
-- [Container Images for Building Nav2](https://github.com/orgs/ros-planning/packages/container/package/navigation2)
+- [Container Images for Building Nav2](https://github.com/orgs/ros-navigation/packages/container/package/navigation2)
 - [Contribute](https://docs.nav2.org/development_guides/involvement_docs/index.html)
 
 Please visit our [documentation site](https://docs.nav2.org/). [Please visit our community Slack here](https://join.slack.com/t/navigation2/shared_invite/zt-hu52lnnq-cKYjuhTY~sEMbZXL8p9tOw) (if this link does not work, please contact maintainers to reactivate).