diff --git a/manifests/spicehtml5proxy.pp b/manifests/spicehtml5proxy.pp
index 0994ba3d9..4a4ab51cb 100644
--- a/manifests/spicehtml5proxy.pp
+++ b/manifests/spicehtml5proxy.pp
@@ -39,8 +39,10 @@ class nova::spicehtml5proxy(
   include ::nova::params
 
   nova_config {
-    'DEFAULT/spicehtml5proxy_host': value => $host;
-    'DEFAULT/spicehtml5proxy_port': value => $port;
+    'spice/enabled':         value => $enabled;
+    'spice/agent_enabled':   value => $enabled;
+    'spice/html5proxy_host': value => $host;
+    'spice/html5proxy_port': value => $port;
   }
 
   nova::generic_service { 'spicehtml5proxy':
diff --git a/spec/classes/nova_spicehtml5_proxy_spec.rb b/spec/classes/nova_spicehtml5_proxy_spec.rb
index 8e4dca597..4828be3ea 100644
--- a/spec/classes/nova_spicehtml5_proxy_spec.rb
+++ b/spec/classes/nova_spicehtml5_proxy_spec.rb
@@ -13,8 +13,8 @@ describe 'nova::spicehtml5proxy' do
   shared_examples 'nova-spicehtml5proxy' do
 
     it 'configures nova.conf' do
-      is_expected.to contain_nova_config('DEFAULT/spicehtml5proxy_host').with(:value => '0.0.0.0')
-      is_expected.to contain_nova_config('DEFAULT/spicehtml5proxy_port').with(:value => '6082')
+      is_expected.to contain_nova_config('spice/html5proxy_host').with(:value => '0.0.0.0')
+      is_expected.to contain_nova_config('spice/html5proxy_port').with(:value => '6082')
     end
 
     it { is_expected.to contain_package('nova-spicehtml5proxy').with(