diff --git a/src/com/mirantis/mk/Python.groovy b/src/com/mirantis/mk/Python.groovy
index 601f3e0..9c9bf88 100644
--- a/src/com/mirantis/mk/Python.groovy
+++ b/src/com/mirantis/mk/Python.groovy
@@ -27,10 +27,9 @@
         sh("rm -rf \"${path}\"")
     }
 
-    // NOTE(vsaienko): unless is fixed in upstream https://github.com/pypa/pip/issues/7620
-    //if (offlineDeployment) {
+    if (offlineDeployment) {
         virtualenv_cmd += " --no-download"
-    //}
+    }
     common.infoMsg("[Python ${path}] Setup ${python} environment")
     sh(returnStdout: true, script: virtualenv_cmd)
     if (!offlineDeployment) {
@@ -41,7 +40,7 @@
                 common.infoMsg("Pinning pip package due to end of life of Python2 to ${pipPackage} version.")
             }
             // NOTE(vsaienko): pin setuptools explicitly for latest version that works with python2
-            runVirtualenvCommand(path, "pip install -U \"setuptools<45.0.0\"")
+            runVirtualenvCommand(path, "pip install -U \"setuptools<45.0.0\" ${pipPackage}")
         } catch (Exception e) {
             common.warningMsg("Setuptools and pip cannot be updated, you might be offline but OFFLINE_DEPLOYMENT global property not initialized!")
         }