diff --git a/craft-cloud/commands/.gitattributes b/commands/.gitattributes
similarity index 100%
rename from craft-cloud/commands/.gitattributes
rename to commands/.gitattributes
diff --git a/craft-cloud/commands/minio/mc b/commands/craft-cloud-minio/mc
similarity index 100%
rename from craft-cloud/commands/minio/mc
rename to commands/craft-cloud-minio/mc
diff --git a/craft-cloud/commands/redis/redis-cli b/commands/craft-cloud-redis/redis-cli
similarity index 100%
rename from craft-cloud/commands/redis/redis-cli
rename to commands/craft-cloud-redis/redis-cli
diff --git a/craft-cloud/php/conf.d/php.ini b/craft-cloud/bref/php/conf.d/php.ini
similarity index 100%
rename from craft-cloud/php/conf.d/php.ini
rename to craft-cloud/bref/php/conf.d/php.ini
diff --git a/craft-cloud/php/conf.dev.d/php.ini b/craft-cloud/bref/php/conf.dev.d/php.ini
similarity index 100%
rename from craft-cloud/php/conf.dev.d/php.ini
rename to craft-cloud/bref/php/conf.dev.d/php.ini
diff --git a/docker-compose.craft-cloud.bref.yaml b/docker-compose.craft-cloud.bref.yaml
index 7a4d8d4..97fe854 100644
--- a/docker-compose.craft-cloud.bref.yaml
+++ b/docker-compose.craft-cloud.bref.yaml
@@ -1,6 +1,6 @@
 #ddev-generated
 services:
-  bref:
+  craft-cloud-bref:
     build:
       context: ./craft-cloud/bref
     container_name: ddev-${DDEV_PROJECT}-bref
@@ -24,4 +24,4 @@ services:
     volumes:
       - .:/mnt/ddev_config
       - ${DDEV_APPROOT}:/var/task:ro
-      - ./craft-cloud/php:/var/task/php
+      - ./craft-cloud/bref/php:/var/task/php
diff --git a/docker-compose.craft-cloud.minio.yaml b/docker-compose.craft-cloud.minio.yaml
index 00be975..49252cd 100644
--- a/docker-compose.craft-cloud.minio.yaml
+++ b/docker-compose.craft-cloud.minio.yaml
@@ -1,7 +1,7 @@
 #ddev-generated
 # MinIO addon for DDEV - Base file
 services:
-  minio:
+  craft-cloud-minio:
     container_name: ddev-${DDEV_SITENAME}-minio
     image: minio/minio:latest
     hostname: ddev-${DDEV_SITENAME}-minio
@@ -21,7 +21,7 @@ services:
       --address
       :10101
     volumes:
-      - "minio:/data"
+      - "craft-cloud-minio:/data"
       - ".:/mnt/ddev_config"
       - ddev-global-cache:/mnt/ddev-global-cache
       - "./craft-cloud/minio/mc-config.json:/root/.mc/config.json"
@@ -51,7 +51,7 @@ services:
       retries: 1
 
 volumes:
-  minio:
+  craft-cloud-minio:
     name: ddev-${DDEV_SITENAME}-minio
     labels:
       com.ddev.site-name: ${DDEV_SITENAME}
diff --git a/docker-compose.craft-cloud.redis.yaml b/docker-compose.craft-cloud.redis.yaml
index ad58a37..168be23 100644
--- a/docker-compose.craft-cloud.redis.yaml
+++ b/docker-compose.craft-cloud.redis.yaml
@@ -1,6 +1,6 @@
 #ddev-generated
 services:
-  redis:
+  craft-cloud-redis:
     container_name: ddev-${DDEV_SITENAME}-redis
     image: redis:7
     labels:
@@ -8,7 +8,6 @@ services:
       com.ddev.approot: $DDEV_APPROOT
     volumes:
       - ".:/mnt/ddev_config"
-      - "redis:/data"
-
+      - "craft-cloud-redis:/data"
 volumes:
-  redis:
+  craft-cloud-redis:
diff --git a/install.yaml b/install.yaml
index 818fd56..5a4fbc8 100644
--- a/install.yaml
+++ b/install.yaml
@@ -62,6 +62,8 @@ project_files:
 - docker-compose.craft-cloud.minio.yaml
 - docker-compose.craft-cloud.redis.yaml
 - craft-cloud
+- commands/craft-cloud-minio
+- commands/craft-cloud-redis
 
 # List of files and directories that are copied into the global .ddev directory
 # DDEV environment variables can be interpolated into these filenames