diff --git a/Dockerfile.debian b/Dockerfile.debian
index 20d8b20a..91f403f2 100644
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -43,7 +43,7 @@ ENV FLUENTBIT_VERSION=$FLUENT_BIT_VERSION
 ARG FLB_NIGHTLY_BUILD
 ENV FLB_NIGHTLY_BUILD=$FLB_NIGHTLY_BUILD
 
-ARG FLUENTDO_AGENT_VERSION=26.1.1
+ARG FLUENTDO_AGENT_VERSION=25.10.12
 ENV FLUENTDO_AGENT_VERSION=${FLUENTDO_AGENT_VERSION}
 
 # Build metadata
diff --git a/Dockerfile.ubi b/Dockerfile.ubi
index fc939fdf..4c170b29 100644
--- a/Dockerfile.ubi
+++ b/Dockerfile.ubi
@@ -53,7 +53,7 @@ ENV FLUENTBIT_VERSION=$FLUENT_BIT_VERSION
 ARG FLB_NIGHTLY_BUILD
 ENV FLB_NIGHTLY_BUILD=$FLB_NIGHTLY_BUILD
 
-ARG FLUENTDO_AGENT_VERSION=26.1.1
+ARG FLUENTDO_AGENT_VERSION=25.10.12
 ENV FLUENTDO_AGENT_VERSION=${FLUENTDO_AGENT_VERSION}
 
 # Build metadata
diff --git a/scripts/setup-code.sh b/scripts/setup-code.sh
index 8f7c514a..23832c42 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:-26.1.1}
+export FLUENTDO_AGENT_VERSION=${FLUENTDO_AGENT_VERSION:-25.10.12}
 
 # 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 d837065c..860033c6 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -6,9 +6,9 @@ cmake_policy(SET CMP0069 NEW)
 set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
 
 # Fluent Bit Version
-set(FLB_VERSION_MAJOR 26)
-set(FLB_VERSION_MINOR 1)
-set(FLB_VERSION_PATCH 1)
+set(FLB_VERSION_MAJOR 25)
+set(FLB_VERSION_MINOR 10)
+set(FLB_VERSION_PATCH 12)
 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 42a91fba..64c9529a 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:-26.1.1}
+export FLUENTDO_AGENT_VERSION=${FLUENTDO_AGENT_VERSION:-25.10.12}
 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 9eaa9585..1601dcb6 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:-26.1.1}
+export FLUENTDO_AGENT_VERSION=${FLUENTDO_AGENT_VERSION:-25.10.12}
 
 # Location of packages to test
 export DOWNLOAD_DIR=${DOWNLOAD_DIR:-$PWD/downloads}