diff --git a/manifests/params.pp b/manifests/params.pp
index 97c734ff..7cc401c2 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -4,10 +4,9 @@
 #
 class gnocchi::params {
   include openstacklib::defaults
-  $pyvers = $::openstacklib::defaults::pyvers
 
-  $client_package_name        = "python${pyvers}-gnocchiclient"
-  $rados_package_name         = "python${pyvers}-rados"
+  $client_package_name        = 'python3-gnocchiclient'
+  $rados_package_name         = 'python3-rados'
   $common_package_name        = 'gnocchi-common'
   $api_package_name           = 'gnocchi-api'
   $api_service_name           = 'gnocchi-api'
@@ -24,16 +23,16 @@ class gnocchi::params {
       $indexer_package_name       = 'openstack-gnocchi-indexer-sqlalchemy'
       $gnocchi_wsgi_script_path   = '/var/www/cgi-bin/gnocchi'
       $pymysql_package_name       = undef
-      $cradox_package_name        = "python${pyvers}-cradox"
-      $redis_package_name         = "python${pyvers}-redis"
+      $cradox_package_name        = 'python3-cradox'
+      $redis_package_name         = 'python3-redis'
     }
     'Debian': {
       $sqlite_package_name        = 'python-pysqlite2'
       $indexer_package_name       = undef
       $gnocchi_wsgi_script_path   = '/usr/lib/cgi-bin/gnocchi'
-      $pymysql_package_name       = "python${pyvers}-pymysql"
+      $pymysql_package_name       = 'python3-pymysql'
       $cradox_package_name        = undef
-      $redis_package_name         = "python${pyvers}-redis"
+      $redis_package_name         = 'python3-redis'
     }
     default: {
       fail("Unsupported osfamily: ${::osfamily} operatingsystem")
diff --git a/spec/classes/gnocchi_client_spec.rb b/spec/classes/gnocchi_client_spec.rb
index 5571d5af..fc31885c 100644
--- a/spec/classes/gnocchi_client_spec.rb
+++ b/spec/classes/gnocchi_client_spec.rb
@@ -27,15 +27,7 @@ describe 'gnocchi::client' do
         when 'Debian'
           { :client_package_name => 'python3-gnocchiclient' }
         when 'RedHat'
-          if facts[:operatingsystem] == 'Fedora'
-            { :client_package_name => 'python3-gnocchiclient' }
-          else
-            if facts[:operatingsystemmajrelease] > '7'
-              { :client_package_name => 'python3-gnocchiclient' }
-            else
-              { :client_package_name => 'python-gnocchiclient' }
-            end
-          end
+          { :client_package_name => 'python3-gnocchiclient' }
         end
       end
 
diff --git a/spec/classes/gnocchi_init_spec.rb b/spec/classes/gnocchi_init_spec.rb
index 1e393a74..6d65a2d8 100644
--- a/spec/classes/gnocchi_init_spec.rb
+++ b/spec/classes/gnocchi_init_spec.rb
@@ -71,21 +71,9 @@ describe 'gnocchi' do
             :redis_package_name     => 'python3-redis'
           }
         when 'RedHat'
-          if facts[:operatingsystem] == 'Fedora'
-            { :gnocchi_common_package => 'gnocchi-common',
-              :redis_package_name     => 'python3-redis'
-            }
-          else
-            if facts[:operatingsystemmajrelease] > '7'
-              { :gnocchi_common_package => 'gnocchi-common',
-                :redis_package_name     => 'python3-redis'
-              }
-            else
-              { :gnocchi_common_package => 'gnocchi-common',
-                :redis_package_name     => 'python-redis'
-              }
-            end
-          end
+          { :gnocchi_common_package => 'gnocchi-common',
+            :redis_package_name     => 'python3-redis'
+          }
         end
       end
       it_behaves_like 'gnocchi'
diff --git a/spec/classes/gnocchi_storage_spec.rb b/spec/classes/gnocchi_storage_spec.rb
index 302ec673..24b0aeb4 100644
--- a/spec/classes/gnocchi_storage_spec.rb
+++ b/spec/classes/gnocchi_storage_spec.rb
@@ -19,7 +19,7 @@ describe 'gnocchi::storage' do
          when 'Debian'
            { :redis_package_name => 'python3-redis' }
          when 'RedHat'
-           { :redis_package_name => 'python-redis' }
+           { :redis_package_name => 'python3-redis' }
          end
       end