diff --git a/puppet/modules/devstack/files/compute.conf b/puppet/modules/devstack/files/compute.conf
index ea5709d..6ea2646 100644
--- a/puppet/modules/devstack/files/compute.conf
+++ b/puppet/modules/devstack/files/compute.conf
@@ -16,6 +16,8 @@ ADMIN_PASSWORD=pass
 API_RATE_LIMIT="False"
 RECLONE="True"
 
+enable_service ceilometer-acompute
+
 [[post-config|$NOVA_CONF]]
 [DEFAULT]
 flat_interface = eth1
diff --git a/puppet/modules/devstack/files/manager.conf b/puppet/modules/devstack/files/manager.conf
index 0f0ce45..bce0667 100644
--- a/puppet/modules/devstack/files/manager.conf
+++ b/puppet/modules/devstack/files/manager.conf
@@ -14,6 +14,8 @@ IMAGE_URLS+=",https://download.fedoraproject.org/pub/fedora/linux/releases/20/Im
 IMAGE_URLS+=",https://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img"
 
 enable_service dstat
+enable_service ceilometer-acompute ceilometer-acentral ceilometer-anotification ceilometer-collector ceilometer-api
+enable_service ceilometer-alarm-notifier ceilometer-alarm-evaluato
 
 [[post-config|$NOVA_CONF]]
 [DEFAULT]
diff --git a/puppet/modules/devstack/manifests/init.pp b/puppet/modules/devstack/manifests/init.pp
index 3cedfae..c150ceb 100644
--- a/puppet/modules/devstack/manifests/init.pp
+++ b/puppet/modules/devstack/manifests/init.pp
@@ -2,6 +2,7 @@ class devstack(
   $dir = '/home/stack/devstack'
 )
 {
+  $user = $user::stack::username
   vcsrepo { $dir:
     ensure => latest,
     provider => git,
@@ -18,16 +19,16 @@ class devstack(
   }
 
   file { "$dir/local.sh":
-    owner => "stack",
-    group => "stack",
+    owner => $user,
+    group => $user,
     mode  => 755,
     source => "puppet:///modules/devstack/local.sh",
     require => vcsrepo[ $dir ]
   }
 
   file { "$dir/local.conf":
-    owner => "stack",
-    group => "stack",
+    owner => $user,
+    group => $user,
     mode  => 644,
     source => "puppet:///modules/devstack/$localrc",
     require => [vcsrepo[ $dir ], file["$dir/local.sh"]]
@@ -37,7 +38,9 @@ class devstack(
     require => [vcsrepo[ $dir ], file["$dir/local.conf"]],
     cwd => $dir,
     path => "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.",
+    environment => "HOME=/home/$user",
     user => 'stack',
+    group => 'stack',
     command => "$dir/stack.sh",
     logoutput => true,
     timeout => 1200
diff --git a/puppet/modules/user/manifests/stack.pp b/puppet/modules/user/manifests/stack.pp
index 93f15b1..b62a823 100644
--- a/puppet/modules/user/manifests/stack.pp
+++ b/puppet/modules/user/manifests/stack.pp
@@ -1,4 +1,7 @@
-class user::stack() {
+class user::stack(
+  $username = 'stack'
+)
+{
 
   file {'/etc/sudoers.d/stack':
     owner => "root",
@@ -8,15 +11,15 @@ class user::stack() {
   } ->
 
   user::create {'stack':
-    user => 'stack',
+    user => $username,
     pass => $stack_pass,
     key => $stack_sshkey,
     is_admin => true,
   } ->
 
   file {'/home/stack/.bashrc':
-    owner => "stack",
-    group => "stack",
+    owner => $username,
+    group => $username,
     mode  => 644,
     source => "puppet:///modules/user/stack_bashrc"
   }