diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3863c30d9c7777d4476d0fefb6158f044cc17c9..f4dd98f36eff3d0af44251ca909065bcc40cf61b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,15 +9,21 @@ build:
     - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin
   script:
     - docker --version
+    - |
+      if [ "${LANGUAGE}" == "python" ]; then
+        LANGUAGE_VERSION="${PYTHON_VERSION}"
+      else
+        LANGUAGE_VERSION="${R_VERSION}"
+      fi
     # put both versions in a env var, to be used as tag
     - |
-      if [ "latest" == "${R_VERSION}" ]; then
+      if [ "latest" == "${LANGUAGE_VERSION}" ]; then
         export VERSIONS_TAG="${SHINY_SERVER_VERSION}"
       else
         if [ "latest" == "${SHINY_SERVER_VERSION}" ]; then
-          export VERSIONS_TAG="${R_VERSION}"
+          export VERSIONS_TAG="${LANGUAGE_VERSION}"
         else
-          export VERSIONS_TAG="${R_VERSION}--${SHINY_SERVER_VERSION}"
+          export VERSIONS_TAG="${LANGUAGE_VERSION}--${SHINY_SERVER_VERSION}"
         fi
       fi
     - apk add gettext
@@ -60,15 +66,14 @@ build:
       fi
   parallel:
     matrix:
-      - R_VERSION: ["latest"]
+      - LANGUAGE: ["r"]
+        R_VERSION: ["latest"]
         # R_VERSION: ["3.6.3", "4.2.3", "latest"]
         SHINY_SERVER_VERSION: ["latest"]
-        LANGUAGE: ["r"]
-      - R_VERSION: ["latest"]
-        # R_VERSION: ["3.6.3", "4.2.3", "latest"]
-        SHINY_SERVER_VERSION: ["latest"]
-        LANGUAGE: ["python"]
+        
+      - LANGUAGE: ["python"]
         PYTHON_VERSION: ["3.9-slim-bullseye"]
+        SHINY_SERVER_VERSION: ["latest"]