diff --git a/.cirrus/Dockerfile b/.cirrus/Dockerfile
index a55b70a45..d49c5cba3 100644
--- a/.cirrus/Dockerfile
+++ b/.cirrus/Dockerfile
@@ -19,12 +19,13 @@ ARG KUBECONFORM_VERSION=0.6.7
 ARG KUBECONFORM_CHECKSUM="95f14e87aa28c09d5941f11bd024c1d02fdc0303ccaa23f61cef67bc92619d73"
 ARG CHART_VERIFIER_VERSION=1.13.8
 ARG CHART_VERIFIER_CHECKSUM="1ed190a3aa4f961269e59f9596408415761ab368d761a08eae2960a84d957352"
-ARG OPENSHIFT_CLI_VERSION=4.16.16
-ARG OPENSHIFT_CLI_CHECKSUM="a1cd9ac47f20c525e57668eac141318336a9e9c2cdae7dbff74d87b5fcf637f7"
+ARG OPENSHIFT_CLI_VERSION=4.17.0
+ARG OPENSHIFT_CLI_CHECKSUM="007d8bef0fd036c45f496fd00098bd6d9042eaf525a77793e892a1d500e0d041"
 
 ENV HELM_BASE_URL="https://get.helm.sh"
 ENV HELM_TAR_FILE="helm-v${HELM_VERSION}-linux-amd64.tar.gz"
 ENV HELM_HASH_SUM_FILE="helm-v${HELM_VERSION}-linux-amd64.tar.gz.sha256sum"
+ENV PATH=/usr/bin/google-cloud-sdk/bin:${PATH}
 
 RUN apk add --update --no-cache \
     aws-cli \
@@ -42,7 +43,7 @@ RUN apk add --update --no-cache \
     py3-pip \
     py3-wheel \
     python3 && \
-    pip install --upgrade pip==24.1.1
+    pip install --upgrade pip==24.2
 
 RUN pip install "yamllint==${YAMLLINT_VERSION}" && \
     pip install "yamale==${YAMALE_VERSION}"
@@ -117,7 +118,6 @@ RUN set -eux; \
     mv ./oc /usr/bin/oc ; \
     rm openshift-client-linux.tar.gz kubectl README.md
 
-
 COPY --from=tools /usr/local/bin/cirrus-env /usr/local/bin/cirrus-env
 COPY --from=tools /usr/local/bin/gh /usr/local/bin/gh
 COPY --from=tools /home/sonarsource/.m2/settings-public-auth.xml /root/.m2/settings-public.xml
diff --git a/.cirrus/setup.sh b/.cirrus/setup.sh
index 8ec7075d7..78bf7a1c5 100755
--- a/.cirrus/setup.sh
+++ b/.cirrus/setup.sh
@@ -2,12 +2,12 @@
 
 set -eo pipefail
 
-GCLOUD_CLI_VERSION=466.0.0
-GCLOUD_CLI_CHECKSUM="ab7e256cb7e05f8ad2f4410cf33f2f9dcc3dbe0c3ed7b745f85c7d9793043e4d"
+GCLOUD_CLI_VERSION=495.0.0
+GCLOUD_CLI_CHECKSUM="5e76f6dae80e4eb07cdca607793a461162fd8d433b23ec2cc90403f686584044"
+MPDEV_VERSION=0.12.4
+MPDEV_CHECKSUM="fcc8aed037f9e3d79561d6658305ec38a30f29732ea7a89d128b5ab3bee490e6"
 BASE_FOLDER="${BASE_FOLDER:-"/root/.gcp/cache"}"
 
-export PATH=${BASE_FOLDER}/bin:${BASE_FOLDER}/google-cloud-sdk/bin:${PATH}
-
 mkdir -p ${BASE_FOLDER}
 
 curl -LO https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-${GCLOUD_CLI_VERSION}-linux-x86_64.tar.gz
@@ -17,11 +17,10 @@ chmod +x ./google-cloud-sdk
 mv ./google-cloud-sdk ${BASE_FOLDER}/google-cloud-sdk
 rm -rf google-cloud-cli-${GCLOUD_CLI_VERSION}-linux-x86_64.tar.gz
 
-curl -o mpdev https://raw.githubusercontent.com/GoogleCloudPlatform/marketplace-k8s-app-tools/master/scripts/dev
-chmod +x mpdev
-mkdir -p ${BASE_FOLDER}/bin
-mv mpdev ${BASE_FOLDER}/bin
+gcloud components install gke-gcloud-auth-plugin kubectl --quiet
 
-gcloud components install gke-gcloud-auth-plugin
-gcloud components install kubectl
-gcloud --version
+curl -LO https://github.com/GoogleCloudPlatform/marketplace-k8s-app-tools/archive/refs/tags/${MPDEV_VERSION}.tar.gz
+echo "${MPDEV_CHECKSUM}  ${MPDEV_VERSION}.tar.gz" | sha256sum -c
+tar -xf ${MPDEV_VERSION}.tar.gz
+mv marketplace-k8s-app-tools-${MPDEV_VERSION}/scripts/dev ${BASE_FOLDER}/mpdev
+chmod +x ${BASE_FOLDER}/mpdev
diff --git a/.cirrus/tasks.yml b/.cirrus/tasks.yml
index a7105f984..049760176 100644
--- a/.cirrus/tasks.yml
+++ b/.cirrus/tasks.yml
@@ -92,13 +92,15 @@ verify_gcp_app_template: &VERIFY_GCP_APP_TEMPLATE
   only_if: $TRIGGER == "PUSH_STAGING_DEPLOYER" || $BRANCH == "master"
   env:
     BASE_FOLDER: "/root/.gcp/cache"
-    PATH: "${BASE_FOLDER}/bin:${BASE_FOLDER}/google-cloud-sdk/bin:${PATH}"
+    PATH: "${BASE_FOLDER}:${BASE_FOLDER}/google-cloud-sdk/bin:${PATH}"
     KUBE_CONFIG: "/tmp/kubeconfig"
     KUBECONFIG: "${KUBE_CONFIG}"
     HOME: "/tmp"
+    GCLOUD_CLI_VERSION: 495.0.0
+    MPDEV_VERSION: 0.12.4
   gcp_cache:
     folder: ${BASE_FOLDER}
-    fingerprint_script: grep "gcloud" .tool-versions | awk '{print $NF}'
+    fingerprint_script: echo "${GCLOUD_CLI_VERSION}+${MPDEV_VERSION}"
     populate_script: 
       - ./.cirrus/setup.sh
   ec2_instance:
diff --git a/charts/sonarqube/Chart.lock b/charts/sonarqube/Chart.lock
index 7bdba056a..3f845f68d 100644
--- a/charts/sonarqube/Chart.lock
+++ b/charts/sonarqube/Chart.lock
@@ -4,6 +4,6 @@ dependencies:
   version: 10.15.0
 - name: ingress-nginx
   repository: https://kubernetes.github.io/ingress-nginx
-  version: 4.10.1
-digest: sha256:2d8f6576943eb911e637eae3bed4eb85250df27c2c4203c49a557f8b942a662a
-generated: "2024-06-27T14:26:12.517801+02:00"
+  version: 4.11.2
+digest: sha256:0ad1aac6c67cf15b7aabb05dc27ad791f9575fe305744407792981aa3082e1c9
+generated: "2024-10-07T17:45:01.454569+02:00"
diff --git a/charts/sonarqube/Chart.yaml b/charts/sonarqube/Chart.yaml
index 51f0456a8..155aa5c71 100644
--- a/charts/sonarqube/Chart.yaml
+++ b/charts/sonarqube/Chart.yaml
@@ -49,6 +49,6 @@ dependencies:
     repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: postgresql.enabled
   - name: ingress-nginx
-    version: 4.10.1
+    version: 4.11.2
     repository: https://kubernetes.github.io/ingress-nginx
     condition: nginx.enabled,ingress-nginx.enabled