diff --git a/.env b/.env
index e02dc1e..9268010 100644
--- a/.env
+++ b/.env
@@ -7,3 +7,4 @@ PROXY_PORT=8080
 
 APS_TAG=2.4.1
 POSTGRES_TAG=13
+ELASTICSEARCH_TAG=7.17.7
diff --git a/docker-compose.yml b/docker-compose.yml
index 6c35dcb..63fd7ef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,11 +3,11 @@
 version: "3"
 
 services:
-
     activiti-app:
         image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
         environment:
             ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
+            ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
         depends_on:
             - postgres-aps
         volumes:
@@ -31,6 +31,17 @@ services:
         image: postgres:${POSTGRES_TAG}
         environment:
             POSTGRES_DB: activiti-admin
+    
+    search-aps:
+        image: elasticsearch:${ELASTICSEARCH_TAG}
+        environment:
+            discovery.type: single-node
+        ulimits:
+            memlock:
+                soft: -1
+                hard: -1
+        depends_on:
+            - activiti-app
 
     proxy:
         build: ./nginx-ingress