diff --git a/tmpl/oned.conf b/tmpl/oned.conf
index b90019f..3af1eac 100644
--- a/tmpl/oned.conf
+++ b/tmpl/oned.conf
@@ -551,6 +551,25 @@ MARKET_MAD = [
     ARGUMENTS  = "-t 15 -m http,s3,one"
 ]
 
+#*******************************************************************************
+# IPAM Driver Configuration
+#*******************************************************************************
+# Drivers to manage different IPAMs
+#   executable: path of the IPAM driver executable, can be an
+#               absolute path or relative to $ONE_LOCATION/lib/mads (or
+#               /usr/lib/one/mads/ if OpenNebula was installed in /)
+#
+#   arguments : for the driver executable
+#       -t number of threads, i.e. number of operations at the same time
+#       -i IPAM mads separated by commas
+#*******************************************************************************
+
+IPAM_MAD = [
+    EXECUTABLE = "one_ipam",
+	ARGUMENTS  = "-t 1 -i dummy"
+]
+
+
 #*******************************************************************************
 # Hook Manager Configuration
 #*******************************************************************************
@@ -838,6 +857,12 @@ AUTH_MAD = [
     AUTHN = "ssh,x509,server_cipher,server_x509"
 ]
 
+AUTH_MAD_CONF = [
+    NAME = "core",
+    PASSWORD_CHANGE = "YES",
+    DRIVER_MANAGED_GROUPS = "NO",
+    MAX_TOKEN_TIME = "-1"
+]
 %else
 AUTH_MAD = [
     EXECUTABLE = "one_auth_mad",
@@ -845,6 +870,15 @@ AUTH_MAD = [
 ]
 
 DEFAULT_AUTH = "ldap"
+
+   %if %%getVar('sunstone_auth_modes','') == 'ldap'
+AUTH_MAD_CONF = [
+    NAME = "ldap",
+    PASSWORD_CHANGE = "YES",
+    DRIVER_MANAGED_GROUPS = "YES",
+    MAX_TOKEN_TIME = "86400"
+]
+   %end if
 %end if