diff --git a/.gitignore b/.gitignore
index f772d8ea0..d63bbd6bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,5 @@ unlist.sh
 
 # build artifacts
 /artifacts
+
+/docker/data/
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 8d76746a1..137a6cc77 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -34,8 +34,8 @@
         - "1521:1521"
         - "5500:5500"
       volumes:
-        - ./oracle-data-free1:/opt/oracle/oradata
-        - ./oracle-setup:/opt/oracle/scripts/setup
+        - ./data/oracle-data:/opt/oracle/oradata
+        - ./setup/oracle-setup:/opt/oracle/scripts/setup
   
   mongodb:
     image: mongo:latest
diff --git a/docker/oracle-setup/setup.sql b/docker/setup/oracle-setup/setup.sql
similarity index 100%
rename from docker/oracle-setup/setup.sql
rename to docker/setup/oracle-setup/setup.sql