diff --git a/README.md b/README.md
index 73e0357c..4dea7b34 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ make generate-protos-and-build
 make test
 ```
 
-By default the tests use `ghcr.io/eventstore/eventstore:ci`. To override this, set the `EVENTSTORE_DOCKER_TAG_ENV` environment variable to the tag you wish to use:
+By default the tests use `docker.eventstore.com/eventstore-ce:ci`. To override this, set the `EVENTSTORE_DOCKER_TAG_ENV` environment variable to the tag you wish to use:
 
 ```shell
 export EVENTSTORE_DOCKER_TAG_ENV="21.10.0-focal"
diff --git a/cluster-docker-compose.yml b/cluster-docker-compose.yml
index e014536b..bba68629 100644
--- a/cluster-docker-compose.yml
+++ b/cluster-docker-compose.yml
@@ -10,7 +10,7 @@ services:
     network_mode: none
 
   cert-gen:
-    image: eventstore/es-gencert-cli:1.0.2
+    image: docker.eventstore.com/eventstore-utils/es-gencert-cli:latest
     entrypoint: bash
     user: "1000:1000"
     command: >
@@ -26,7 +26,7 @@ services:
       - volumes-provisioner
 
   esdb-node1:
-    image: ghcr.io/eventstore/eventstore:${EVENTSTORE_DOCKER_TAG_ENV:-latest}
+    image: docker.eventstore.com/eventstore-ce/eventstoredb-ce:${EVENTSTORE_DOCKER_TAG_ENV:-latest}
     env_file:
       - shared.env
     environment:
@@ -47,7 +47,7 @@ services:
       - cert-gen
 
   esdb-node2:
-    image: ghcr.io/eventstore/eventstore:${EVENTSTORE_DOCKER_TAG_ENV:-latest}
+    image: docker.eventstore.com/eventstore-ce/eventstoredb-ce:${EVENTSTORE_DOCKER_TAG_ENV:-latest}
     env_file:
       - shared.env
     environment:
@@ -68,7 +68,7 @@ services:
       - cert-gen
 
   esdb-node3:
-    image: ghcr.io/eventstore/eventstore:${EVENTSTORE_DOCKER_TAG_ENV:-latest}
+    image: docker.eventstore.com/eventstore-ce/eventstoredb-ce:${EVENTSTORE_DOCKER_TAG_ENV:-latest}
     env_file:
       - shared.env
     environment:
diff --git a/docker-compose.yml b/docker-compose.yml
index 62b87287..38a5265c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
     network_mode: "none"
 
   setup:
-    image: eventstore/es-gencert-cli:1.0.2
+    image: docker.eventstore.com/eventstore-utils/es-gencert-cli:latest
     entrypoint: bash
     user: "1000:1000"
     command: >
diff --git a/esdb/containers_test.go b/esdb/containers_test.go
index 6a72cdc1..4e67e4aa 100644
--- a/esdb/containers_test.go
+++ b/esdb/containers_test.go
@@ -42,7 +42,7 @@ type EventStoreDockerConfig struct {
 }
 
 const (
-	DEFAULT_EVENTSTORE_DOCKER_REPOSITORY = "ghcr.io/eventstore/testdata"
+	DEFAULT_EVENTSTORE_DOCKER_REPOSITORY = "docker.eventstore.com/eventstore-utils/testdata"
 	DEFAULT_EVENTSTORE_DOCKER_TAG        = "latest"
 	DEFAULT_EVENTSTORE_DOCKER_PORT       = "2113"
 )