diff --git a/bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh b/bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh
index 5aa54187cfec..00d26c9e085e 100644
--- a/bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh
+++ b/bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh
@@ -612,9 +612,6 @@ ldap_initialize() {
         if ! is_boolean_yes "$LDAP_ALLOW_ANON_BINDING"; then
             ldap_disable_anon_binding
         fi
-        if is_boolean_yes "$LDAP_ENABLE_TLS"; then
-            ldap_configure_tls
-        fi
         # Initialize OpenLDAP with schemas/tree structure
         if is_boolean_yes "$LDAP_ADD_SCHEMAS"; then
             ldap_add_schemas
@@ -640,13 +637,6 @@ ldap_initialize() {
         if is_boolean_yes "$LDAP_ENABLE_SYNCPROV"; then
             ldap_enable_syncprov
         fi
-        # enable tls
-        if is_boolean_yes "$LDAP_ENABLE_TLS"; then
-            ldap_configure_tls
-            if is_boolean_yes "$LDAP_REQUIRE_TLS"; then
-                ldap_configure_tls_required
-            fi
-        fi
         if ! is_dir_empty "$LDAP_CUSTOM_LDIF_DIR"; then
             ldap_add_custom_ldifs
         elif ! is_boolean_yes "$LDAP_SKIP_DEFAULT_TREE"; then
@@ -654,6 +644,13 @@ ldap_initialize() {
         else
             info "Skipping default schemas/tree structure"
         fi
+        # enable tls
+        if is_boolean_yes "$LDAP_ENABLE_TLS"; then
+            ldap_configure_tls
+            if is_boolean_yes "$LDAP_REQUIRE_TLS"; then
+                ldap_configure_tls_required
+            fi
+        fi
         ldap_stop
     fi
 }
diff --git a/bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh b/bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh
index 5aa54187cfec..00d26c9e085e 100644
--- a/bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh
+++ b/bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh
@@ -612,9 +612,6 @@ ldap_initialize() {
         if ! is_boolean_yes "$LDAP_ALLOW_ANON_BINDING"; then
             ldap_disable_anon_binding
         fi
-        if is_boolean_yes "$LDAP_ENABLE_TLS"; then
-            ldap_configure_tls
-        fi
         # Initialize OpenLDAP with schemas/tree structure
         if is_boolean_yes "$LDAP_ADD_SCHEMAS"; then
             ldap_add_schemas
@@ -640,13 +637,6 @@ ldap_initialize() {
         if is_boolean_yes "$LDAP_ENABLE_SYNCPROV"; then
             ldap_enable_syncprov
         fi
-        # enable tls
-        if is_boolean_yes "$LDAP_ENABLE_TLS"; then
-            ldap_configure_tls
-            if is_boolean_yes "$LDAP_REQUIRE_TLS"; then
-                ldap_configure_tls_required
-            fi
-        fi
         if ! is_dir_empty "$LDAP_CUSTOM_LDIF_DIR"; then
             ldap_add_custom_ldifs
         elif ! is_boolean_yes "$LDAP_SKIP_DEFAULT_TREE"; then
@@ -654,6 +644,13 @@ ldap_initialize() {
         else
             info "Skipping default schemas/tree structure"
         fi
+        # enable tls
+        if is_boolean_yes "$LDAP_ENABLE_TLS"; then
+            ldap_configure_tls
+            if is_boolean_yes "$LDAP_REQUIRE_TLS"; then
+                ldap_configure_tls_required
+            fi
+        fi
         ldap_stop
     fi
 }