diff --git a/fixtures/scenario000.pp b/fixtures/scenario000.pp
index 32a4cb012..b6b94b21e 100644
--- a/fixtures/scenario000.pp
+++ b/fixtures/scenario000.pp
@@ -16,7 +16,7 @@
 
 # Keystone only puppet deployment
 
-if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') {
+if $::os['name'] == 'Ubuntu' {
   $ssl = false
 } else {
   $ssl = true
diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp
index dfa3407b0..765309569 100644
--- a/fixtures/scenario001.pp
+++ b/fixtures/scenario001.pp
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') {
+if $::os['name'] == 'Ubuntu' {
   $ssl = false
 } else {
   $ssl = true
diff --git a/fixtures/scenario002.pp b/fixtures/scenario002.pp
index a78247293..6a5eab503 100644
--- a/fixtures/scenario002.pp
+++ b/fixtures/scenario002.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' {
   $ssl = false
 } else {
   $ssl = true
@@ -24,13 +22,13 @@ if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') or
 
 case $::osfamily {
   'Debian': {
-    $ipv6             = false
+    $ipv6           = false
     # ec2api is not packaged on UCA
-    $ec2api_enabled   = false
+    $ec2api_enabled = false
   }
   'RedHat': {
-    $ipv6               = true
-    $ec2api_enabled     = true
+    $ipv6           = true
+    $ec2api_enabled = true
   }
   default: {
     fail("Unsupported osfamily (${::osfamily})")
diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp
index 5d8fefccf..1e26e14f4 100644
--- a/fixtures/scenario003.pp
+++ b/fixtures/scenario003.pp
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') {
+if $::os['name'] == 'Ubuntu' {
   $ssl = false
 } else {
   $ssl = true
diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp
index 9d42f1437..341991761 100644
--- a/fixtures/scenario004.pp
+++ b/fixtures/scenario004.pp
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') {
+if $::os['name'] == 'Ubuntu' {
   $ssl = false
 } else {
   $ssl = true
diff --git a/manifests/repos.pp b/manifests/repos.pp
index e1d68d5c1..fd05bf675 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -102,24 +102,10 @@ class openstack_integration::repos {
       }
 
       # PowerTools is required on CentOS8 since Ussuri.
-      if $::operatingsystem == 'CentOS' {
-        exec { 'enable-powertools':
-          command => "dnf config-manager --enable ${powertools_repo}",
-          path    => '/usr/bin/',
-          unless  => "test 0 -ne $(dnf repolist --enabled ${powertools_repo} | wc -l)"
-        }
-      }
-
-      # Remove Fedora Base repos as stable-base repo is configured which includes
-      # all required packages
-      if $::operatingsystem == 'Fedora' {
-        tidy { 'delete-fedora-base-repos':
-          path    => '/etc/yum.repos.d',
-          recurse => true,
-          matches => [ 'fedora*.repo' ],
-          rmdirs  => false,
-          require => Class['openstack_extras::repo::redhat::redhat'],
-        }
+      exec { 'enable-powertools':
+        command => "dnf config-manager --enable ${powertools_repo}",
+        path    => '/usr/bin/',
+        unless  => "test 0 -ne $(dnf repolist --enabled ${powertools_repo} | wc -l)"
       }
     }
     default: {