diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp
index b29b881b8..0ef7d51dc 100644
--- a/fixtures/scenario001.pp
+++ b/fixtures/scenario001.pp
@@ -14,9 +14,7 @@
 # limitations under the License.
 #
 
-if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') or
-  ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
-  # FIXME(ykarel) Disable SSL until services are ready to work with SSL + Python3
+if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') {
   $ssl = false
 } else {
   $ssl = true
diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp
index 50a62f7d2..afc979ec6 100644
--- a/fixtures/scenario003.pp
+++ b/fixtures/scenario003.pp
@@ -14,9 +14,7 @@
 # limitations under the License.
 #
 
-if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') or
-  ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
-  # FIXME(ykarel) Disable SSL until services are ready to work with SSL + Python3
+if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') {
   $ssl = false
 } else {
   $ssl = true
diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp
index 9fd5f44f8..6fe53287b 100644
--- a/fixtures/scenario004.pp
+++ b/fixtures/scenario004.pp
@@ -14,9 +14,7 @@
 # limitations under the License.
 #
 
-if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') or
-  ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
-  # FIXME(ykarel) Disable SSL until services are ready to work with SSL + Python3
+if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') {
   $ssl = false
 } else {
   $ssl = true
diff --git a/manifests/cinder.pp b/manifests/cinder.pp
index 25ce6f8ae..ed26b0acf 100644
--- a/manifests/cinder.pp
+++ b/manifests/cinder.pp
@@ -120,7 +120,7 @@ class openstack_integration::cinder (
   class { 'cinder::backup': }
   class { 'cinder::cron::db_purge': }
   class { 'cinder::glance':
-    glance_api_servers => "${::openstack_integration::config::base_url}:9292",
+    glance_api_servers => "http://${::openstack_integration::config::ip_for_url}:9292",
   }
   case $backend {
     'iscsi': {
diff --git a/manifests/glance.pp b/manifests/glance.pp
index 820eff2a4..7ca3ba307 100644
--- a/manifests/glance.pp
+++ b/manifests/glance.pp
@@ -14,12 +14,9 @@ class openstack_integration::glance (
 
   if $::openstack_integration::config::ssl {
     openstack_integration::ssl_key { 'glance':
-      notify => Service['glance-api'],
     }
-    Package<| tag == 'glance-package' |> -> File['/etc/glance/ssl']
-    $key_file  = "/etc/glance/ssl/private/${::fqdn}.pem"
-    $crt_file = $::openstack_integration::params::cert_path
-    Exec['update-ca-certificates'] ~> Service['glance-api']
+    $key_file = undef
+    $crt_file  = undef
   } else {
     $key_file = undef
     $crt_file  = undef
@@ -36,9 +33,9 @@ class openstack_integration::glance (
   include glance
   include glance::client
   class { 'glance::keystone::auth':
-    public_url   => "${::openstack_integration::config::base_url}:9292",
-    internal_url => "${::openstack_integration::config::base_url}:9292",
-    admin_url    => "${::openstack_integration::config::base_url}:9292",
+    public_url   => "http://${::openstack_integration::config::ip_for_url}:9292",
+    internal_url => "http://${::openstack_integration::config::ip_for_url}:9292",
+    admin_url    => "http://${::openstack_integration::config::ip_for_url}:9292",
     password     => 'a_big_secret',
   }
   class { 'glance::api::authtoken':
diff --git a/manifests/neutron.pp b/manifests/neutron.pp
index 8bec1fd19..82eabd46d 100644
--- a/manifests/neutron.pp
+++ b/manifests/neutron.pp
@@ -38,7 +38,7 @@ class openstack_integration::neutron (
       notify  => Service['neutron-server'],
       require => Package['neutron'],
     }
-    Exec['update-ca-certificates'] ~> Service['neutron-server']
+    Exec['update-ca-certificates'] ~> Service<| tag == 'neutron-service' |>
   }
 
   if ($::operatingsystem == 'CentOS') and (versioncmp($::operatingsystemmajrelease, '8') == 0) {