diff --git a/.circleci/config.yml b/.circleci/config.yml
index c4378e5..52a1344 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,6 +6,10 @@ jobs:
       - image: docker:27.1.2
     steps:
       - checkout
+      - run:
+          name: Copy base docker-compose
+          command: |
+            cp ../docker-compose.base.yml ./docker-compose.base.yml
       - setup_remote_docker
       - run:
           name: Install dependencies
diff --git a/docker-compose.yml b/docker-compose.yml
index 414183a..2671c4b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,32 +1,23 @@
 services:
-    db:
-        image: postgres
-        environment:
-            - POSTGRES_DB=postgres
-            - POSTGRES_USER=postgres
-            - POSTGRES_PASSWORD=postgres
-        volumes:
-            - .:/postgres_data/ # Persist data even if container shuts down volumes
-    web:
-        build: .
-        command: python manage.py runserver 0.0.0.0:8000
-        ports:
-            - "8000:8000"
-        depends_on:
-            - db
-            - migration
-        env_file:
-            - ./env_config/local.env
-        healthcheck:
-            test: curl -s -o /dev/null localhost:8000
-            interval: 3s
-            timeout: 5s
-            retries: 5
-    migration:
-        build: .
-        command: [ "bash", "-c", "while !</dev/tcp/db/5432; do sleep 1; done; python manage.py migrate" ]
-        depends_on:
-            - db
+  db:
+    extends:
+      file: ../docker-compose.base.yml
+      service: db
+
+  web:
+    extends:
+      file: ../docker-compose.base.yml
+      service: web
+    build: .
+
+  migration:
+    extends:
+      file: ../docker-compose.base.yml
+      service: migration
+    build: .
 
 volumes:
-    postgres_data:
+  postgres_data:
+
+networks:
+  db:
\ No newline at end of file