diff --git a/docker-compose.mainnet.yml b/docker-compose.mainnet.yml
new file mode 100644
index 0000000..791d189
--- /dev/null
+++ b/docker-compose.mainnet.yml
@@ -0,0 +1,30 @@
+version: '3.4'
+
+services:
+    xpop-mainnet:
+        container_name: xpop-mainnet
+        image: xpop:service
+        build: .
+        volumes:
+            - ./store:/usr/src/app/store
+        environment:
+          - EVENT_SOCKET_PORT=3000
+          - PUBLIC_PORT=${PORT:-3000}
+          - URL_PREFIX=${URL_PREFIX:-http://localhost:${PORT:-3000}}
+          - NETWORKID=0
+          - UNLURL=https://vl.xrplf.org
+          - UNLKEY=ED45D1840EE724BE327ABE9146503D5848EFD5F38B6D5FEDE71E80ACCE5E6E738B
+          - NODES=wss://xrplcluster.com,wss://s2.ripple.com
+          - FIELDSREQUIRED=Fee,Account,OperationLimit
+          - NOVALIDATIONLOG=1
+          - NOELIGIBLEFULLTXLOG=1
+          - ONLYUNLVALIDATIONS=${ONLYUNLVALIDATIONS}
+          - DEBUG=${DEBUG}
+          - TELEMETRY=${TELEMETRY:-NO}
+        restart: unless-stopped
+        healthcheck:
+            test: wget --spider -q http://localhost:3000/health || exit 1
+            interval: 15s
+            retries: 2
+            start_period: 5s
+            timeout: 5s
diff --git a/docker-compose.testnet.yml b/docker-compose.testnet.yml
new file mode 100644
index 0000000..90f8515
--- /dev/null
+++ b/docker-compose.testnet.yml
@@ -0,0 +1,30 @@
+version: '3.4'
+
+services:
+    xpop-testnet:
+        container_name: xpop-testnet
+        image: xpop:service
+        build: .
+        volumes:
+            - ./store:/usr/src/app/store
+        environment:
+          - EVENT_SOCKET_PORT=3000
+          - PUBLIC_PORT=${PORT_TESTNET:-3001}
+          - URL_PREFIX=${URL_PREFIX:-http://localhost:${PORT_TESTNET:-3001}}
+          - NETWORKID=1
+          - UNLURL=https://vl.altnet.rippletest.net
+          - UNLKEY=ED264807102805220DA0F312E71FC2C69E1552C9C5790F6C25E3729DEB573D5860
+          - NODES=wss://testnet.xrpl-labs.com,wss://s.altnet.rippletest.net:51233
+          - FIELDSREQUIRED=Fee,Account,OperationLimit
+          - NOVALIDATIONLOG=1
+          - NOELIGIBLEFULLTXLOG=1
+          - ONLYUNLVALIDATIONS=${ONLYUNLVALIDATIONS}
+          - DEBUG=${DEBUG}
+          - TELEMETRY=${TELEMETRY:-NO}
+        restart: unless-stopped
+        healthcheck:
+            test: wget --spider -q http://localhost:3000/health || exit 1
+            interval: 15s
+            retries: 2
+            start_period: 5s
+            timeout: 5s
diff --git a/docker-compose.yml b/docker-compose.yml
index aea7f8d..35b9044 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,9 @@
 version: '3.4'
+
+include:
+  - docker-compose.mainnet.yml
+  - docker-compose.testnet.yml
+
 services:
     nginx:
         container_name: xpopweb
@@ -28,60 +33,6 @@ services:
             start_period: 5s
             timeout: 5s
         command: /bin/sh -c "envsubst '$$PUBLIC_PORT $$PUBLIC_PORT_TESTNET $$SSLPORT $$SSLPORT_TESTNET' < /etc/nginx/nginx.conf.template > /var/cache/nginx/conf ; nginx -c /var/cache/nginx/conf -g 'daemon off;'" 
-    xpop-testnet:
-        container_name: xpop-testnet
-        image: xpop:service
-        build: .
-        volumes:
-            - ./store:/usr/src/app/store
-        environment:
-          - EVENT_SOCKET_PORT=3000
-          - PUBLIC_PORT=${PORT_TESTNET:-3001}
-          - URL_PREFIX=${URL_PREFIX:-http://localhost:${PORT_TESTNET:-3001}}
-          - NETWORKID=1
-          - UNLURL=https://vl.altnet.rippletest.net
-          - UNLKEY=ED264807102805220DA0F312E71FC2C69E1552C9C5790F6C25E3729DEB573D5860
-          - NODES=wss://testnet.xrpl-labs.com,wss://s.altnet.rippletest.net:51233
-          - FIELDSREQUIRED=Fee,Account,OperationLimit
-          - NOVALIDATIONLOG=1
-          - NOELIGIBLEFULLTXLOG=1
-          - ONLYUNLVALIDATIONS=${ONLYUNLVALIDATIONS}
-          - DEBUG=${DEBUG}
-          - TELEMETRY=${TELEMETRY:-NO}
-        restart: unless-stopped
-        healthcheck:
-            test: wget --spider -q http://localhost:3000/health || exit 1
-            interval: 15s
-            retries: 2
-            start_period: 5s
-            timeout: 5s
-    xpop-mainnet:
-        container_name: xpop-mainnet
-        image: xpop:service
-        build: .
-        volumes:
-            - ./store:/usr/src/app/store
-        environment:
-          - EVENT_SOCKET_PORT=3000
-          - PUBLIC_PORT=${PORT:-3000}
-          - URL_PREFIX=${URL_PREFIX:-http://localhost:${PORT:-3000}}
-          - NETWORKID=0
-          - UNLURL=https://vl.xrplf.org
-          - UNLKEY=ED45D1840EE724BE327ABE9146503D5848EFD5F38B6D5FEDE71E80ACCE5E6E738B
-          - NODES=wss://xrplcluster.com,wss://s2.ripple.com
-          - FIELDSREQUIRED=Fee,Account,OperationLimit
-          - NOVALIDATIONLOG=1
-          - NOELIGIBLEFULLTXLOG=1
-          - ONLYUNLVALIDATIONS=${ONLYUNLVALIDATIONS}
-          - DEBUG=${DEBUG}
-          - TELEMETRY=${TELEMETRY:-NO}
-        restart: unless-stopped
-        healthcheck:
-            test: wget --spider -q http://localhost:3000/health || exit 1
-            interval: 15s
-            retries: 2
-            start_period: 5s
-            timeout: 5s
     xpopcleaner:
         container_name: xpopcleaner
         image: alpine