diff --git a/manifests/compute/controller.pp b/manifests/compute/controller.pp
index c742b07e..b0fe0555 100644
--- a/manifests/compute/controller.pp
+++ b/manifests/compute/controller.pp
@@ -33,8 +33,7 @@ class cloud::compute::controller(
     'nova::scheduler',
     'nova::cert',
     'nova::consoleauth',
-    'nova::conductor',
-    'nova::spicehtml5proxy'
+    'nova::conductor'
   ]:
     enabled => true,
   }
@@ -48,6 +47,11 @@ class cloud::compute::controller(
       neutron_metadata_proxy_shared_secret => $neutron_metadata_proxy_shared_secret,
     }
 
+    class { 'nova::spicehtml5proxy':
+      enabled => true,
+      host    => $api_eth
+    }
+
   @@haproxy::balancermember{"${::fqdn}-compute_api_ec2":
     listening_service => 'ec2_api_cluster',
     server_names      => $::hostname,
diff --git a/manifests/telemetry/server.pp b/manifests/telemetry/server.pp
index 8011af74..1d527e3d 100644
--- a/manifests/telemetry/server.pp
+++ b/manifests/telemetry/server.pp
@@ -56,6 +56,7 @@ class cloud::telemetry::server(
     keystone_password => $ks_ceilometer_password,
     keystone_host     => $ks_keystone_internal_host,
     keystone_protocol => $ks_keystone_internal_proto,
+    host              => $api_eth
   }
 
 # Configure TTL for samples
diff --git a/spec/classes/cloud_compute_controller_spec.rb b/spec/classes/cloud_compute_controller_spec.rb
index ab69d983..2931d00f 100644
--- a/spec/classes/cloud_compute_controller_spec.rb
+++ b/spec/classes/cloud_compute_controller_spec.rb
@@ -89,7 +89,10 @@ describe 'cloud::compute::controller' do
     end
 
     it 'configure nova-spicehtml5proxy' do
-      should contain_class('nova::spicehtml5proxy').with(:enabled => true)
+      should contain_class('nova::spicehtml5proxy').with(
+        :enabled => true,
+        :host    => '10.0.0.1'
+      )
     end
 
     it 'configure nova-cert' do
diff --git a/spec/classes/cloud_telemetry_server_spec.rb b/spec/classes/cloud_telemetry_server_spec.rb
index 41d3a8ff..5222e13f 100644
--- a/spec/classes/cloud_telemetry_server_spec.rb
+++ b/spec/classes/cloud_telemetry_server_spec.rb
@@ -94,6 +94,7 @@ describe 'cloud::telemetry::server' do
           :keystone_password => 'secrete',
           :keystone_host     => '10.0.0.1',
           :keystone_protocol => 'http',
+          :host              => '10.0.0.1'
         )
     end