diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01b861a5ab94ee88c993ae9e20d2fe8542134d16..b3a80a57b203b91dbaa40c0af17d138da95022c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,7 @@ docker-deploy-master:
     - chmod 644 ~/.ssh/known_hosts
   script:
     - ssh -o StrictHostKeyChecking=no vermaas@sdc.astron.nl "docker pull "$CI_REGISTRY_IMAGE""
-    - ssh -o StrictHostKeyChecking=no vermaas@sdc.astron.nl "docker-compose -p atdb -f /docker_compose/atdb-ldv/docker-compose-cd.yml up -d"
+    - ssh -o StrictHostKeyChecking=no vermaas@sdc.astron.nl "docker-compose -p atdb -f /docker_compose/atdb-ldv/docker-compose-dev-cd.yml up -d"
   when: manual
   only:
     - master
diff --git a/atdb/docker-compose-atdb-ldv-acc-cd.yml b/atdb/docker/docker-compose-atdb-ldv-acc-cd.yml
similarity index 100%
rename from atdb/docker-compose-atdb-ldv-acc-cd.yml
rename to atdb/docker/docker-compose-atdb-ldv-acc-cd.yml
diff --git a/atdb/docker-compose-atdb-ldv-acc.yml b/atdb/docker/docker-compose-atdb-ldv-acc.yml
similarity index 100%
rename from atdb/docker-compose-atdb-ldv-acc.yml
rename to atdb/docker/docker-compose-atdb-ldv-acc.yml
diff --git a/atdb/docker-compose-cd.yml b/atdb/docker/docker-compose-dev-cd.yml
similarity index 90%
rename from atdb/docker-compose-cd.yml
rename to atdb/docker/docker-compose-dev-cd.yml
index c6bb0c0cb2c32d67fc6f2cabcdd7790e36af63f5..c512b0811af71e01f825746afb89271c51819a90 100644
--- a/atdb/docker-compose-cd.yml
+++ b/atdb/docker/docker-compose-dev-cd.yml
@@ -34,7 +34,7 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.atdb-backend.entryPoints=atdb-ldv"
       - "traefik.http.routers.atdb-backend.service=atdb-backend"
-      - "traefik.http.routers.atdb-backend.rule=Host(`sdc.astron.nl`) && PathPrefix(`/atdb`)"
+      - "traefik.http.routers.atdb-backend.rule=Host(`sdc-dev.astron.nl`) && PathPrefix(`/atdb`)"
       - "traefik.http.services.atdb-backend.loadbalancer.server.port=8000"
 
     depends_on:
diff --git a/atdb/docker-compose.yml b/atdb/docker/docker-compose-dev.yml
similarity index 91%
rename from atdb/docker-compose.yml
rename to atdb/docker/docker-compose-dev.yml
index 7bc5022251d69fd7d4ffdc9c8b886e6fa2177114..0dd72dd8416b712f42401f78396037fdf8165ebf 100644
--- a/atdb/docker-compose.yml
+++ b/atdb/docker/docker-compose-dev.yml
@@ -40,7 +40,7 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.atdb-backend.entryPoints=atdb-ldv"
       - "traefik.http.routers.atdb-backend.service=atdb-backend"
-      - "traefik.http.routers.atdb-backend.rule=Host(`sdc.astron.nl`) && PathPrefix(`/atdb`)"
+      - "traefik.http.routers.atdb-backend.rule=Host(`sdc-dev.astron.nl`) && PathPrefix(`/atdb`)"
       - "traefik.http.services.atdb-backend.loadbalancer.server.port=8000"
 
     depends_on: