diff --git a/.gitignore b/.gitignore
index cd002ac..d4922bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-stack.env
\ No newline at end of file
+**/*/stack.env
\ No newline at end of file
diff --git a/docker-compose.yaml b/services/docker-compose.yaml
similarity index 55%
rename from docker-compose.yaml
rename to services/docker-compose.yaml
index 8daf4a6..06fe8d3 100644
--- a/docker-compose.yaml
+++ b/services/docker-compose.yaml
@@ -31,40 +31,12 @@ services:
       retries: 5
     networks:
       - inethi
-  eth-tracker:
-    image: ghcr.io/inethi/eth-tracker:v1.6.1-inethi-prefork
-    restart: unless-stopped
-    depends_on:
-      nats:
-        condition: service_started        
-    env_file:
-      - stack.env
-    volumes:
-      - tracker-data:/service/db
-    ports:
-      - 127.0.0.1:5001:5001
-    networks:
-      - inethi
-  eth-indexer:
-    image: ghcr.io/inethi/eth-indexer:v2.4.0-inethi
-    restart: unless-stopped
-    depends_on:
-      eth-tracker:
-        condition: service_started    
-    env_file:
-      - stack.env
-    ports:
-      - 127.0.0.1:5002:5002
-    networks:
-      - inethi        
 
 volumes:
   nats-data:
     driver: local
   postgres-data:
     driver: local    
-  tracker-data:
-    driver: local    
 
 networks:
   inethi:
diff --git a/init_db.sql b/services/init_db.sql
similarity index 100%
rename from init_db.sql
rename to services/init_db.sql
diff --git a/stack/docker-compose.yaml b/stack/docker-compose.yaml
new file mode 100644
index 0000000..51f2efe
--- /dev/null
+++ b/stack/docker-compose.yaml
@@ -0,0 +1,35 @@
+services:
+  eth-tracker:
+    image: ghcr.io/inethi/eth-tracker:v1.6.1-inethi-prefork
+    restart: unless-stopped
+    depends_on:
+      nats:
+        condition: service_started        
+    env_file:
+      - stack.env
+    volumes:
+      - tracker-data:/service/db
+    ports:
+      - 127.0.0.1:5001:5001
+    networks:
+      - inethi
+  eth-indexer:
+    image: ghcr.io/inethi/eth-indexer:v2.4.0-inethi
+    restart: unless-stopped
+    depends_on:
+      eth-tracker:
+        condition: service_started    
+    env_file:
+      - stack.env
+    ports:
+      - 127.0.0.1:5002:5002
+    networks:
+      - inethi        
+
+volumes:
+  tracker-data:
+    driver: local    
+
+networks:
+  inethi:
+    external: true  
\ No newline at end of file