diff --git a/.github/workflows/quick_start.yml b/.github/workflows/quick_start.yml
index 87cd7f26..2f817129 100644
--- a/.github/workflows/quick_start.yml
+++ b/.github/workflows/quick_start.yml
@@ -7,18 +7,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download docker-compose file
-        run: wget https://raw.githubusercontent.com/maykinmedia/objecttypes-api/master/docker-compose-quickstart.yml -O docker-compose-qs.yml
+        # todo replace branch name with master after the change is merge
+        run: wget https://raw.githubusercontent.com/maykinmedia/objecttypes-api/feature/merge-docker-composes/docker-compose.yml
       - name: Start docker containers
-        run: docker-compose -f docker-compose-qs.yml up -d
-      - name: Wait until DB container starts
-        run: sleep 10
+        run: docker compose up -d --no-build
       - name: Load fixtures
-        run: docker-compose -f docker-compose-qs.yml exec -T web src/manage.py loaddata demodata
+        run: docker compose exec -T web src/manage.py loaddata demodata
       - name: Create superuser
-        run: docker-compose -f docker-compose-qs.yml exec -T web src/manage.py createsuperuser --username admin --email admin@admin.nl --no-input
+        run: docker-compose exec -T web src/manage.py createsuperuser --username admin --email admin@admin.nl --no-input
       - name: Check main page
         run: |
-          curl_status=$(curl -w '%{http_code}' -o /dev/null  -s http://localhost:8001/)
+          curl_status=$(curl -w '%{http_code}' -o /dev/null  -s http://localhost:8000/)
           if [[ $curl_status != 200 ]]; then
             printf "index page responds with $curl_status status" >&2
             exit 1
diff --git a/README.NL.rst b/README.NL.rst
index bbc70f29..f3040027 100644
--- a/README.NL.rst
+++ b/README.NL.rst
@@ -77,12 +77,12 @@ Quickstart
 
    .. code:: bash
 
-      $ wget https://raw.githubusercontent.com/maykinmedia/objecttypes-api/master/docker-compose-quickstart.yml -O docker-compose-qs.yml
-      $ docker-compose -f docker-compose-qs.yml up -d
-      $ docker-compose exec -T web src/manage.py loaddata demodata
-      $ docker-compose exec web src/manage.py createsuperuser
+      wget https://raw.githubusercontent.com/maykinmedia/objecttypes-api/master/docker-compose.yml
+      docker compose up -d --no-build
+      docker compose exec -T web src/manage.py loaddata demodata
+      docker compose exec web src/manage.py createsuperuser
 
-2. In de browser, navigeer naar ``http://localhost:8001/`` om de admin en de
+2. In de browser, navigeer naar ``http://localhost:8000/`` om de admin en de
    API te benaderen.
 
 
diff --git a/README.rst b/README.rst
index e6961d2f..30c8d4cc 100644
--- a/README.rst
+++ b/README.rst
@@ -76,12 +76,12 @@ Quickstart
 
    .. code:: bash
 
-      $ wget https://raw.githubusercontent.com/maykinmedia/objecttypes-api/master/docker-compose-quickstart.yml -O docker-compose-qs.yml
-      $ docker-compose -f docker-compose-qs.yml up -d
-      $ docker-compose exec -T web src/manage.py loaddata demodata
-      $ docker-compose exec web src/manage.py createsuperuser
+      wget https://raw.githubusercontent.com/maykinmedia/objecttypes-api/master/docker-compose.yml
+      docker compose up -d --no-build
+      docker compose exec -T web src/manage.py loaddata demodata
+      docker compose exec web src/manage.py createsuperuser
 
-2. In the browser, navigate to ``http://localhost:8001/`` to access the admin
+2. In the browser, navigate to ``http://localhost:8000/`` to access the admin
    and the API.
 
 
diff --git a/docker-compose-quickstart.yml b/docker-compose-quickstart.yml
deleted file mode 100644
index d4295be2..00000000
--- a/docker-compose-quickstart.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: '3'
-
-services:
-  db:
-    image: postgres
-    environment:
-      - POSTGRES_USER=${DB_USER:-objecttypes}
-      - POSTGRES_PASSWORD=${DB_PASSWORD:-objecttypes}
-
-  web:
-    image: maykinmedia/objecttypes-api:latest
-    environment:
-      - DJANGO_SETTINGS_MODULE=objecttypes.conf.docker
-      - SECRET_KEY=${SECRET_KEY:-fgv=c0hz&tl*8*3m3893@m+1pstrvidc9e^5@fpspmg%cyz15d}
-      - ALLOWED_HOSTS=*
-    ports:
-      - 8001:8000
-    depends_on:
-      - db
diff --git a/docker-compose.yml b/docker-compose.yml
index 5e2122a0..819e822c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,21 +1,20 @@
-version: '3'
-
 services:
   db:
     image: postgres:12-alpine
     environment:
-      - POSTGRES_HOST_AUTH_METHOD=trust
-    volumes:
-      - ./docker-init-db.sql:/docker-entrypoint-initdb.d/init_db.sql
-#      - db:/var/lib/postgresql/data
+      - POSTGRES_USER=objecttypes
+      - POSTGRES_PASSWORD=objecttypes
     command: postgres -c max_connections=300 -c log_min_messages=LOG
 
   redis:
     image: redis
 
   web:
+    image: maykinmedia/objecttypes-api:latest
     build: .
     environment: &app-env
+      - DB_USER=objecttypes
+      - DB_PASSWORD=objecttypes
       - DJANGO_SETTINGS_MODULE=objecttypes.conf.docker
       - SECRET_KEY=${SECRET_KEY:-fgv=c0hz&tl*8*3m3893@m+1pstrvidc9e^5@fpspmg%cyf15d}
       - ALLOWED_HOSTS=*
@@ -35,6 +34,7 @@ services:
         condition: service_completed_successfully
 
   web-init:
+    image: maykinmedia/objecttypes-api:latest
     build: .
     environment: *app-env
     command: /setup_configuration.sh
diff --git a/docker-init-db.sql b/docker-init-db.sql
deleted file mode 100644
index 7e5eb4df..00000000
--- a/docker-init-db.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-CREATE USER objecttypes;
-CREATE DATABASE objecttypes;
-GRANT ALL PRIVILEGES ON DATABASE objecttypes TO objecttypes;