diff --git a/chef/databags/openstack/openstack.json b/chef/databags/openstack/openstack.json
index 818d2d5..014ff42 100644
--- a/chef/databags/openstack/openstack.json
+++ b/chef/databags/openstack/openstack.json
@@ -70,7 +70,7 @@
         },
       "text" : true
     },
-  "dashboard_roles" : [ "os-single-controller" ],
+  "dashboard_roles" : [ "os-single-controller", "os-dashboard" ],
   "db" : { "mysql" : { "bind_address" : "10.145.88.231",
           "port" : "3306"
         },
diff --git a/cobbler/kickstarts/default.ks b/cobbler/kickstarts/default.ks
index c3349f2..553a68d 100644
--- a/cobbler/kickstarts/default.ks
+++ b/cobbler/kickstarts/default.ks
@@ -67,7 +67,7 @@ reboot
 
 %pre
 $SNIPPET('log_ks_pre')
-$kickstart_start
+$SNIPPET('kickstart_start')
 $SNIPPET('pre_install_network_config')
 # Enable installation monitoring
 $SNIPPET('pre_anamon')
@@ -110,6 +110,10 @@ cat << EOF > /etc/ntp.conf
 $SNIPPET('ntp.conf')
 EOF
 
+cat << EOF > /etc/security/limits.conf
+$SNIPPET('limits.conf')
+EOF
+
 ## $yum_repo_stanza
 ## $yum_config_stanza
 
diff --git a/cobbler/snippets/chef b/cobbler/snippets/chef
index 2120607..64d6bd0 100644
--- a/cobbler/snippets/chef
+++ b/cobbler/snippets/chef
@@ -65,7 +65,7 @@ echo "new date is: \`date\`" 2>&1 >> /tmp/ntp.log
 #end if
 
 chmod +x /etc/chef/rerun.sh
-/etc/chef/rerun.sh
+/etc/chef/rerun.sh &
 
 crontab -l  > mycron
 echo "*/30 * * * *  /etc/chef/rerun.sh" >> mycron
diff --git a/cobbler/snippets/limits.conf b/cobbler/snippets/limits.conf
new file mode 100644
index 0000000..a997849
--- /dev/null
+++ b/cobbler/snippets/limits.conf
@@ -0,0 +1,53 @@
+# /etc/security/limits.conf
+#
+#Each line describes a limit for a user in the form:
+#
+#<domain>        <type>  <item>  <value>
+#
+#Where:
+#<domain> can be:
+#        - an user name
+#        - a group name, with @group syntax
+#        - the wildcard *, for default entry
+#        - the wildcard %, can be also used with %group syntax,
+#                 for maxlogin limit
+#
+#<type> can have the two values:
+#        - "soft" for enforcing the soft limits
+#        - "hard" for enforcing hard limits
+#
+#<item> can be one of the following:
+#        - core - limits the core file size (KB)
+#        - data - max data size (KB)
+#        - fsize - maximum filesize (KB)
+#        - memlock - max locked-in-memory address space (KB)
+#        - nofile - max number of open files
+#        - rss - max resident set size (KB)
+#        - stack - max stack size (KB)
+#        - cpu - max CPU time (MIN)
+#        - nproc - max number of processes
+#        - as - address space limit (KB)
+#        - maxlogins - max number of logins for this user
+#        - maxsyslogins - max number of logins on the system
+#        - priority - the priority to run user process with
+#        - locks - max number of file locks the user can hold
+#        - sigpending - max number of pending signals
+#        - msgqueue - max memory used by POSIX message queues (bytes)
+#        - nice - max nice priority allowed to raise to values: [-20, 19]
+#        - rtprio - max realtime priority
+#
+#<domain>      <type>  <item>         <value>
+#
+
+#raw
+#*               soft    core            0
+#*               hard    rss             10000
+#@student        hard    nproc           20
+#@faculty        soft    nproc           20
+#@faculty        hard    nproc           50
+#ftp             hard    nproc           0
+#@student        -       maxlogins       4
+*                -       nofile          100000 
+#end raw
+
+# End of file