diff --git a/conda/build_faiss.sh b/conda/build_faiss.sh
index c0a82a9a6..f4e61ebd9 100755
--- a/conda/build_faiss.sh
+++ b/conda/build_faiss.sh
@@ -27,11 +27,23 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
     time conda build -c $ANACONDA_USER --no-anaconda-upload --python 3.5 faiss-cpu
     time conda build -c $ANACONDA_USER --no-anaconda-upload --python 3.6 faiss-cpu
 else
-    . ./switch_cuda_version.sh 8.0
+    export CUDA_VERSION="0.0"
+    export CUDNN_VERSION="0.0"
     time conda build -c $ANACONDA_USER --no-anaconda-upload --python 2.7 faiss-cpu
     time conda build -c $ANACONDA_USER --no-anaconda-upload --python 3.5 faiss-cpu
     time conda build -c $ANACONDA_USER --no-anaconda-upload --python 3.6 faiss-cpu
 
+    . ./switch_cuda_version.sh 8.0
+    time conda build -c $ANACONDA_USER --no-anaconda-upload --python 2.7 faiss-gpu
+    time conda build -c $ANACONDA_USER --no-anaconda-upload --python 3.5 faiss-gpu
+    time conda build -c $ANACONDA_USER --no-anaconda-upload --python 3.6 faiss-gpu
+
+    . ./switch_cuda_version.sh 9.0
+    time conda build -c $ANACONDA_USER --no-anaconda-upload --python 2.7 faiss-gpu
+    time conda build -c $ANACONDA_USER --no-anaconda-upload --python 3.5 faiss-gpu
+    time conda build -c $ANACONDA_USER --no-anaconda-upload --python 3.6 faiss-gpu
+
+    . ./switch_cuda_version.sh 9.1
     time conda build -c $ANACONDA_USER --no-anaconda-upload --python 2.7 faiss-gpu
     time conda build -c $ANACONDA_USER --no-anaconda-upload --python 3.5 faiss-gpu
     time conda build -c $ANACONDA_USER --no-anaconda-upload --python 3.6 faiss-gpu
diff --git a/conda/faiss-gpu/meta.yaml b/conda/faiss-gpu/meta.yaml
index 11fa6ea67..b65638bfc 100644
--- a/conda/faiss-gpu/meta.yaml
+++ b/conda/faiss-gpu/meta.yaml
@@ -18,7 +18,6 @@ requirements:
     - python
     - numpy >=1.11
     - mkl
-    - cudatoolkit
 
 build:
   number: {{ environ.get('FAISS_BUILD_NUMBER') }}
@@ -38,4 +37,4 @@ about:
   license: BSD 3-Clause
   license_family: BSD
   license_file: LICENSE
-  summary: A library for efficient similarity search and clustering of dense vectors.
\ No newline at end of file
+  summary: A library for efficient similarity search and clustering of dense vectors.