diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2756844a2eb3261e448a1b7364ce63fa74ebbb75..31d99be520405162c7ed8d3fc0f985c24a3ed316 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,7 +81,7 @@ build_tagged_version:
 tag_image_dev: &tag_image
   stage: tag_image
   environment: staging
-  image: gitlab-registry.cern.ch/paas-tools/openshift-client:latest
+  image: gitlab-registry.cern.ch/paas-tools/openshift-client:v3.10.0
   script:
     - oc tag --source=docker ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG:-latest} ${RESOURCE}:${CI_COMMIT_TAG:-latest} --reference-policy=local --token=${TOKEN} --server=${OPENSHIFT_SERVER} -n ${NAMESPACE}
   variables:
@@ -102,7 +102,7 @@ update_template_dev:
   stage: update_template
   environment: dev
   when: manual
-  image: gitlab-registry.cern.ch/paas-tools/openshift-client:latest
+  image: gitlab-registry.cern.ch/paas-tools/openshift-client:v3.10.0
   script:
     - oc replace template --token=${TOKEN} --server=${OPENSHIFT_SERVER} -n ${NAMESPACE} -f templates/${RESOURCE}.yaml
   variables:
@@ -114,7 +114,7 @@ update_template_staging:
   only:
   - tags
   when: always # This will allow us to deploy the template even if building the image fails
-  image: gitlab-registry.cern.ch/paas-tools/openshift-client:latest
+  image: gitlab-registry.cern.ch/paas-tools/openshift-client:v3.10.0
   script:
     - oc replace template --token=${TOKEN} --server=${OPENSHIFT_SERVER} -n ${NAMESPACE} -f templates/${RESOURCE}.yaml
   variables:
@@ -126,7 +126,7 @@ update_template_production:
   only:
   - tags
   when: manual
-  image: gitlab-registry.cern.ch/paas-tools/openshift-client:latest
+  image: gitlab-registry.cern.ch/paas-tools/openshift-client:v3.10.0
   script:
     - oc replace template --token=${TOKEN} --server=${OPENSHIFT_SERVER} -n ${NAMESPACE} -f templates/${RESOURCE}.yaml
   variables:
@@ -143,7 +143,7 @@ deploy_staging:
   only:
   - tags
   when: manual
-  image: gitlab-registry.cern.ch/paas-tools/openshift-client:latest
+  image: gitlab-registry.cern.ch/paas-tools/openshift-client:v3.10.0
   script:
     - oc --token=${TOKEN} --server=${OPENSHIFT_SERVER} -n ${NAMESPACE} tag ${RESOURCE}:${CI_COMMIT_TAG} ${RESOURCE}:stable
   variables:
@@ -157,7 +157,7 @@ deploy_production:
   only:
   - tags
   when: manual
-  image: gitlab-registry.cern.ch/paas-tools/openshift-client:latest
+  image: gitlab-registry.cern.ch/paas-tools/openshift-client:v3.10.0
   script:
     - oc --token=${TOKEN} --server=${OPENSHIFT_SERVER} -n ${NAMESPACE} tag ${RESOURCE}:${CI_COMMIT_TAG} ${RESOURCE}:stable
   variables: