diff --git a/manifests/sahara.pp b/manifests/sahara.pp
index d4c5b7409..09678a324 100644
--- a/manifests/sahara.pp
+++ b/manifests/sahara.pp
@@ -52,9 +52,6 @@ class openstack_integration::sahara (
   }
   class { 'sahara':
     host                  => $::openstack_integration::config::host,
-    use_ssl               => $::openstack_integration::config::ssl,
-    cert_file             => $::openstack_integration::params::cert_path,
-    key_file              => "/etc/sahara/ssl/private/${facts['networking']['fqdn']}.pem",
     default_transport_url => os_transport_url({
       'transport' => $::openstack_integration::config::messaging_default_proto,
       'host'      => $::openstack_integration::config::host,
@@ -73,22 +70,16 @@ class openstack_integration::sahara (
     www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri,
     memcached_servers    => $::openstack_integration::config::memcached_servers,
   }
-  $service_name = $facts['os']['name'] ? {
-    'Debian' => $::sahara::params::api_service_name,
-    default  => 'httpd',
-  }
   class { 'sahara::service::api':
-    service_name => $service_name,
+    service_name => 'httpd',
   }
-  if $service_name == 'httpd' {
-    include apache
-    class { 'sahara::wsgi::apache':
-      bind_host => $::openstack_integration::config::host,
-      ssl       => $::openstack_integration::config::ssl,
-      ssl_key   => "/etc/sahara/ssl/private/${facts['networking']['fqdn']}.pem",
-      ssl_cert  => $::openstack_integration::params::cert_path,
-      workers   => 2,
-    }
+  include apache
+  class { 'sahara::wsgi::apache':
+    bind_host => $::openstack_integration::config::host,
+    ssl       => $::openstack_integration::config::ssl,
+    ssl_key   => "/etc/sahara/ssl/private/${facts['networking']['fqdn']}.pem",
+    ssl_cert  => $::openstack_integration::params::cert_path,
+    workers   => 2,
   }
   class { 'sahara::service::engine': }
   class { 'sahara::client': }