diff --git a/Dockerfile-GPU b/Dockerfile-GPU
index 644749dc5..13c537c44 100644
--- a/Dockerfile-GPU
+++ b/Dockerfile-GPU
@@ -1,8 +1,9 @@
-FROM  nvidia/cuda:10.1-runtime
+FROM  nvidia/cuda:11.0-runtime-ubuntu20.04
 
 WORKDIR /home/user
 
-RUN apt-get update && apt-get install -y python3.7 python3.7-dev python3.7-distutils python3-pip curl git pkg-config cmake
+RUN apt-get update && apt-get install -y software-properties-common && add-apt-repository ppa:deadsnakes/ppa
+RUN apt-get update && apt-get install -y python3.7 python3.7-dev python3.7-distutils python3-pip curl git pkg-config cmake swig
 
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
@@ -18,6 +19,11 @@ COPY haystack /home/user/haystack
 COPY setup.py requirements.txt README.md /home/user/
 RUN pip3 install numpy scipy Cython
 
+# Install PyTorch for CUDA 11
+RUN pip3 install torch==1.7.1+cu110 -f https://download.pytorch.org/whl/torch_stable.html
+# Install faiss separately as building latest versions can cause trouble with swig
+RUN pip3 install faiss-cpu==1.6.3
+
 RUN pip3 install -r requirements.txt
 RUN pip3 install -e .
 
@@ -36,4 +42,4 @@ COPY rest_api /home/user/rest_api
 EXPOSE 8000
 
 # cmd for running the API (note: "--preload" is not working with cuda)
-CMD ["gunicorn", "rest_api.application:app",  "-b", "0.0.0.0", "-k", "uvicorn.workers.UvicornWorker", "--workers", "1", "--timeout", "180"]
+CMD ["gunicorn", "rest_api.application:app",  "-b", "0.0.0.0", "-k", "uvicorn.workers.UvicornWorker", "--workers", "1", "--timeout", "180"]
\ No newline at end of file