diff --git a/metaflow/plugins/pypi/pip.py b/metaflow/plugins/pypi/pip.py
index 5aeb03ec5f4..a09c0a6881a 100644
--- a/metaflow/plugins/pypi/pip.py
+++ b/metaflow/plugins/pypi/pip.py
@@ -68,7 +68,7 @@ def solve(self, id_, packages, python, platform):
 
         with tempfile.TemporaryDirectory() as tmp_dir:
             report = "{tmp_dir}/report.json".format(tmp_dir=tmp_dir)
-            implementations, platforms, abis = zip(
+            interpreter, platforms, abis = zip(
                 *[
                     (tag.interpreter, tag.platform, tag.abi)
                     for tag in pip_tags(python, platform)
@@ -92,7 +92,8 @@ def solve(self, id_, packages, python, platform):
                 ),
                 *(chain.from_iterable(product(["--abi"], set(abis)))),
                 *(chain.from_iterable(product(["--platform"], set(platforms)))),
-                # *(chain.from_iterable(product(["--implementations"], set(implementations)))),
+                *(chain.from_iterable(product(["--implementation"], set(["cp"])))),
+                "--python-version=%s" % python,
             ]
             for package, version in packages.items():
                 if version.startswith(("<", ">", "!", "~", "@")):
@@ -205,7 +206,7 @@ def _build(key, package):
                 shutil.move(os.path.join(path, wheel), target)
                 metadata["{url}".format(**package)] = target
 
-        implementations, platforms, abis = zip(
+        interpreter, platforms, abis = zip(
             *[
                 (tag.interpreter, tag.platform, tag.abi)
                 for tag in pip_tags(python, platform)
@@ -228,7 +229,8 @@ def _build(key, package):
             ),
             *(chain.from_iterable(product(["--abi"], set(abis)))),
             *(chain.from_iterable(product(["--platform"], set(platforms)))),
-            # *(chain.from_iterable(product(["--implementations"], set(implementations)))),
+            *(chain.from_iterable(product(["--implementation"], set(["cp"])))),
+            "--python-version=%s" % python,
         ]
         packages = [package for package in packages if not package["require_build"]]
         for package in packages: