diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fb9f846e7d..1d12c0cc32 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,7 +63,7 @@ jobs:
           export SHELL=/bin/bash
           export DOCKER_BUILDKIT=1
           eval $(minikube -p minikube docker-env)
-          docker build --progress=plain  --build-arg SKIP_TESTS=false --no-cache -f ./Dockerfile -t flink-kubernetes-operator:ci-latest .
+          docker build --progress=plain  --build-arg SKIP_TESTS=false --build-arg SKIP_OS_UPDATE=false --no-cache -f ./Dockerfile -t flink-kubernetes-operator:ci-latest .
           docker images
       - name: Start the operator
         run: |
diff --git a/.github/workflows/docker-bake.hcl b/.github/workflows/docker-bake.hcl
index 82b2fee1e7..c7ef2de9da 100644
--- a/.github/workflows/docker-bake.hcl
+++ b/.github/workflows/docker-bake.hcl
@@ -26,4 +26,7 @@ target "bake-platform" {
     "linux/amd64",
     "linux/arm64/v8",
   ]
+  args = {
+    SKIP_OS_UPDATE = false
+  }
 }
diff --git a/Dockerfile b/Dockerfile
index e15ab4c58f..061982fcba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,9 +58,12 @@ RUN chown -R flink:flink $FLINK_HOME && \
     chown flink:flink $FLINK_KUBERNETES_SHADED_JAR && \
     chown flink:flink /docker-entrypoint.sh
 
+
+ARG SKIP_OS_UPDATE=true
+
 # Updating Debian
-RUN apt-get update
-RUN apt-get upgrade -y
+RUN if [ "$SKIP_OS_UPDATE" = "false" ]; then apt-get update; fi
+RUN if [ "$SKIP_OS_UPDATE" = "false" ]; then apt-get upgrade -y; fi
 
 USER flink
 ENTRYPOINT ["/docker-entrypoint.sh"]