diff --git a/docker-compose.yml b/docker-compose.yml
index f09d282..6d844ab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
     activiti-admin:
         image: alfresco/process-services-admin:latest
         environment:
-            ACTIVITI_ADMIN_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps-admin:5432/activiti?characterEncoding=UTF-8'
+            ACTIVITI_ADMIN_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps-admin:5432/activiti-admin?characterEncoding=UTF-8'
             ACTIVITI_ADMIN_REST_APP_HOST: http://activiti-app
         depends_on:
             - postgres-aps-admin
@@ -27,19 +27,18 @@ services:
     
     postgres-aps:
         image: postgres:latest
+        environment:
+            POSTGRES_DB: activiti
     
     postgres-aps-admin:
         image: postgres:latest
+        environment:
+            POSTGRES_DB: activiti-admin
     
     search-aps:
         image: elasticsearch:latest
-        container_name: elasticsearch
         environment:
-            - node.name=elasticsearch
-            - cluster.name=aps-es-cluster
-            - cluster.initial_master_nodes=elasticsearch
-            - bootstrap.memory_lock=true
-            - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+            discovery.type: single-node
         ulimits:
             memlock:
                 soft: -1