diff --git a/docker-compose/pre-release-compose.yaml b/docker-compose/pre-release-compose.yaml
index 69e055be7..1b3e432ba 100644
--- a/docker-compose/pre-release-compose.yaml
+++ b/docker-compose/pre-release-compose.yaml
@@ -181,7 +181,7 @@ services:
       retries: 3
       start_period: 5s
   elasticsearch:
-    image: elasticsearch:7.17.3
+    image: elasticsearch:8.16.1
     environment:
       - xpack.security.enabled=false
       - discovery.type=single-node
@@ -204,7 +204,7 @@ services:
       retries: 5
       start_period: 30s
   kibana:
-    image: kibana:7.17.3
+    image: kibana:8.16.1
     mem_limit: 1g
     environment:
       - ELASTICSEARCH_HOSTS=http://elasticsearch:9200
diff --git a/helm/alfresco-content-services/pre-release_values.yaml b/helm/alfresco-content-services/pre-release_values.yaml
index 45d8daea4..151365ad2 100644
--- a/helm/alfresco-content-services/pre-release_values.yaml
+++ b/helm/alfresco-content-services/pre-release_values.yaml
@@ -78,9 +78,13 @@ alfresco-connector-ms365:
 alfresco-connector-msteams:
   image:
     tag: 2.0.4-A4
+elasticsearch-audit:
+  imageTag: 8.16.1
 alfresco-audit-storage:
   image:
     tag: 1.0.0
+elasticsearch: 
+  imageTag: 8.16.1
 dtas:
   config:
     assertions: