diff --git a/manifests/defaults.pp b/manifests/defaults.pp
index b5e3cc09..b42dd251 100644
--- a/manifests/defaults.pp
+++ b/manifests/defaults.pp
@@ -9,11 +9,25 @@ class openstacklib::defaults {
   if ($::os['family'] == 'Debian') {
     $pyvers = '3'
     $pyver3 = '3'
-  } elsif ($::os['name'] == 'Fedora') or
-          ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
+  } elsif ($::os['name'] == 'Fedora') {
+    # TODO(tkajinam): This is very outdated and doesn't work with the latest
+    #                 Fedora. We should fix or drop this.
     $pyvers = '3'
     $pyver3 = '3.6'
+  } elsif $::os['family'] == 'RedHat' {
+    if Integer.new($::os['release']['major']) > 8 {
+      $pyvers = '3'
+      $pyver3 = '3.9'
+    } elsif Integer.new($::os['release']['major']) == 8 {
+      $pyvers = '3'
+      $pyver3 = '3.6'
+    } else {
+      $pyvers = ''
+      $pyver3 = '2.7'
+    }
   } else {
+    # TODO(tkajinam) This is left to keep the previous behavior but we should
+    #                revisit this later.
     $pyvers = ''
     $pyver3 = '2.7'
   }