diff --git a/.gitlab-ci.astron.yml b/.gitlab-ci.astron.yml
index 41a5c306ccda23b908b7152f8746fe4dd4f65370..dfd1ef3b107c80e09ab0dad5deeb07aead70ef34 100644
--- a/.gitlab-ci.astron.yml
+++ b/.gitlab-ci.astron.yml
@@ -8,6 +8,12 @@
   tags:
     - dind
 
+# At Astron, the cibuild-python-wheels job needs this custom configuration.
+.cibuildwheels-custom:
+  extends: .dind-requester
+  variables:
+    DOCKER_HOST: tcp://docker:2375
+
 include: .gitlab-ci.common.yml
 
 deploy-package-2204:
diff --git a/.gitlab-ci.common.yml b/.gitlab-ci.common.yml
index 17fa3b50a6de75aeaa16d88d0613496710680835..a0e352c91283142f4f988fa23eccae42fd163bac 100644
--- a/.gitlab-ci.common.yml
+++ b/.gitlab-ci.common.yml
@@ -302,12 +302,11 @@ deploy-image-2204:
       - dist/everybeam*.whl
 
 cibuild-python-wheels:
-  extends: [ ".needs-base-2204", ".dind-requester" ]
+  extends: [ ".needs-base-2204", ".cibuildwheels-custom" ]
   stage: deploy
   image: python:3.8
   variables:
     GIT_SUBMODULE_STRATEGY: normal
-    DOCKER_HOST: tcp://docker:2375
   script:
     - wget -qO - https://get.docker.com/ | sh
     - pip install cibuildwheel
diff --git a/.gitlab-ci.ska.yml b/.gitlab-ci.ska.yml
index c7d22341e614d7682034268bf5c83e9c86dcadcc..d6a2b8340f1e72468d3cb17edb83bee020dcbb2f 100644
--- a/.gitlab-ci.ska.yml
+++ b/.gitlab-ci.ska.yml
@@ -1,13 +1,19 @@
 # Copyright (C) 2021 ASTRON (Netherlands Institute for Radio Astronomy)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-# This file contains the pipelines that run on the SKAO repository (mirror) of 
+# This file contains the pipelines that run on the SKAO repository (mirror) of
 # EveryBeam, which is at https://gitlab.com/ska-telescope/sdp/ska-sdp-func-everybeam
 
 .dind-requester:
   services:
     - docker:20.10-dind
 
+# At SKAO, the cibuild-python-wheels job needs this custom configuration.
+.cibuildwheels-custom:
+  extends: .dind-requester
+  tags:
+    - k8srunner
+
 include:
   - local: .gitlab-ci.common.yml
 # Create Gitlab CI badges from CI metrics