diff --git a/Makefile b/Makefile
index 8aa263e..54d7a8a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-NAME = osixia/openldap
+NAME = nikolaik/openldap
 VERSION = 0.9.2
 
 .PHONY: all build test tag_latest release
diff --git a/README.md b/README.md
index 4210377..7bfce71 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,6 @@ and optionaly `dhparam.pem` this file is genereted automaticaly if not present.
                -v /data/ldap/log/:/var/log \
                -e LDAP_DOMAIN=example.com \
                -e LDAP_ORGANISATION="Example Corp." \
-               -e LDAP_ROOTPASS=toor \
+               -e LDAP_ADMIN_PWD=toor \
                -p 389:389 -d osixia/openldap
 
diff --git a/service/slapd/config/autofs.ldif b/service/slapd/config/autofs.ldif
new file mode 100644
index 0000000..9370b30
--- /dev/null
+++ b/service/slapd/config/autofs.ldif
@@ -0,0 +1,12 @@
+dn: cn=autofs,cn=schema,cn=config
+changetype: add
+objectClass: olcSchemaConfig
+cn: autofs
+olcAttributeTypes: {0}( 1.3.6.1.1.1.1.25 NAME 'automountInformation' DESC 'Inf
+ ormation used by the autofs automounter' EQUALITY caseExactIA5Match SYNTAX 1.
+ 3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+olcObjectClasses: {0}( 1.3.6.1.1.1.1.13 NAME 'automount' DESC 'An entry in an 
+ automounter map' SUP top STRUCTURAL MUST ( cn $ automountInformation $ object
+ class ) MAY description )
+olcObjectClasses: {1}( 1.3.6.1.4.1.2312.4.2.2 NAME 'automountMap' DESC 'An gro
+ up of related automount objects' SUP top STRUCTURAL MUST ou )
diff --git a/service/slapd/slapd.sh b/service/slapd/slapd.sh
index 1e8a309..c7be51f 100755
--- a/service/slapd/slapd.sh
+++ b/service/slapd/slapd.sh
@@ -86,4 +86,4 @@ fi
 status "starting slapd on default port 389"
 set -x
 
-exec /usr/sbin/slapd -h "ldap:///" -u openldap -g openldap -d -1
+exec /usr/sbin/slapd -h "ldap:/// ldapi:///" -u openldap -g openldap -d -1
diff --git a/test/config-repository b/test/config-repository
index c54c31a..a9f0bb2 100755
--- a/test/config-repository
+++ b/test/config-repository
@@ -1,4 +1,4 @@
-testImage=osixia/openldap:latest
+testImage=nikolaik/openldap:latest
 testContainer=openldap-repository-test-container
 testDir=/osixia-repository-test-docker-openldap