diff --git a/metadata.rb b/metadata.rb
index 18f92b21..c394edc2 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -5,7 +5,7 @@ issues_url       'https://launchpad.net/openstack-chef' if respond_to?(:issues_u
 source_url       'https://github.com/openstack/cookbook-openstack-compute' if respond_to?(:source_url)
 license          'Apache-2.0'
 description      'The OpenStack Compute service Nova.'
-version          '17.0.0'
+version          '17.0.1'
 
 chef_version '>= 12.5' if respond_to?(:chef_version)
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
diff --git a/recipes/nova-common.rb b/recipes/nova-common.rb
index fc134e4f..c80f0fd9 100644
--- a/recipes/nova-common.rb
+++ b/recipes/nova-common.rb
@@ -163,8 +163,8 @@ node.default['openstack']['compute']['conf'].tap do |conf|
   conf['vnc']['xvpvncproxy_port'] = xvpvnc_bind['port']
   conf['vnc']['novncproxy_host'] = novnc_bind_address
   conf['vnc']['novncproxy_port'] = novnc_bind['port']
-  conf['vnc']['vncserver_listen'] = vnc_bind_address
-  conf['vnc']['vncserver_proxyclient_address'] = vnc_proxy_bind_address
+  conf['vnc']['server_listen'] = vnc_bind_address
+  conf['vnc']['server_proxyclient_address'] = vnc_proxy_bind_address
   unless memcache_servers.empty?
     # Need to set the backend explicitly, see LP bug #1572062
     conf['cache']['backend'] = 'oslo_cache.memcache_pool'
diff --git a/spec/nova-common_spec.rb b/spec/nova-common_spec.rb
index f4b75fa8..ae4993c2 100644
--- a/spec/nova-common_spec.rb
+++ b/spec/nova-common_spec.rb
@@ -185,21 +185,21 @@ describe 'openstack-compute::nova-common' do
         end
       end
 
-      it 'has default vncserver_* options set' do
+      it 'has default server_* options set' do
         node.set['openstack']['endpoints']['compute-vnc-bind']['bind_interface'] = 'lo'
 
-        [/^vncserver_listen = 127.0.0.1$/,
-         /^vncserver_proxyclient_address = 127.0.0.1$/].each do |line|
+        [/^server_listen = 127.0.0.1$/,
+         /^server_proxyclient_address = 127.0.0.1$/].each do |line|
           expect(chef_run).to render_file(file.name).with_content(line)
         end
       end
 
-      it 'has override vncserver_* options set' do
+      it 'has override server_* options set' do
         node.set['openstack']['bind_service']['all']['compute-vnc']['host'] = '1.1.1.1'
         node.set['openstack']['bind_service']['all']['compute-vnc-proxy']['host'] = '2.2.2.2'
 
-        [/^vncserver_listen = 1.1.1.1$/,
-         /^vncserver_proxyclient_address = 2.2.2.2$/].each do |line|
+        [/^server_listen = 1.1.1.1$/,
+         /^server_proxyclient_address = 2.2.2.2$/].each do |line|
           expect(chef_run).to render_file(file.name).with_content(line)
         end
       end