diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 9e35654..20863a7 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,4 +1,4 @@
 {
-  "image": "ghcr.io/limakzi/jupyter-gap:4.14.0-full",
+  "image": "ghcr.io/gap-system/jupyter-gap:4.14.0-full",
   "forwardPorts": [8888]
 }
diff --git a/README.md b/README.md
index fa0d170..cdcae26 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ## gap-docker
 
-[![docker-build](https://github.com/limakzi/gap-docker/actions/workflows/main.yaml/badge.svg)](https://github.com/limakzi/gap-docker/actions/workflows/main.yaml)
+[![docker-build](https://github.com/gap-system/docker/actions/workflows/main.yaml/badge.svg)](https://github.com/gap-system/docker/actions/workflows/main.yaml)
 
 ## Image types
 
@@ -20,19 +20,19 @@
 * Run a container:
 
 ```
-docker run -it ghcr.io/limakzi/gap:4.13.1-full
+docker run -it ghcr.io/gap-system/gap:4.13.1-full
 ```
 
 ```
-docker run -it ghcr.io/limakzi/gap:4.14.0-full
+docker run -it ghcr.io/gap-system/gap:4.14.0-full
 ```
 
 ```
-docker run -it ghcr.io/limakzi/gap:4.13.1-bare
+docker run -it ghcr.io/gap-system/gap:4.13.1-bare
 ```
 
 ```
-docker run -it ghcr.io/limakzi/gap:4.14.0-bare
+docker run -it ghcr.io/gap-system/gap:4.14.0-bare
 ```
 
 
diff --git a/src/dockerfiles/jupyter-gap/ubuntu-2204-lts/Dockerfile b/src/dockerfiles/jupyter-gap/ubuntu-2204-lts/Dockerfile
index 30385ea..f4fa32b 100644
--- a/src/dockerfiles/jupyter-gap/ubuntu-2204-lts/Dockerfile
+++ b/src/dockerfiles/jupyter-gap/ubuntu-2204-lts/Dockerfile
@@ -1,6 +1,6 @@
 ## {{{
 ARG GAP_VERSION="4.12.1"
-ARG DOCKER_BASE_IMAGE_URL="ghcr.io/limakzi/gap:${GAP_VERSION}-full"
+ARG DOCKER_BASE_IMAGE_URL="ghcr.io/gap-system/gap:${GAP_VERSION}-full"
 ## }}}
 
 ## {{{