diff --git docker-compose.yml docker-compose.yml
index 863cbd2ea9..c55ae00c9e 100644
--- docker-compose.yml
+++ docker-compose.yml
@@ -32,7 +32,11 @@ services:
   # The PHP container.
   ##
   php:
-    image: wordpressdevelop/php:${LOCAL_PHP-latest}
+    build:
+      context: ../wpdev-docker-images/images/8.2/php/
+      dockerfile: Dockerfile
+      tags:
+        - local/php:8.2-fpm
 
     networks:
       - wpdevnet
@@ -95,7 +99,12 @@ services:
   # The WP CLI container.
   ##
   cli:
-    image: wordpressdevelop/cli:${LOCAL_PHP-latest}
+    build:
+      context: ../wpdev-docker-images/images/8.2/cli/
+      dockerfile: Dockerfile
+      args:
+        PACKAGE_REGISTRY: local
+        PR_TAG:
 
     networks:
       - wpdevnet