diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp
index 5616f982..4c03334d 100644
--- a/manifests/network/controller.pp
+++ b/manifests/network/controller.pp
@@ -28,9 +28,9 @@ class cloud::network::controller(
   $ks_admin_tenant         = 'admin',
   $nova_url                = 'http://127.0.0.1:8774/v2',
   $nova_admin_auth_url     = 'http://127.0.0.1:35357/v2.0',
-  $nova_admin_username     = 'nova',
-  $nova_admin_tenant_name  = 'services',
-  $nova_admin_password     = 'novapassword',
+  $nova_admin_username     = 'admin',
+  $nova_admin_tenant_name  = 'admin',
+  $nova_admin_password     = 'adminpassword',
   $nova_region_name        = 'RegionOne'
 ) {
 
diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb
index be4bbeb8..9e208a48 100644
--- a/spec/classes/cloud_network_controller_spec.rb
+++ b/spec/classes/cloud_network_controller_spec.rb
@@ -45,9 +45,9 @@ describe 'cloud::network::controller' do
         :ks_keystone_public_port  => '5000',
         :nova_url                 => 'http://127.0.0.1:8774/v2',
         :nova_admin_auth_url      => 'http://127.0.0.1:35357/v2.0',
-        :nova_admin_username      => 'nova',
-        :nova_admin_tenant_name   => 'services',
-        :nova_admin_password      => 'novapassword',
+        :nova_admin_username      => 'admin',
+        :nova_admin_tenant_name   => 'admin',
+        :nova_admin_password      => 'adminpassword',
         :nova_region_name         => 'RegionOne',
         :api_eth                  => '10.0.0.1' }
     end
@@ -103,9 +103,9 @@ describe 'cloud::network::controller' do
       should contain_class('neutron::server::notifications').with(
         :nova_url                => 'http://127.0.0.1:8774/v2',
         :nova_admin_auth_url     => 'http://127.0.0.1:35357/v2.0',
-        :nova_admin_username     => 'nova',
-        :nova_admin_tenant_name  => 'services',
-        :nova_admin_password     => 'novapassword',
+        :nova_admin_username     => 'admin',
+        :nova_admin_tenant_name  => 'admin',
+        :nova_admin_password     => 'adminpassword',
         :nova_region_name        => 'RegionOne'
       )
     end