diff --git a/Dockerfile.debian b/Dockerfile.debian
index 28eb8fbe..addacd74 100644
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -44,7 +44,7 @@ ENV FLUENTBIT_VERSION=$FLUENT_BIT_VERSION
 ARG FLB_NIGHTLY_BUILD
 ENV FLB_NIGHTLY_BUILD=$FLB_NIGHTLY_BUILD
 
-ARG FLUENTDO_AGENT_VERSION=25.10.16
+ARG FLUENTDO_AGENT_VERSION=25.10.17
 ENV FLUENTDO_AGENT_VERSION=${FLUENTDO_AGENT_VERSION}
 
 # Build metadata
diff --git a/Dockerfile.ubi b/Dockerfile.ubi
index 8a54c0a5..866ea6b3 100644
--- a/Dockerfile.ubi
+++ b/Dockerfile.ubi
@@ -49,7 +49,7 @@ ENV FLUENTBIT_VERSION=$FLUENT_BIT_VERSION
 ARG FLB_NIGHTLY_BUILD
 ENV FLB_NIGHTLY_BUILD=$FLB_NIGHTLY_BUILD
 
-ARG FLUENTDO_AGENT_VERSION=25.10.16
+ARG FLUENTDO_AGENT_VERSION=25.10.17
 ENV FLUENTDO_AGENT_VERSION=${FLUENTDO_AGENT_VERSION}
 
 # Build metadata
diff --git a/scripts/setup-code.sh b/scripts/setup-code.sh
index ffa51993..c29888b8 100755
--- a/scripts/setup-code.sh
+++ b/scripts/setup-code.sh
@@ -19,7 +19,7 @@ PATCH_LIST=${PATCH_LIST:-$PATCH_DIR/patches-agent.files}
 CUSTOM_DIR=${CUSTOM_DIR:-$REPO_ROOT/custom}
 
 # Change via ./scripts/update-version.sh only
-export FLUENTDO_AGENT_VERSION=${FLUENTDO_AGENT_VERSION:-25.10.16}
+export FLUENTDO_AGENT_VERSION=${FLUENTDO_AGENT_VERSION:-25.10.17}
 
 # Handle version string with or without a v prefix - we just want semver
 if [[ "$FLUENTDO_AGENT_VERSION" =~ ^v?([0-9]+\.[0-9]+\.[0-9]+)$ ]] ; then
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 640a49ef..55e406e8 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
 # Fluent Bit Version
 set(FLB_VERSION_MAJOR 25)
 set(FLB_VERSION_MINOR 10)
-set(FLB_VERSION_PATCH 16)
+set(FLB_VERSION_PATCH 17)
 set(FLB_VERSION_STR "${FLB_VERSION_MAJOR}.${FLB_VERSION_MINOR}.${FLB_VERSION_PATCH}")
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
diff --git a/testing/bats/run-bats.sh b/testing/bats/run-bats.sh
index 329ac0eb..b49cfcbd 100755
--- a/testing/bats/run-bats.sh
+++ b/testing/bats/run-bats.sh
@@ -14,7 +14,7 @@ done
 SCRIPT_DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
 
 export FLUENT_BIT_BINARY=${FLUENT_BIT_BINARY:-/fluent-bit/bin/fluent-bit}
-export FLUENTDO_AGENT_VERSION=${FLUENTDO_AGENT_VERSION:-25.10.16}
+export FLUENTDO_AGENT_VERSION=${FLUENTDO_AGENT_VERSION:-25.10.17}
 export FLUENTDO_AGENT_URL="${FLUENTDO_AGENT_URL:-https://staging.fluent.do}"
 
 echo "INFO: Testing with binary '$FLUENT_BIT_BINARY'"
diff --git a/testing/bats/run-package-functional-tests.sh b/testing/bats/run-package-functional-tests.sh
index 3d20d8e8..c6b14188 100755
--- a/testing/bats/run-package-functional-tests.sh
+++ b/testing/bats/run-package-functional-tests.sh
@@ -20,7 +20,7 @@ export FLUENT_BIT_BINARY=${FLUENT_BIT_BINARY:-/opt/fluentdo-agent/bin/fluent-bit
 
 # Only used if no packages downloaded and running manually (not in CI)
 export FLUENTDO_AGENT_URL=${FLUENTDO_AGENT_URL:-https://staging.fluent.do}
-export FLUENTDO_AGENT_VERSION=${FLUENTDO_AGENT_VERSION:-25.10.16}
+export FLUENTDO_AGENT_VERSION=${FLUENTDO_AGENT_VERSION:-25.10.17}
 
 # Location of packages to test
 export DOWNLOAD_DIR=${DOWNLOAD_DIR:-$PWD/downloads}