diff --git a/manifests/params.pp b/manifests/params.pp
index 562731e..7bc7eba 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -3,14 +3,8 @@
 class watcher::params {
   include ::openstacklib::defaults
 
-  if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
-    ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
-    $pyvers = '3'
-    $pyver3 = '3.6'
-  } else {
-    $pyvers = ''
-    $pyver3 = '2.7'
-  }
+  $pyvers = $::openstacklib::defaults::pyvers
+  $pyver3 = $::openstacklib::defaults::pyver3
 
   $client_package_name = "python${pyvers}-watcherclient"
   $group               = 'watcher'
@@ -38,7 +32,7 @@ class watcher::params {
       if ($::os_package_type == 'debian') {
         $watcher_wsgi_script_source = '/usr/share/watcher-common/app.wsgi'
       } else {
-        $watcher_wsgi_script_source = '/usr/lib/python2.7/dist-packages/watcher/api/app.wsgi'
+        $watcher_wsgi_script_source = "/usr/lib/python${pyver3}/dist-packages/watcher/api/app.wsgi"
       }
       $watcher_wsgi_script_path     = '/usr/lib/cgi-bin/watcher'
     }
diff --git a/spec/classes/watcher_client_spec.rb b/spec/classes/watcher_client_spec.rb
index f8cd9a1..7a9b4ac 100644
--- a/spec/classes/watcher_client_spec.rb
+++ b/spec/classes/watcher_client_spec.rb
@@ -27,11 +27,7 @@ describe 'watcher::client' do
       let(:platform_params) do
         case facts[:osfamily]
         when 'Debian'
-          if facts[:os_package_type] == 'debian'
-            { :client_package_name => 'python3-watcherclient' }
-          else
-            { :client_package_name => 'python-watcherclient' }
-          end
+          { :client_package_name => 'python3-watcherclient' }
         when 'RedHat'
           { :client_package_name => 'python-watcherclient' }
         end
diff --git a/spec/classes/watcher_wsgi_apache_spec.rb b/spec/classes/watcher_wsgi_apache_spec.rb
index 6cd5952..9e2aa1a 100644
--- a/spec/classes/watcher_wsgi_apache_spec.rb
+++ b/spec/classes/watcher_wsgi_apache_spec.rb
@@ -92,7 +92,7 @@ describe 'watcher::wsgi::apache' do
         when 'Debian'
           {
             :wsgi_script_path   => '/usr/lib/cgi-bin/watcher',
-            :wsgi_script_source => '/usr/lib/python2.7/dist-packages/watcher/api/app.wsgi'
+            :wsgi_script_source => '/usr/lib/python3/dist-packages/watcher/api/app.wsgi'
           }
         when 'RedHat'
           {