diff --git a/Dockerfile-15 b/Dockerfile-15
index 0de25b843..e79cb2e5b 100644
--- a/Dockerfile-15
+++ b/Dockerfile-15
@@ -241,7 +241,6 @@ RUN sed -i \
     #echo "pljava.libjvm_location = '/usr/lib/jvm/java-11-openjdk-${TARGETARCH}/lib/server/libjvm.so'" >> /etc/postgresql/postgresql.conf && \
     echo "pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \    
     echo "vault.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
-    echo 'auto_explain.log_min_duration = 10s' >> /etc/postgresql/postgresql.conf && \
     usermod -aG postgres wal-g && \
     mkdir -p /etc/postgresql-custom/conf.d && \
     chown -R postgres:postgres /etc/postgresql-custom
diff --git a/Dockerfile-17 b/Dockerfile-17
index 94af08169..cad7b76b9 100644
--- a/Dockerfile-17
+++ b/Dockerfile-17
@@ -246,7 +246,6 @@ RUN sed -i \
     #echo "pljava.libjvm_location = '/usr/lib/jvm/java-11-openjdk-${TARGETARCH}/lib/server/libjvm.so'" >> /etc/postgresql/postgresql.conf && \
     echo "pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
     echo "vault.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
-    echo 'auto_explain.log_min_duration = 10s' >> /etc/postgresql/postgresql.conf && \
     usermod -aG postgres wal-g && \
     mkdir -p /etc/postgresql-custom/conf.d && \
     chown -R postgres:postgres /etc/postgresql-custom
diff --git a/Dockerfile-orioledb-17 b/Dockerfile-orioledb-17
index 27c321d02..19fae02be 100644
--- a/Dockerfile-orioledb-17
+++ b/Dockerfile-orioledb-17
@@ -246,7 +246,6 @@ RUN sed -i \
     #echo "pljava.libjvm_location = '/usr/lib/jvm/java-11-openjdk-${TARGETARCH}/lib/server/libjvm.so'" >> /etc/postgresql/postgresql.conf && \
     echo "pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
     echo "vault.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
-    echo 'auto_explain.log_min_duration = 10s' >> /etc/postgresql/postgresql.conf && \
     usermod -aG postgres wal-g && \
     mkdir -p /etc/postgresql-custom/conf.d && \
     chown -R postgres:postgres /etc/postgresql-custom
diff --git a/ansible/files/postgresql_config/conf.d/auto_explain.conf b/ansible/files/postgresql_config/conf.d/auto_explain.conf
new file mode 100644
index 000000000..c95c01e2a
--- /dev/null
+++ b/ansible/files/postgresql_config/conf.d/auto_explain.conf
@@ -0,0 +1 @@
+auto_explain.log_min_duration = 10s
diff --git a/ansible/files/postgresql_config/postgresql.conf.j2 b/ansible/files/postgresql_config/postgresql.conf.j2
index bc2eab604..fc77c63bc 100644
--- a/ansible/files/postgresql_config/postgresql.conf.j2
+++ b/ansible/files/postgresql_config/postgresql.conf.j2
@@ -773,5 +773,4 @@ include_dir = '/etc/postgresql-custom/conf.d'  # include files ending in '.conf'
 #------------------------------------------------------------------------------
 
 # Add settings for extensions here
-auto_explain.log_min_duration = 10s
 cron.database_name = 'postgres'
diff --git a/ansible/tasks/finalize-ami.yml b/ansible/tasks/finalize-ami.yml
index 1cc729fc0..5b9dee913 100644
--- a/ansible/tasks/finalize-ami.yml
+++ b/ansible/tasks/finalize-ami.yml
@@ -4,6 +4,17 @@
     group: 'postgres'
     src: 'files/postgresql_config/postgresql-csvlog.conf'
 
+- name: auto_explain and pg_cron confs
+  ansible.builtin.template:
+    dest: "/etc/postgresql-custom/conf.d/{{ ext_item }}.conf"
+    group: 'postgres'
+    src: "files/postgresql_config/conf.d/{{ ext_item }}.conf"
+  loop:
+    - auto_explain
+    # - pg_cron
+  loop_control:
+    loop_var: 'ext_item'
+
 - name: UFW - Allow SSH connections
   community.general.ufw:
     name: 'OpenSSH'
diff --git a/ansible/vars.yml b/ansible/vars.yml
index a7e55c0a9..5423e9367 100644
--- a/ansible/vars.yml
+++ b/ansible/vars.yml
@@ -10,9 +10,9 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-  postgresorioledb-17: "17.6.0.011-orioledb"
-  postgres17: "17.6.1.054"
-  postgres15: "15.14.1.054"
+  postgresorioledb-17: "17.6.0.011-orioledb-INDATA-255"
+  postgres17: "17.6.1.054-INDATA-255"
+  postgres15: "15.14.1.054-INDATA-255"
 
 # Non Postgres Extensions
 pgbouncer_release: 1.19.0