diff --git a/Makefile b/Makefile
index a69efd01a..d6249abfa 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,15 @@ list:
 	@LC_ALL=C $(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$'
 
 install-cloud-ide:
-	cp docker-compose.cloudide.yml docker-compose.yml
+	cp docker-compose.sample.yml docker-compose.yml
+	cp docker-compose.cloudide.yml docker-compose.override.yml
+
 	cp dev.env .env
 	cp azuracast.dev.env azuracast.env
 
+	docker-compose pull
 	docker-compose build
-	docker-compose run --rm --user="azuracast" web azuracast_install "$@"
+	docker-compose run --rm web azuracast_install "$@"
 
 up:
 	docker-compose up -d
diff --git a/docker-compose.cloudide.yml b/docker-compose.cloudide.yml
index 9d97f6faa..31cf2ed92 100644
--- a/docker-compose.cloudide.yml
+++ b/docker-compose.cloudide.yml
@@ -1,99 +1,11 @@
-services :
-  nginx_proxy :
-    container_name : nginx_proxy
-    image : "ghcr.io/azuracast/nginx_proxy:latest"
-    ports :
-      - '10080:80'
-    volumes :
-      - nginx_proxy_vhosts:/etc/nginx/vhost.d
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-    environment :
-      DEFAULT_HOST : azuracast.local
-    depends_on :
-      - web
-    restart : always
-
-  web :
-    container_name : azuracast_web
-    build :
-      context : .
-    ports :
+services:
+  web:
+    build:
+      context: .
+    ports:
       - '10022:2022'
-    depends_on :
-      - mariadb
-      - stations
-      - redis
-    env_file : azuracast.env
-    environment :
-      AZURACAST_DC_REVISION : 12
-      AZURACAST_VERSION : latest
-      AZURACAST_SFTP_PORT : 2022
-      VIRTUAL_HOST : azuracast.local
-      PUID : ${AZURACAST_PUID:-1000}
-      PGID : ${AZURACAST_PGID:-1000}
-    volumes :
+      - "127.0.0.1:3306:3306"
+      - "127.0.0.1:6379:6379"
+    volumes:
       - ${LOCAL_WORKSPACE_FOLDER:-.}/vendor:/var/azuracast/www/vendor
       - ${LOCAL_WORKSPACE_FOLDER:-.}:/var/azuracast/www
-      - www_uploads:/var/azuracast/uploads
-      - tmp_data:/var/azuracast/www_tmp
-      - station_data:/var/azuracast/stations
-      - shoutcast2_install:/var/azuracast/servers/shoutcast2
-      - geolite_install:/var/azuracast/geoip
-      - sftpgo_data:/var/azuracast/sftpgo/persist
-      - backups:/var/azuracast/backups
-    restart : always
-    logging : &default-logging
-      options :
-        max-size : "1m"
-        max-file : "5"
-
-  mariadb :
-    container_name : azuracast_mariadb
-    image : "ghcr.io/azuracast/db:latest"
-    volumes :
-      - db_data:/var/lib/mysql
-    ports :
-      - "13306:3306"
-    env_file : azuracast.env
-    restart : always
-    logging : *default-logging
-
-  redis :
-    container_name : azuracast_redis
-    image : "ghcr.io/azuracast/redis:latest"
-    ports :
-      - "16379:6379"
-    restart : always
-    logging : *default-logging
-
-  stations :
-    container_name : azuracast_stations
-    image : "ghcr.io/azuracast/radio:latest"
-    environment :
-      PUID : ${AZURACAST_PUID:-1000}
-      PGID : ${AZURACAST_PGID:-1000}
-    ports :
-      - '8000:8000'
-      - '8005:8005'
-      - '8006:8006'
-      - '8010:8010'
-      - '8015:8015'
-      - '8016:8016'
-    volumes :
-      - station_data:/var/azuracast/stations
-      - shoutcast2_install:/var/azuracast/servers/shoutcast2
-      - tmp_data:/var/azuracast/www_tmp
-    init : true
-    restart : always
-    logging : *default-logging
-
-volumes :
-  nginx_proxy_vhosts : { }
-  db_data : { }
-  shoutcast2_install : { }
-  geolite_install : { }
-  sftpgo_data : { }
-  station_data : { }
-  www_uploads : { }
-  tmp_data : { }
-  backups : { }
diff --git a/docker-compose.installer.yml b/docker-compose.installer.yml
index 1489669f7..20652f37c 100644
--- a/docker-compose.installer.yml
+++ b/docker-compose.installer.yml
@@ -1,5 +1,5 @@
-services :
-  installer :
+services:
+  installer:
     container_name: azuracast_installer
     image: 'ghcr.io/azuracast/azuracast:${AZURACAST_VERSION:-latest}'
     volumes:
diff --git a/docker-compose.migrate.yml b/docker-compose.migrate.yml
index 83bad38c4..7a3260ff0 100644
--- a/docker-compose.migrate.yml
+++ b/docker-compose.migrate.yml
@@ -3,7 +3,3 @@ services:
     volumes:
       - /var/azuracast/stations:/var/azuracast/stations
       - /var/azuracast/backups:/var/azuracast/backups
-
-  stations:
-    volumes:
-      - /var/azuracast/stations:/var/azuracast/stations
diff --git a/docker-compose.testing.yml b/docker-compose.testing.yml
index c903b744a..bb1dda627 100644
--- a/docker-compose.testing.yml
+++ b/docker-compose.testing.yml
@@ -1,10 +1,10 @@
-services :
-  web :
-    build :
-      context : .
-    environment :
-      APPLICATION_ENV : 'testing'
-      LOG_LEVEL : 'debug'
-    volumes :
+services:
+  web:
+    build:
+      context: .
+    environment:
+      APPLICATION_ENV: 'testing'
+      LOG_LEVEL: 'debug'
+    volumes:
       - ./vendor:/var/azuracast/www/vendor
       - .:/var/azuracast/www