diff --git a/deployment/puppet/nailgun/examples/site.pp b/deployment/puppet/nailgun/examples/site.pp
index 5a874ab92b..f9d03520c3 100644
--- a/deployment/puppet/nailgun/examples/site.pp
+++ b/deployment/puppet/nailgun/examples/site.pp
@@ -92,4 +92,3 @@ node default {
   Class['postgresql::server'] -> Class['nailgun']
 
 }
-
diff --git a/deployment/puppet/nailgun/manifests/ostf.pp b/deployment/puppet/nailgun/manifests/ostf.pp
index 5f7827629a..d87d22fcf7 100644
--- a/deployment/puppet/nailgun/manifests/ostf.pp
+++ b/deployment/puppet/nailgun/manifests/ostf.pp
@@ -41,19 +41,19 @@ class nailgun::ostf(
     group => 'root',
     mode => 0755,
   }->
-  nailgun::venv::pip { 'setuptools-git':
+  nailgun::venv::pip { "${venv}_setuptools-git":
     package => 'setuptools-git==1.0',
   }->
-  nailgun::venv::pip { 'd2to1':
+  nailgun::venv::pip { "${venv}_d2to1":
     package => 'd2to1==0.2.10',
   }->
-  nailgun::venv::pip { 'pbr':
+  nailgun::venv::pip { "${venv}_pbr":
     package => 'pbr==0.5.21',
   }->
-  nailgun::venv::pip { 'ostf-req':
+  nailgun::venv::pip { "${venv}_ostf-req":
     package => "-r $venv/pip-requires.txt",
   }->
-  nailgun::venv::pip { 'ostf':
+  nailgun::venv::pip { "${venv}_ostf":
     package => 'fuel-ostf',
   }
   exec {'ostf-init':
@@ -63,9 +63,9 @@ class nailgun::ostf(
       --after-initialization-environment-hook || /bin/true",
     require => [
       Postgresql::Db[$dbname],
-      Nailgun::Venv::Pip['ostf-req'],
-      Nailgun::Venv::Pip['ostf'],
+      Nailgun::Venv::Pip["${venv}_ostf-req"],
+      Nailgun::Venv::Pip["${venv}_ostf"],
     ],
     before => Class['nailgun::supervisor'],
   }
-}
+}
\ No newline at end of file
diff --git a/deployment/puppet/nailgun/manifests/venv.pp b/deployment/puppet/nailgun/manifests/venv.pp
index 3ae2d62277..56700378f2 100644
--- a/deployment/puppet/nailgun/manifests/venv.pp
+++ b/deployment/puppet/nailgun/manifests/venv.pp
@@ -53,11 +53,18 @@ class nailgun::venv(
     venv => $venv,
   }
 
-  nailgun::venv::pip { "$venv_$package":
+  nailgun::venv::pip { "${venv}_${package}":
     package => "$package==$version",
   }
 
-  nailgun::venv::pip { "psycopg2":
+  nailgun::venv::pip { "${venv}_pbr":
+    package => "pbr==0.5.21",
+    require => [
+      Nailgun::Venv::Venv[$venv],
+    ],
+  }
+
+  nailgun::venv::pip { "${venv}_psycopg2":
     package => "psycopg2==2.4.6",
     require => [
       Package["postgresql-devel"],
@@ -89,15 +96,15 @@ class nailgun::venv(
   file { "/usr/local/bin/fuel":
     ensure  => link,
     target  => "/opt/nailgun/bin/fuel",
-    require => Nailgun::Venv::Pip["$venv_$package"],
+    require => Nailgun::Venv::Pip["${venv}_${package}"],
   }
 
   exec {"nailgun_syncdb":
     command => "${venv}/bin/nailgun_syncdb",
     require => [
                 File["/etc/nailgun/settings.yaml"],
-                Nailgun::Venv::Pip["$venv_$package"],
-                Nailgun::Venv::Pip["psycopg2"],
+                Nailgun::Venv::Pip["${venv}_${package}"],
+                Nailgun::Venv::Pip["${venv}_psycopg2"],
                 Class["nailgun::database"],
                 ],
   }
@@ -114,4 +121,4 @@ class nailgun::venv(
     mode => 0644
   }
 
-  }
+}
\ No newline at end of file