diff --git a/docker-compose.yml b/docker-compose.yml
index b83f347f31a81098170bfc85cc99026814814276..cdc95767009e24d01dd8afcca54336ab26cd75e6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,7 @@ version: '3.8'
 services:
   tonality-client:
     container_name: tonality-client
+    hostname: tonality-client
     build:
       context: ../tonality-client
       dockerfile: Dockerfile
@@ -10,6 +11,7 @@ services:
 
   tonality-rest:
     container_name: tonality-rest
+    hostname: tonality-rest
     build:
       context: ../tonality-rest
       dockerfile: Dockerfile
@@ -18,7 +20,7 @@ services:
     ports:
       - "8001:3001"
     volumes:
-      - ../tonality-rest/src:/app/src  # Mount source code into container (for development only)
+      - ../tonality-rest/src:/tonality/tonality-rest/src  # Mount source code into container (for development only)
     depends_on:
       tonality-rest-db:
         condition: service_healthy
@@ -41,5 +43,31 @@ services:
     networks:
       - backend
 
+  tonality-soap:
+    container_name: tonality-soap
+    hostname: tonality-soap
+    build:
+      context: ../tonality-soap
+      dockerfile: Dockerfile
+    env_file:
+      - env/tonality-soap.env
+    ports:
+      - "8003:8888"
+    volumes:
+      - ../tonality-soap/src:/tonality/tonality-soap/src  # Mount source code into container (for development only)
+    networks:
+      - backend
+
+  tonality-soap-db:
+    container_name: tonality-soap-db
+    hostname: tonality-soap-db
+    image: mysql:8.2.0
+    env_file:
+      - env/tonality-soap-db.env
+    ports:
+      - "8004:3306"
+    networks:
+      - backend
+
 networks:
   backend:
diff --git a/env/tonality-soap-db.env.example b/env/tonality-soap-db.env.example
new file mode 100644
index 0000000000000000000000000000000000000000..9b74bba1152214446f48ea7b6550ca9560f6687f
--- /dev/null
+++ b/env/tonality-soap-db.env.example
@@ -0,0 +1,2 @@
+MYSQL_ROOT_PASSWORD=
+MYSQL_DATABASE=
\ No newline at end of file
diff --git a/env/tonality-soap.env.example b/env/tonality-soap.env.example
new file mode 100644
index 0000000000000000000000000000000000000000..ece54182a4e5737365bb95bc64a59cda77b6921b
--- /dev/null
+++ b/env/tonality-soap.env.example
@@ -0,0 +1,5 @@
+DATABASE_URL=
+DATABASE_USERNAME=
+DATABASE_PASSWORD=
+API_KEY=
+EXPIRATION_DAYS=
\ No newline at end of file