diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0eff31..72320ac 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 2.6-7.7.0 2024-11-27 <dave at tiredofit dot ca>
+
+   ### Added
+      - Add memberOfAddCheck to memberOf Overlay (TRUE)
+      - Add settings to enable nestgroup overlay on first init
+
+
 ## 2.6-7.6.13 2024-11-26 <dave at tiredofit dot ca>
 
    ### Added
diff --git a/install/assets/functions/10-openldap b/install/assets/functions/10-openldap
index 5cfa779..7844fcf 100755
--- a/install/assets/functions/10-openldap
+++ b/install/assets/functions/10-openldap
@@ -459,6 +459,8 @@ EOF
                 print_notice "Add bootstrap LDIFs"
                 for ldif_file in $(find /assets/slapd/config/bootstrap/ldif -mindepth 1 -maxdepth 1 -type f -name \*.ldif | sort); do
                     print_debug "Bootstrap LDIF: Processing file ${ldif_file}"
+                    update_template "${ldif_file}" \
+                        BASE_DN
                     ldap_add_or_modify "${ldif_file}"
                 done
 
@@ -466,6 +468,8 @@ EOF
                 if [ -d /assets/slapd/config/bootstrap/ldif/custom ]; then
                     print_notice "Add custom bootstrap ldifs"
                     for ldif_file in $(find /assets/slapd/config/bootstrap/ldif/custom -type f -name \*.ldif | sort); do
+                        update_template "${ldif_file}" \
+                            BASE_DN
                         print_debug "LDIF: Processing file ${ldif_file}"
                         ldap_add_or_modify "${ldif_file}"
                     done
diff --git a/install/assets/slapd/config/bootstrap/ldif/03-nestgroup.ldif b/install/assets/slapd/config/bootstrap/ldif/03-nestgroup.ldif
new file mode 100755
index 0000000..8613030
--- /dev/null
+++ b/install/assets/slapd/config/bootstrap/ldif/03-nestgroup.ldif
@@ -0,0 +1,17 @@
+# Load memberof module
+dn: cn=module{0},cn=config
+changetype: modify
+add: olcModuleLoad
+olcModuleLoad: memberof
+
+# Backend memberOf overlay
+dn: olcOverlay={1}nestgroup,olcDatabase={1}mdb,cn=config
+changetype: add
+objectClass: olcOverlayConfig
+objectClass: olcNestGroupConfig
+olcOverlay: {1}nestgroup
+olcNestGroupBase: {{BASE_DN}}
+olcNestGroupFlags: member-values
+olcNestGroupFlags: member-filter
+olcNestGroupFlags: memberOf-values
+olcNestGroupFlags: memberOf-filter
diff --git a/install/assets/slapd/config/bootstrap/ldif/03-refint.ldif b/install/assets/slapd/config/bootstrap/ldif/04-refint.ldif
similarity index 82%
rename from install/assets/slapd/config/bootstrap/ldif/03-refint.ldif
rename to install/assets/slapd/config/bootstrap/ldif/04-refint.ldif
index 9007153..3f8c001 100755
--- a/install/assets/slapd/config/bootstrap/ldif/03-refint.ldif
+++ b/install/assets/slapd/config/bootstrap/ldif/04-refint.ldif
@@ -5,11 +5,11 @@ add: olcModuleLoad
 olcModuleLoad: refint
 
 # Backend refint overlay
-dn: olcOverlay={1}refint,olcDatabase={1}mdb,cn=config
+dn: olcOverlay={2}refint,olcDatabase={1}mdb,cn=config
 changetype: add
 objectClass: olcOverlayConfig
 objectClass: olcRefintConfig
-olcOverlay: {1}refint
+olcOverlay: {2}refint
 olcRefintAttribute: owner
 olcRefintAttribute: manager
 olcRefintAttribute: uniqueMember
diff --git a/install/assets/slapd/config/bootstrap/ldif/04-index.ldif b/install/assets/slapd/config/bootstrap/ldif/05-index.ldif
similarity index 100%
rename from install/assets/slapd/config/bootstrap/ldif/04-index.ldif
rename to install/assets/slapd/config/bootstrap/ldif/05-index.ldif