diff --git a/modules/elastic_recheck/manifests/init.pp b/modules/elastic_recheck/manifests/init.pp
index 3f63d2e003..0da5bbd871 100644
--- a/modules/elastic_recheck/manifests/init.pp
+++ b/modules/elastic_recheck/manifests/init.pp
@@ -46,9 +46,8 @@ class elastic_recheck (
 
   include pip
   exec { 'install_elastic-recheck' :
-    command     => 'python setup.py install',
-    cwd         => '/opt/elastic-recheck',
-    path        => '/bin:/usr/bin',
+    command     => 'pip install /opt/elastic-recheck',
+    path        => '/usr/local/bin:/usr/bin:/bin/',
     refreshonly => true,
     notify      => Service['elastic-recheck'],
     subscribe   => Vcsrepo['/opt/elastic-recheck'],
diff --git a/modules/graphite/manifests/init.pp b/modules/graphite/manifests/init.pp
index 5ac0e5a60c..741eb783fd 100644
--- a/modules/graphite/manifests/init.pp
+++ b/modules/graphite/manifests/init.pp
@@ -60,9 +60,8 @@ class graphite(
   }
 
   exec { 'install_whisper' :
-    command     => 'python setup.py install',
-    cwd         => '/opt/whisper',
-    path        => '/bin:/usr/bin',
+    command     => 'pip install /opt/whisper',
+    path        => '/usr/local/bin:/usr/bin:/bin/',
     refreshonly => true,
     subscribe   => Vcsrepo['/opt/whisper'],
   }
diff --git a/modules/jeepyb/manifests/init.pp b/modules/jeepyb/manifests/init.pp
index ae0a623f73..c05f08cf88 100644
--- a/modules/jeepyb/manifests/init.pp
+++ b/modules/jeepyb/manifests/init.pp
@@ -69,9 +69,8 @@ class jeepyb (
   }
 
   exec { 'install_jeepyb' :
-    command     => 'python setup.py install',
-    cwd         => '/opt/jeepyb',
-    path        => '/bin:/usr/bin',
+    command     => 'pip install /opt/jeepyb',
+    path        => '/usr/local/bin:/usr/bin:/bin/',
     refreshonly => true,
     require     => Class['mysql::python'],
     subscribe   => Vcsrepo['/opt/jeepyb'],
diff --git a/modules/jenkins/manifests/job_builder.pp b/modules/jenkins/manifests/job_builder.pp
index 85e942c063..ecb8c43d53 100644
--- a/modules/jenkins/manifests/job_builder.pp
+++ b/modules/jenkins/manifests/job_builder.pp
@@ -28,9 +28,8 @@ class jenkins::job_builder (
   }
 
   exec { 'install_jenkins_job_builder':
-    command     => 'python setup.py install',
-    cwd         => '/opt/jenkins_job_builder',
-    path        => '/bin:/usr/bin',
+    command     => 'pip install /opt/jenkins_job_builder',
+    path        => '/usr/local/bin:/usr/bin:/bin/',
     refreshonly => true,
     subscribe   => Vcsrepo['/opt/jenkins_job_builder'],
   }
diff --git a/modules/nodepool/manifests/init.pp b/modules/nodepool/manifests/init.pp
index 024e40cc8b..27018b7d60 100644
--- a/modules/nodepool/manifests/init.pp
+++ b/modules/nodepool/manifests/init.pp
@@ -78,9 +78,8 @@ class nodepool (
   }
 
   exec { 'install_nodepool' :
-    command     => 'python setup.py install',
-    cwd         => '/opt/nodepool',
-    path        => '/bin:/usr/bin',
+    command     => 'pip install /opt/nodepool',
+    path        => '/usr/local/bin:/usr/bin:/bin/',
     refreshonly => true,
     subscribe   => Vcsrepo['/opt/nodepool'],
     require     => Class['pip'],
diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp
index 8a3dc8eaf1..9890b30322 100644
--- a/modules/openstack_project/manifests/static.pp
+++ b/modules/openstack_project/manifests/static.pp
@@ -335,9 +335,8 @@ class openstack_project::static (
 
   include pip
   exec { 'install_elastic-recheck' :
-    command     => 'python setup.py install',
-    cwd         => '/opt/elastic-recheck',
-    path        => '/bin:/usr/bin',
+    command     => 'pip install /opt/elastic-recheck',
+    path        => '/usr/local/bin:/usr/bin:/bin/',
     refreshonly => true,
     subscribe   => Vcsrepo['/opt/elastic-recheck'],
     require     => Class['pip'],
diff --git a/modules/statusbot/manifests/init.pp b/modules/statusbot/manifests/init.pp
index 546d6a1839..6d6d114b30 100644
--- a/modules/statusbot/manifests/init.pp
+++ b/modules/statusbot/manifests/init.pp
@@ -33,9 +33,8 @@ class statusbot(
   }
 
   exec { 'install_statusbot' :
-    command     => 'python setup.py install',
-    cwd         => '/opt/statusbot',
-    path        => '/bin:/usr/bin',
+    command     => 'pip install /opt/statusbot',
+    path        => '/usr/local/bin:/usr/bin:/bin/',
     refreshonly => true,
     subscribe   => Vcsrepo['/opt/statusbot'],
   }
diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp
index 176a04f9fe..432c85c589 100644
--- a/modules/zuul/manifests/init.pp
+++ b/modules/zuul/manifests/init.pp
@@ -87,9 +87,8 @@ class zuul (
   }
 
   exec { 'install_zuul' :
-    command     => 'python setup.py install',
-    cwd         => '/opt/zuul',
-    path        => '/bin:/usr/bin',
+    command     => 'pip install /opt/zuul',
+    path        => '/usr/local/bin:/usr/bin:/bin/',
     refreshonly => true,
     subscribe   => Vcsrepo['/opt/zuul'],
     require     => Class['pip'],