diff --git a/.ffmpeg/Dockerfile b/.ffmpeg/Dockerfile
index 48895147ae..1372eb5766 100644
--- a/.ffmpeg/Dockerfile
+++ b/.ffmpeg/Dockerfile
@@ -2,8 +2,8 @@ FROM ubuntu:noble AS builder
 ARG FFMPEG_VERSION="7.1"
 ARG RCLONE_VER="v1.69.1"
 ARG GO_VERSION="latest"
-#ARG GO_CRYPTO_VERSION="v0.35.0"
-#ARG GO_OAUTH2_VERSION="v0.27.0"
+ARG GO_CRYPTO_VERSION="v0.35.0"
+ARG GO_OAUTH2_VERSION="v0.27.0"
 
 USER root
 
@@ -34,9 +34,9 @@ RUN cd /usr/local/src \
     && cd rclone \
     && git checkout ${RCLONE_VER} \
     # Patch deps version in go.mod to fix CVEs
-#    && sed -i "s|golang.org/x/crypto v.*|golang.org/x/crypto ${GO_CRYPTO_VERSION}|g" go.mod \
-#    && sed -i "s|golang.org/x/oauth2 v.*|golang.org/x/oauth2 ${GO_OAUTH2_VERSION}|g" go.mod \
-#    && go mod tidy \
+    && sed -i "s|golang.org/x/crypto v.*|golang.org/x/crypto ${GO_CRYPTO_VERSION}|g" go.mod \
+    && sed -i "s|golang.org/x/oauth2 v.*|golang.org/x/oauth2 ${GO_OAUTH2_VERSION}|g" go.mod \
+    && go mod tidy \
     # Build rclone
     && make \
     && mv ~/go/bin/rclone /usr/local/bin/ \
diff --git a/.github/workflows/helm-chart-test.yml b/.github/workflows/helm-chart-test.yml
index fc6cc8b841..2d008b7c10 100644
--- a/.github/workflows/helm-chart-test.yml
+++ b/.github/workflows/helm-chart-test.yml
@@ -66,38 +66,38 @@ jobs:
             test-upgrade: true
             service-mesh: true
             os: ubuntu-24.04
-          - k8s-version: 'v1.29.14'
+          - k8s-version: 'v1.29.13'
             test-strategy: job_https
             cluster: 'minikube'
             helm-version: 'v3.14.3'
-            docker-version: '26.1.4'
+            docker-version: '27.5.1'
             python-version: '3.11'
             test-upgrade: true
             service-mesh: false
             os: ubuntu-24.04
-          - k8s-version: 'v1.30.10'
+          - k8s-version: 'v1.30.9'
             test-strategy: job_hostname
             cluster: 'minikube'
             helm-version: 'v3.15.4'
-            docker-version: '26.1.4'
+            docker-version: '27.5.1'
             python-version: '3.12'
             test-upgrade: true
             service-mesh: false
             os: ubuntu-24.04
-          - k8s-version: 'v1.31.6'
+          - k8s-version: 'v1.31.5'
             test-strategy: deployment_https
             cluster: 'minikube'
             helm-version: 'v3.16.4'
-            docker-version: '27.4.1'
+            docker-version: '28.0.1'
             python-version: '3.13'
             test-upgrade: true
             service-mesh: false
             os: ubuntu-24.04
-          - k8s-version: 'v1.32.2'
+          - k8s-version: 'v1.32.1'
             test-strategy: playwright_connect_grid
             cluster: 'minikube'
             helm-version: 'v3.17.0'
-            docker-version: '26.1.4'
+            docker-version: '28.0.1'
             python-version: '3.10'
             test-upgrade: true
             service-mesh: true
diff --git a/.github/workflows/k8s-scaling-test.yml b/.github/workflows/k8s-scaling-test.yml
index c471bc0d6c..e9ee8e1bce 100644
--- a/.github/workflows/k8s-scaling-test.yml
+++ b/.github/workflows/k8s-scaling-test.yml
@@ -61,41 +61,41 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - k8s-version: 'v1.31.6'
+          - k8s-version: 'v1.31.5'
             test-strategy: test_k8s_autoscaling_job_count_strategy_default_in_chaos
             cluster: 'minikube'
             helm-version: 'v3.16.4'
-            docker-version: '27.4.1'
+            docker-version: '28.0.1'
             python-version: '3.13'
-          - k8s-version: 'v1.31.6'
+          - k8s-version: 'v1.31.5'
             test-strategy: test_k8s_autoscaling_job_count_strategy_default_with_node_max_sessions
             cluster: 'minikube'
             helm-version: 'v3.16.4'
-            docker-version: '27.4.1'
+            docker-version: '28.0.1'
             python-version: '3.13'
-          - k8s-version: 'v1.31.6'
+          - k8s-version: 'v1.31.5'
             test-strategy: test_k8s_autoscaling_job_count_strategy_default
             cluster: 'minikube'
             helm-version: 'v3.16.4'
-            docker-version: '27.4.1'
+            docker-version: '28.0.1'
             python-version: '3.13'
-          - k8s-version: 'v1.31.6'
+          - k8s-version: 'v1.31.5'
             test-strategy: test_k8s_autoscaling_deployment_count_in_chaos
             cluster: 'minikube'
             helm-version: 'v3.16.4'
-            docker-version: '27.4.1'
+            docker-version: '28.0.1'
             python-version: '3.13'
-          - k8s-version: 'v1.31.6'
+          - k8s-version: 'v1.31.5'
             test-strategy: test_k8s_autoscaling_deployment_count_with_node_max_sessions
             cluster: 'minikube'
             helm-version: 'v3.16.4'
-            docker-version: '27.4.1'
+            docker-version: '28.0.1'
             python-version: '3.13'
-          - k8s-version: 'v1.31.6'
+          - k8s-version: 'v1.31.5'
             test-strategy: test_k8s_autoscaling_deployment_count
             cluster: 'minikube'
             helm-version: 'v3.16.4'
-            docker-version: '27.4.1'
+            docker-version: '28.0.1'
             python-version: '3.13'
     env:
       CLUSTER: ${{ matrix.cluster }}
diff --git a/tests/charts/make/chart_setup_env.sh b/tests/charts/make/chart_setup_env.sh
index f77a164a74..2f413cfd77 100755
--- a/tests/charts/make/chart_setup_env.sh
+++ b/tests/charts/make/chart_setup_env.sh
@@ -2,7 +2,7 @@
 
 echo "Set ENV variables"
 CLUSTER=${CLUSTER:-"minikube"}
-DOCKER_VERSION=${DOCKER_VERSION:-""}
+DOCKER_VERSION=${DOCKER_VERSION:-"26.1.4"}
 HELM_VERSION=${HELM_VERSION:-"latest"}
 KUBERNETES_VERSION=${KUBERNETES_VERSION:-$(curl -L -s https://dl.k8s.io/release/stable.txt)}