diff --git a/.env b/.env
index 80e4717..05afa59 100644
--- a/.env
+++ b/.env
@@ -8,7 +8,6 @@ IDENTITY_SERVICE_PROTOCOL=http
 IDENTITY_SERVICE_HOST=auth.example.org
 IDENTITY_SERVICE_PORT=8080
 
-APS_TAG=2.3.5
+APS_TAG=2.4.1
 AIS_TAG=1.8.0
 POSTGRES_TAG=13
-ELASTICSEARCH_TAG=7.17.7
diff --git a/docker-compose.yml b/docker-compose.yml
index 22b5113..fc5a5b5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,9 @@
-# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
+# Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
 #
 version: "3"
 
 services:
+
     activiti-app:
         image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
         environment:
@@ -11,10 +12,6 @@ services:
             ACTIVITI_DATASOURCE_DRIVER: org.postgresql.Driver
             ACTIVITI_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
             ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
-            ACTIVITI_ES_SERVER_TYPE: rest
-            ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
-            ACTIVITI_ES_REST_CLIENT_PORT: 9200
-            ACTIVITI_ES_REST_CLIENT_SCHEMA: http
             IDENTITY_SERVICE_ENABLED: "true"
             IDENTITY_SERVICE_AUTH: ${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
             IDENTITY_SERVICE_CONTENT_SSO_REDIRECT_URI: ${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/activiti-app/app/rest/integration/sso/confirm-auth-request
@@ -54,18 +51,6 @@ services:
             POSTGRES_USER: alfresco
             POSTGRES_PASSWORD: alfresco
         command: postgres -c max_connections=50 -c log_min_messages=LOG
-    
-    search-aps:
-        image: elasticsearch:${ELASTICSEARCH_TAG}
-        environment:
-            discovery.type: single-node
-            ES_JAVA_OPTS: "-Xms128m -Xmx256m"
-        ulimits:
-            memlock:
-                soft: -1
-                hard: -1
-        depends_on:
-            - activiti-app
 
     identity:
         image: alfresco/alfresco-identity-service:${AIS_TAG}