diff --git a/docker-compose.yml b/docker-compose.yml
index 1e32ad8..b680fd9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,13 +4,13 @@ version: "3.4"
 services:
   webapp:
     build:
-      dockerfile: webapp.Dockerfile
+      dockerfile: docker/webapp.Dockerfile
       target: branded
       context: .
     ports:
       - 3000:3000
     networks:
-      - hc-network
+      - test-network
     depends_on:
       - backend
     environment:
@@ -21,11 +21,11 @@ services:
       - PUBLIC_REGISTRATION=true
   backend:
     build:
-      dockerfile: backend.Dockerfile
+      dockerfile: docker/backend.Dockerfile
       target: branded
       context: .
     networks:
-      - hc-network
+      - test-network
     depends_on:
       - neo4j
     ports:
@@ -48,7 +48,7 @@ services:
   neo4j:
     image: ocelotsocialnetwork/neo4j:community
     networks:
-      - hc-network
+      - test-network
     environment:
       - NEO4J_AUTH=none
       - NEO4J_dbms_security_procedures_unrestricted=algo.*,apoc.*
@@ -60,6 +60,6 @@ services:
     ports:
       - 1080:80
     networks:
-      - hc-network
+      - test-network
 networks:
-  hc-network:
\ No newline at end of file
+  test-network:
\ No newline at end of file
diff --git a/backend.Dockerfile b/docker/backend.Dockerfile
similarity index 100%
rename from backend.Dockerfile
rename to docker/backend.Dockerfile
diff --git a/maintenance.Dockerfile b/docker/maintenance.Dockerfile
similarity index 100%
rename from maintenance.Dockerfile
rename to docker/maintenance.Dockerfile
diff --git a/webapp.Dockerfile b/docker/webapp.Dockerfile
similarity index 100%
rename from webapp.Dockerfile
rename to docker/webapp.Dockerfile