diff --git a/Dockerfile b/Dockerfile
index 2c318e8..85e8236 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Read the Docs - Environment base
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 LABEL mantainer="Read the Docs <support@readthedocs.com>"
 
 ENV DEBIAN_FRONTEND noninteractive
@@ -116,8 +116,8 @@ RUN apt-get -y install \
 # Install Python tools/libs
 ENV RTD_VIRTUALENV_VERSION 16.7.9
 RUN apt-get -y install \
-      python-pip \
- && pip install -U \
+      python3-pip && \
+      pip3 install -U \
       auxlib \
       virtualenv==$RTD_VIRTUALENV_VERSION
 
@@ -150,10 +150,12 @@ ENV RTD_PYTHON_VERSION_35 3.5.7
 ENV RTD_PYTHON_VERSION_36 3.6.8
 ENV RTD_PYTHON_VERSION_37 3.7.3
 ENV RTD_PYTHON_VERSION_38 3.8.0
+ENV RTD_PYTHON_VERSION_39 3.9.0rc1
 ENV RTD_PYPY_VERSION_35 pypy3.5-7.0.0
 
 # Install supported Python versions
 RUN pyenv install $RTD_PYTHON_VERSION_27 && \
+    pyenv install $RTD_PYTHON_VERSION_39 && \
     pyenv install $RTD_PYTHON_VERSION_38 && \
     pyenv install $RTD_PYTHON_VERSION_37 && \
     pyenv install $RTD_PYTHON_VERSION_35 && \
@@ -161,6 +163,7 @@ RUN pyenv install $RTD_PYTHON_VERSION_27 && \
     pyenv install $RTD_PYPY_VERSION_35 && \
     pyenv global \
         $RTD_PYTHON_VERSION_27 \
+        $RTD_PYTHON_VERSION_39 \
         $RTD_PYTHON_VERSION_38 \
         $RTD_PYTHON_VERSION_37 \
         $RTD_PYTHON_VERSION_36 \
@@ -180,6 +183,11 @@ RUN pyenv local $RTD_PYTHON_VERSION_27 && \
 
 ENV RTD_PIP_VERSION 20.0.1
 ENV RTD_SETUPTOOLS_VERSION 45.1.0
+RUN pyenv local $RTD_PYTHON_VERSION_39 && \
+    pyenv exec pip install --no-cache-dir -U pip==$RTD_PIP_VERSION && \
+    pyenv exec pip install --no-cache-dir -U setuptools==$RTD_SETUPTOOLS_VERSION && \
+    pyenv exec pip install --no-cache-dir virtualenv==$RTD_VIRTUALENV_VERSION
+
 RUN pyenv local $RTD_PYTHON_VERSION_38 && \
     pyenv exec pip install --no-cache-dir -U pip==$RTD_PIP_VERSION && \
     pyenv exec pip install --no-cache-dir -U setuptools==$RTD_SETUPTOOLS_VERSION && \
@@ -232,6 +240,7 @@ LABEL python.version_35=$PYTHON_VERSION_35
 LABEL python.version_36=$PYTHON_VERSION_36
 LABEL python.version_37=$PYTHON_VERSION_37
 LABEL python.version_38=$PYTHON_VERSION_38
+LABEL python.version_38=$PYTHON_VERSION_39
 LABEL python.pip=$_PIP_VERSION
 LABEL python.setuptools=$SETUPTOOLS_VERSION
 LABEL python.virtualenv=$VIRTUALENV_VERSION
diff --git a/README.rst b/README.rst
index 0272efe..5e7fab8 100644
--- a/README.rst
+++ b/README.rst
@@ -24,19 +24,19 @@ repository:
     **Deprecated**
     Ubuntu 18.04 supporting Python 2.7, 3.5, 3.6, 3.7.
 
-`readthedocs/build:5.0`
+`readthedocs/build:6.0`
     ``stable``
-    Ubuntu 18.04 supporting Python 2.7, 3.6, 3.7 and pypy3.5-7.0.0.
+    Ubuntu 18.04 supporting Python 2.7, 3.5, 3.6, 3.7, 3.8 and PyPy3.5-7.0.0.
     This is the **stable** image supported by Read the Docs.
 
-`readthedocs/build:6.0`
+`readthedocs/build:7.0`
     ``latest``
     Ubuntu 18.04 supporting Python 2.7, 3.5, 3.6, 3.7, 3.8 and PyPy3.5-7.0.0.
     This is the **latest** default image used for documentation builds and supported by Read the Docs.
 
-`readthedocs/build:7.0`
+`readthedocs/build:8.0`
     ``testing``
-    Ubuntu 18.04 supporting Python 2.7, 3.5, 3.6, 3.7, 3.8 and PyPy3.5-7.0.0.
+    Ubuntu 20.04 supporting Python 2.7, 3.5, 3.6, 3.7, 3.8, 3.9.0rc1 and PyPy3.5-7.0.0.
     For internal development **testing** only, not available for public usage yet.
 
 .. _readthedocs/build: https://hub.docker.com/r/readthedocs/build/