diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8571254d6a7997d3862609cac56fcbc8f1e7b032..33ee561903507115863d189ed578ee4f1b19c641 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ stages:
 build wheel:
   stage: build
   tags:
-    - docker-executor
+    - k8srunner
   script:
     - python3 setup.py sdist bdist_wheel
   artifacts:
@@ -40,7 +40,7 @@ build wheel:
 test:
   stage: test
 #  tags:
-#   - docker-executor
+#   - k8srunner
   script:
    - pipenv run python3 setup.py test
    - mv coverage.xml ./build/reports/code-coverage.xml
@@ -67,7 +67,7 @@ list_dependencies:
 linting:
   image: nexus.engageska-portugal.pt/ska-docker/ska-python-buildenv:latest
   tags:
-    - docker-executor
+    - k8srunner
   stage: linting
   script:
     - make lint
@@ -79,7 +79,7 @@ linting:
 publish to nexus:
   stage: publish
   tags:
-    - docker-executor
+    - k8srunner
   variables:
     TWINE_USERNAME: $TWINE_USERNAME
     TWINE_PASSWORD: $TWINE_PASSWORD
@@ -101,7 +101,7 @@ publish to nexus:
 pages:
   stage: deploy
   tags:
-   - docker-executor
+   - k8srunner
   dependencies:
     - test
   script:
@@ -120,7 +120,7 @@ create ci metrics:
   image: nexus.engageska-portugal.pt/ska-docker/ska-python-buildenv:latest
   when: always
   tags:
-    - docker-executor
+    - k8srunner
   script:
     # Gitlab CI badges creation: START
     - apt-get -y update