diff --git a/profile/dev-testing.yml b/profile/dev-testing.yml
index c7b75488d..7544448eb 100644
--- a/profile/dev-testing.yml
+++ b/profile/dev-testing.yml
@@ -4,11 +4,12 @@
 #
 # Please see profile/deploy.yml for configuration details for each service.
 #
-services:
+x-base: &base https://github.com/openremote/openremote.git#1.18.0:profile/deploy.yml
 
+services:
   keycloak:
     extends:
-      file: ../openremote/profile/deploy.yml
+      file: *base
       service: keycloak
     volumes:
       # Map custom themes
@@ -27,7 +28,7 @@ services:
 
   postgresql:
     extends:
-      file: ../openremote/profile/deploy.yml
+      file: *base
       service: postgresql
     volumes:
       - ../openremote/tmp:/storage
diff --git a/profile/dev-ui.yml b/profile/dev-ui.yml
index 3cbf63f20..85ca82c7d 100644
--- a/profile/dev-ui.yml
+++ b/profile/dev-ui.yml
@@ -4,6 +4,8 @@
 #
 # Please see profile/deploy.yml for configuration details for each service.
 #
+x-base: &base https://github.com/openremote/openremote.git#1.18.0:profile/deploy.yml
+
 volumes:
   manager-data:
 
@@ -11,7 +13,7 @@ services:
 
   keycloak:
     extends:
-      file: ../openremote/profile/deploy.yml
+      file: *base
       service: keycloak
     volumes:
       # Map custom themes
@@ -31,7 +33,7 @@ services:
 
   postgresql:
     extends:
-      file: ../openremote/profile/deploy.yml
+      file: *base
       service: postgresql
     volumes:
       - manager-data:/storage
@@ -41,7 +43,7 @@ services:
 
   manager:
     extends:
-      file: ../openremote/profile/deploy.yml
+      file: *base
       service: manager
     depends_on:
       postgresql: