diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c3317001ffa7bbc01c62c61d2f311f25489e421..3b48a9f554e040ef2d529fb8110670c417376a07 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,13 +5,13 @@ Flake8:
     - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh
     - ". ./prepare-and-run-flake8.sh volumential test"
     tags:
-    - python3.5
+    - python3
     except:
     - tags
 
-Python 3.6 POCL:
+Python 3 POCL:
   script:
-  - export PY_EXE=python3.6
+  - export PY_EXE=python3
   - export PYOPENCL_TEST=portable
   - export EXTRA_INSTALL="pybind11 numpy pytest scipy mako wheel"
   - git submodule sync && git submodule update --init --recursive --remote
@@ -19,7 +19,7 @@ Python 3.6 POCL:
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
   - ". ./build-and-test-py-project.sh"
   tags:
-  - python3.6
+  - python3
   - pocl
   - dealii
   except: