diff --git a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu
index 844b0ba900d..5a096c73e42 100644
--- a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu
+++ b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu
@@ -177,7 +177,7 @@ RUN bazel build --color=yes --curses=yes \
     bazel-bin/tensorflow_serving/tools/pip_package/build_pip_package \
     /tmp/pip && \
     pip --no-cache-dir install --upgrade \
-    /tmp/pip/tensorflow_serving_api_gpu-*.whl && \
+    /tmp/pip/tensorflow_serving_api-*.whl && \
     rm -rf /tmp/pip
 
 FROM binary_build as clean_build
diff --git a/tensorflow_serving/tools/pip_package/build_pip_package.sh b/tensorflow_serving/tools/pip_package/build_pip_package.sh
index cc621cb9920..da4c0c37c1b 100755
--- a/tensorflow_serving/tools/pip_package/build_pip_package.sh
+++ b/tensorflow_serving/tools/pip_package/build_pip_package.sh
@@ -63,12 +63,8 @@ function main() {
   cp ${PIP_SRC_DIR}/setup.py "${TMPDIR}"
 
   pushd "${TMPDIR}"
-  echo $(date) : "=== Building wheel (CPU)"
-  python3 setup.py bdist_wheel --universal \
-    --project_name tensorflow-serving-api # >/dev/null
-  echo $(date) : "=== Building wheel (GPU)"
-  python3 setup.py bdist_wheel --universal \
-    --project_name tensorflow-serving-api-gpu # >/dev/null
+  echo $(date) : "=== Building wheel"
+  python3 setup.py bdist_wheel --universal
   mkdir -p "${DEST}"
   cp dist/* "${DEST}"
   popd
diff --git a/tensorflow_serving/tools/pip_package/setup.py b/tensorflow_serving/tools/pip_package/setup.py
index 26b554e4f1d..68b0abc38f4 100644
--- a/tensorflow_serving/tools/pip_package/setup.py
+++ b/tensorflow_serving/tools/pip_package/setup.py
@@ -37,21 +37,9 @@
 _TF_VERSION_SANITIZED = _TF_VERSION.replace('-', '')
 
 project_name = 'tensorflow-serving-api'
-# Set when building the pip package
-if '--project_name' in sys.argv:
-  project_name_idx = sys.argv.index('--project_name')
-  project_name = sys.argv[project_name_idx + 1]
-  sys.argv.remove('--project_name')
-  sys.argv.pop(project_name_idx)
 
 _TF_REQ = ['tensorflow'+_TF_VERSION_SANITIZED]
 
-# GPU build (note: the only difference is we depend on tensorflow-gpu so
-# pip doesn't overwrite it with the CPU build)
-if 'tensorflow-serving-api-gpu' in project_name:
-  _TF_REQ = ['tensorflow-gpu'+_TF_VERSION_SANITIZED]
-
-
 REQUIRED_PACKAGES = [
     # Match versions to what TF needs here:
     #   https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/pip_package/setup.py