diff --git a/bitnami/kubectl/1.36/debian-12/Dockerfile b/bitnami/kubectl/1.36/debian-12/Dockerfile
index b79de92489cd..c26155947284 100644
--- a/bitnami/kubectl/1.36/debian-12/Dockerfile
+++ b/bitnami/kubectl/1.36/debian-12/Dockerfile
@@ -7,13 +7,13 @@ ARG DOWNLOADS_URL="https://downloads.bitnami.com/files/stacksmith"
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2026-08-20T02:49:27Z" \
+      org.opencontainers.image.created="2026-08-20T12:54:44Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/kubectl/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/kubectl" \
       org.opencontainers.image.title="kubectl" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
-      org.opencontainers.image.version="1.36.3"
+      org.opencontainers.image.version="1.36.4"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -28,8 +28,8 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
     DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \
     mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
-      "yq-4.53.4-0-linux-${OS_ARCH}-debian-12" \
-      "kubectl-1.36.3-3-linux-${OS_ARCH}-debian-12" \
+      "yq-4.53.6-0-linux-${OS_ARCH}-debian-12" \
+      "kubectl-1.36.4-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -47,9 +47,9 @@ RUN mkdir /.kube && chmod g+rwX /.kube
 RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true
 RUN uninstall_packages curl
 
-ENV APP_VERSION="1.36.3" \
+ENV APP_VERSION="1.36.4" \
     BITNAMI_APP_NAME="kubectl" \
-    IMAGE_REVISION="3" \
+    IMAGE_REVISION="0" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/kubectl/bin:$PATH"
 
 USER 1001
diff --git a/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/kubectl-1.36.3-3-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/kubectl-1.36.3-3-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index 66cc6f0814d4..000000000000
--- a/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/kubectl-1.36.3-3-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-0b5cd236f49d32d66004e3a3b637235cbf2893affd3864a1989afb446959b227  kubectl-1.36.3-3-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/kubectl-1.36.3-3-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/kubectl-1.36.3-3-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index 756212fa691b..000000000000
--- a/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/kubectl-1.36.3-3-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-c0f740ca9259d38d2a5b33fc5272590bb6585febf2c11f19b9a07337ec0bf054  kubectl-1.36.3-3-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/kubectl-1.36.4-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/kubectl-1.36.4-0-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..6c2f7d27aa7b
--- /dev/null
+++ b/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/kubectl-1.36.4-0-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+3f4330a584c62c40e61f216c648d4d3e597378bc4eb667c30d8df61d529a7bbf  kubectl-1.36.4-0-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/kubectl-1.36.4-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/kubectl-1.36.4-0-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..a0406affe3e3
--- /dev/null
+++ b/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/kubectl-1.36.4-0-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+ef74ff860acb8a195e4ec7d4d3931352b139c35b345e1a8eb2755bd9d6347ab9  kubectl-1.36.4-0-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.4-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.4-0-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index 077c75eaa743..000000000000
--- a/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.4-0-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-61514fd7d58b1a4ff08c54ab3df1a8050802b1f38555244ad9dff66920051a6f  yq-4.53.4-0-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.4-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.4-0-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index 93543a3e1730..000000000000
--- a/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.4-0-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-8c948de445ddec81e270ec8ce7ebbcafc4375c4b53c7607edda135d9baf165f2  yq-4.53.4-0-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.6-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.6-0-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..882899c0ffa6
--- /dev/null
+++ b/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.6-0-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+0a3cc46d3e81f1afa781d0d0c0d12a91a65f73922ceae0bc3daaf9318b0436e2  yq-4.53.6-0-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.6-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.6-0-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..fd499a8c78f1
--- /dev/null
+++ b/bitnami/kubectl/1.36/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.6-0-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+cb8a0ed14abba44de4c4680273278b091a0a4ab49cca296f2a507d037242fa0d  yq-4.53.6-0-linux-arm64-debian-12.tar.gz