diff --git a/docker-compose.yaml b/docker-compose.yaml
index 16289607a622d52ab126fe12829f2f7e641fb68c..8a94d4f86ce5c5fed360d6b6c52154f9c2423ec7 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,21 +1,36 @@
-version: '2'
+version: '3.6'
 services:
-   angular:
-      build: ./krini-ng
-      image: krini-ng:prod
-      volumes:
-         - ./krini-ng
-      ports:
-         - "85:85"
-      environment:
-         DEBUG: "true"
-   django-rest:
-      build: ./krini-dr
-      image: krini-dr:prod
-      command: python manage.py runserver
-      volumes:
-         - ./krini-dr
-      ports:
-         - "8000:8000"
-      environment:
-         DEBUG: "true"
+    angular:
+        build: ./krini-ng
+        image: krining
+        ports:
+            - '85:85'
+    django:
+        build: ./krini-dr
+        image: krinidr
+        ports:
+            - '8000:8000'
+        command: /bin/sh -c "python manage.py migrate;python manage.py shell < create_super_user.py;python manage.py runserver 0.0.0.0:8000"
+    cwl:
+        build: ./krini-cwl
+        image: krinicwl
+        ports:
+            - '5000:5000'
+
+#environment:
+#            - POSTGRES_USER=kriniuser
+#            - POSTGRES_PASSWORD=krinipw
+
+# volumes:
+#            - type: bind, 
+#              source: $$(pwd)/postgresql.conf
+#              target: /etc/postgresql/postgresql.conf
+#            - type: bind
+#              source: $$(pwd)/pg_hba.conf
+#              target: target=/etc/postgresql/pg_hba.conf
+#            - type: volume
+#              source: PGDATA
+#              target: /var/lib/postgresql/data
+#        command: "postgres -c 'config_file=/etc/postgresql/postgresql.conf' && -c 'hba_file=/etc/postgresql/pg_hba.conf'\n"
+#volumes:
+#    PGDATA: null