diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49987635e3257a811078bb22e042165053695d5f..0849c818d84410cae90d68729b1eb348ad87fe3a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,22 +15,31 @@
 # limitations under the License.
 #######################################################################################
 
-stages:
-  - build
-  - deploy
-
 build-docs:
   image: python:3.8
+  variables:
+    PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
+  cache:
+    paths:
+      - .cache/pip
   stage: build
   script:
+    - pip install tox
     - tox -e build
 
 deploy-job:
-  stage: deploy
+  image: python:3.8
+  variables:
+    PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
+  cache:
+    paths:
+      - .cache/pip
   script:
     - mkdir -p local
     - echo "USERNAME=$FTP_USERNAME" > local/.credentials
-    - echo "PASSWORF=$FTP_PASSWORD" > local/.credentials
+    - echo "PASSWORF=$FTP_PASSWORD" >> local/.credentials
+    - pip install tox
+    - tox -e build
     - tox -e publish
   # Only publish on protected branches.  This avoids publish for merge requests
   rules:
diff --git a/tox.ini b/tox.ini
index 4fc4841055b1b3965a385cbc5444293e3a2a9e14..5eb484d826d1e9ca30a66a1dbc89c20604687763 100644
--- a/tox.ini
+++ b/tox.ini
@@ -53,7 +53,7 @@ commands =
         rm -rf _build/html
         sphinx-multiversion . _build/html
         sh -c './fix_cross_references.sh'
-whitelist_externals =
+allowlist_externals =
         sh
         rm
 
@@ -65,7 +65,7 @@ commands =
         sphinx-multiversion . _build/html
         sphinx-autobuild . -b dirhtml -a _build/html --host 0.0.0.0 --port 8001
         # sh -c './fix_cross_references.sh'
-whitelist_externals =
+allowlist_externals =
         sh
         rm
 
@@ -75,7 +75,7 @@ whitelist_externals =
 deps =  {[testenv]deps}
 commands =
         sh -c './upload_doc.sh'
-whitelist_externals =
+allowlist_externals =
         sh
         rm