diff --git a/docker/compose/data-restore/docker-compose.yaml b/docker/compose/data-restore/docker-compose.yaml
index e791816c9d82e..67588981f6a88 100644
--- a/docker/compose/data-restore/docker-compose.yaml
+++ b/docker/compose/data-restore/docker-compose.yaml
@@ -3,7 +3,7 @@
 version: "3.8"
 services:
   restore:
-    image: aptos/tools:devnet
+    image: aptoslab/tools:devnet
     volumes:
       - type: volume
         source: db
diff --git a/docker/compose/public_full_node/docker-compose.yaml b/docker/compose/public_full_node/docker-compose.yaml
index a165de02c48e5..305a5295d84ad 100644
--- a/docker/compose/public_full_node/docker-compose.yaml
+++ b/docker/compose/public_full_node/docker-compose.yaml
@@ -2,16 +2,16 @@
 #
 # In order to use, place a copy of the proper genesis.blob and waypoint.txt in this directory.
 #
+# Developer testnet genesis blob and waypoint can be found at:
+# `curl https://devnet.aptoslabs.com/waypoint.txt --output waypoint.txt`
+# `curl https://devnet.aptoslabs.com/genesis.blob --output genesis.blob`
+#
 # Note this compose comes with a pre-configured node.config for fullnodes, see
 # public_full_node.yaml. The config is pretty well documented and aligns with instructions herein.
 # It is intended for use with testnet but can be easily modified for other systems.
 #
-# TODO:
-# * add url for genesis blob and waypoint
-#
-# TODO:
-#   * Directions on the correct image
-#   * Connecting to the local testnet
+# To start the docker compose:
+# `docker-compose -f docker-compose.yaml up -d`
 #
 # Additional information:
 # * If you use this compose for different Aptos Networks, you will need remove the db volume first.
@@ -31,7 +31,7 @@
 version: "3.8"
 services:
   fullnode:
-    image: aptos/validator:devnet
+    image: aptoslab/validator:devnet
     volumes:
       - type: volume
         source: db
diff --git a/docker/compose/validator-testnet/docker-compose.yaml b/docker/compose/validator-testnet/docker-compose.yaml
index 8892fc00c6fa6..39c755828a7fb 100644
--- a/docker/compose/validator-testnet/docker-compose.yaml
+++ b/docker/compose/validator-testnet/docker-compose.yaml
@@ -9,8 +9,8 @@
 # * If you use this compose for different Aptos Networks, you will need remove the db volume first.
 # * If you would like to use the current Aptos version within this repository, execute the
 #     `build.sh` in `docker/validator` and change the image tag below to aptos_e2e:latest
-# * Validator images can be found at https://hub.docker.com/r/devnet/validator/tags
-# * Faucet images can be found at https://hub.docker.com/r/devnet/faucet/tags
+# * Validator images can be found at https://hub.docker.com/repository/docker/aptoslab/validator/tags
+# * Faucet images can be found at https://hub.docker.com/repository/docker/aptoslab/faucet/tags
 
 # Monitoring:
 # If you want to install the monitoring components for your validator-testnet
@@ -26,7 +26,7 @@ services:
   validator:
     # Note this image currently does not support this, will update to the appropriate minimum
     # version shortly
-    image: "aptos/validator:${IMAGE_TAG:-devnet}"
+    image: "aptoslab/validator:${IMAGE_TAG:-devnet}"
     networks:
       shared:
     volumes:
@@ -43,7 +43,7 @@ services:
       - 9101
 
   faucet:
-    image: "aptos/faucet:${IMAGE_TAG:-devnet}"
+    image: "aptoslab/faucet:${IMAGE_TAG:-devnet}"
     depends_on:
       - validator
     networks: