diff --git a/.secrets.baseline b/.secrets.baseline
index 887ef7b0a..bcefccbb3 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -144,7 +144,7 @@
         "filename": "playbooks/acs.yml",
         "hashed_secret": "3a0b8a438a9efa61267357269709a946d797b9bd",
         "is_verified": false,
-        "line_number": 431,
+        "line_number": 432,
         "is_secret": false
       }
     ],
@@ -259,5 +259,5 @@
       }
     ]
   },
-  "generated_at": "2024-11-12T09:16:56Z"
+  "generated_at": "2025-01-13T16:47:22Z"
 }
diff --git a/playbooks/acs.yml b/playbooks/acs.yml
index 79fd2968e..1b1f7600c 100644
--- a/playbooks/acs.yml
+++ b/playbooks/acs.yml
@@ -109,6 +109,7 @@
   gather_facts: false
   roles:
     - role: "../roles/elasticsearch"
+      elasticsearch_major_version: "{{ '8.x' if acs.version is version('25.0', 'ge') else '7.x' }}"
       when: acs.edition == "Enterprise" and not groups.external_elasticsearch | default([])
   tags:
     - elasticsearch
diff --git a/roles/audit_storage/molecule/default/converge.yml b/roles/audit_storage/molecule/default/converge.yml
index 8770e9d54..223f38f26 100644
--- a/roles/audit_storage/molecule/default/converge.yml
+++ b/roles/audit_storage/molecule/default/converge.yml
@@ -6,4 +6,6 @@
       vars:
         activemq_version: "{{ dependencies_version.activemq }}"
     - role: elasticsearch
+      vars:
+        elasticsearch_major_version: "{{ '8.x' if acs.version is version('25.0', 'ge') else '7.x' }}"
     - role: audit_storage
diff --git a/roles/elasticsearch/defaults/main.yml b/roles/elasticsearch/defaults/main.yml
index 7454b952c..9eccaad06 100644
--- a/roles/elasticsearch/defaults/main.yml
+++ b/roles/elasticsearch/defaults/main.yml
@@ -2,3 +2,5 @@
 # defaults file for elasticsearch
 elasticsearch_tmp_path: /usr/share/elasticsearch/tmp
 elasticsearch_systemd_service_path: /etc/systemd/system/elasticsearch.service.d/
+
+elasticsearch_major_version: 8.x
diff --git a/roles/elasticsearch/molecule/default/converge.yml b/roles/elasticsearch/molecule/default/converge.yml
index 005a7284a..bccaaa4e5 100644
--- a/roles/elasticsearch/molecule/default/converge.yml
+++ b/roles/elasticsearch/molecule/default/converge.yml
@@ -5,3 +5,5 @@
     - name: "Include elasticsearch"
       ansible.builtin.include_role:
         name: "elasticsearch"
+      vars:
+        elasticsearch_major_version: "{{ '8.x' if acs.version is version('25.0', 'ge') else '7.x' }}"
diff --git a/roles/elasticsearch/tasks/main.yml b/roles/elasticsearch/tasks/main.yml
index df1610dbd..9530eee8b 100644
--- a/roles/elasticsearch/tasks/main.yml
+++ b/roles/elasticsearch/tasks/main.yml
@@ -28,9 +28,12 @@
       ansible.builtin.include_role:
         name: geerlingguy.elasticsearch
       vars:
+        elasticsearch_version: "{{ elasticsearch_major_version }}"
         elasticsearch_network_host: "{{ ansible_hostname }}"
         elasticsearch_heap_size_min: 1g
         elasticsearch_heap_size_max: 1g
         elasticsearch_extra_options: |
           xpack.security.enabled: false
           discovery.type: single-node
+          xpack.security.transport.ssl.enabled: false
+          xpack.security.http.ssl.enabled: false