diff --git a/dockers/docker-gnmi-sidecar/Dockerfile.j2 b/dockers/docker-gnmi-sidecar/Dockerfile.j2
index 6c7ceffbba4..64a9ffdc123 100644
--- a/dockers/docker-gnmi-sidecar/Dockerfile.j2
+++ b/dockers/docker-gnmi-sidecar/Dockerfile.j2
@@ -1,5 +1,5 @@
 {% from "dockers/dockerfile-macros.j2" import rsync_from_builder_stage %}
-ARG BASE=docker-config-engine-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
+ARG BASE=docker-config-engine-trixie-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
 
 FROM $BASE AS base
 
diff --git a/dockers/docker-gnmi-watchdog/Dockerfile.j2 b/dockers/docker-gnmi-watchdog/Dockerfile.j2
index 0cb339f056f..42cde56b932 100644
--- a/dockers/docker-gnmi-watchdog/Dockerfile.j2
+++ b/dockers/docker-gnmi-watchdog/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM docker-config-engine-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} AS builder
+FROM docker-config-engine-trixie-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} AS builder
 
 # Update apt's cache of available packages
 RUN apt-get update && apt-get install -y \
@@ -18,7 +18,7 @@ COPY watchdog/ ./
 # Build from within /watchdog
 RUN cargo build --release
 
-FROM docker-config-engine-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
+FROM docker-config-engine-trixie-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
 
 ARG docker_container_name
 ARG image_version
diff --git a/dockers/docker-sonic-gnmi/Dockerfile.j2 b/dockers/docker-sonic-gnmi/Dockerfile.j2
index fa9274fc246..c10e2557181 100644
--- a/dockers/docker-sonic-gnmi/Dockerfile.j2
+++ b/dockers/docker-sonic-gnmi/Dockerfile.j2
@@ -1,5 +1,5 @@
 {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files, rsync_from_builder_stage %}
-ARG BASE=docker-config-engine-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
+ARG BASE=docker-config-engine-trixie-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
 
 FROM $BASE AS base
 
diff --git a/rules/docker-gnmi-sidecar.mk b/rules/docker-gnmi-sidecar.mk
index 44b962b4639..300216a75f6 100644
--- a/rules/docker-gnmi-sidecar.mk
+++ b/rules/docker-gnmi-sidecar.mk
@@ -4,7 +4,7 @@ DOCKER_GNMI_SIDECAR_STEM = docker-gnmi-sidecar
 DOCKER_GNMI_SIDECAR = $(DOCKER_GNMI_SIDECAR_STEM).gz
 DOCKER_GNMI_SIDECAR_DBG = $(DOCKER_GNMI_SIDECAR_STEM)-$(DBG_IMAGE_MARK).gz
 
-$(DOCKER_GNMI_SIDECAR)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_BOOKWORM)
+$(DOCKER_GNMI_SIDECAR)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_TRIXIE)
 
 $(DOCKER_GNMI_SIDECAR)_PATH = $(DOCKERS_PATH)/$(DOCKER_GNMI_SIDECAR_STEM)
 
@@ -12,11 +12,11 @@ $(DOCKER_GNMI_SIDECAR)_VERSION = 1.0.0
 $(DOCKER_GNMI_SIDECAR)_PACKAGE_NAME = gnmi-sidecar
 
 SONIC_DOCKER_IMAGES += $(DOCKER_GNMI_SIDECAR)
-SONIC_BOOKWORM_DOCKERS += $(DOCKER_GNMI_SIDECAR)
+SONIC_TRIXIE_DOCKERS += $(DOCKER_GNMI_SIDECAR)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_GNMI_SIDECAR)
 
 SONIC_DOCKER_DBG_IMAGES += $(DOCKER_GNMI_SIDECAR_DBG)
-SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_GNMI_SIDECAR_DBG)
+SONIC_TRIXIE_DBG_DOCKERS += $(DOCKER_GNMI_SIDECAR_DBG)
 SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_GNMI_SIDECAR_DBG)
 
 
diff --git a/rules/docker-gnmi-watchdog.mk b/rules/docker-gnmi-watchdog.mk
index 234fe77cbeb..6e34e3849a6 100644
--- a/rules/docker-gnmi-watchdog.mk
+++ b/rules/docker-gnmi-watchdog.mk
@@ -4,7 +4,7 @@ DOCKER_GNMI_WATCHDOG_STEM = docker-gnmi-watchdog
 DOCKER_GNMI_WATCHDOG = $(DOCKER_GNMI_WATCHDOG_STEM).gz
 DOCKER_GNMI_WATCHDOG_DBG = $(DOCKER_GNMI_WATCHDOG_STEM)-$(DBG_IMAGE_MARK).gz
 
-$(DOCKER_GNMI_WATCHDOG)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_BOOKWORM)
+$(DOCKER_GNMI_WATCHDOG)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_TRIXIE)
 
 $(DOCKER_GNMI_WATCHDOG)_PATH = $(DOCKERS_PATH)/$(DOCKER_GNMI_WATCHDOG_STEM)
 
@@ -12,13 +12,13 @@ $(DOCKER_GNMI_WATCHDOG)_VERSION = 1.0.0
 $(DOCKER_GNMI_WATCHDOG)_PACKAGE_NAME = gnmi_watchdog
 
 SONIC_DOCKER_IMAGES += $(DOCKER_GNMI_WATCHDOG)
-SONIC_BOOKWORM_DOCKERS += $(DOCKER_GNMI_WATCHDOG)
+SONIC_TRIXIE_DOCKERS += $(DOCKER_GNMI_WATCHDOG)
 ifeq ($(INCLUDE_SYSTEM_GNMI), y)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_GNMI_WATCHDOG)
 endif
 
 SONIC_DOCKER_DBG_IMAGES += $(DOCKER_GNMI_WATCHDOG_DBG)
-SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_GNMI_WATCHDOG_DBG)
+SONIC_TRIXIE_DBG_DOCKERS += $(DOCKER_GNMI_WATCHDOG_DBG)
 ifeq ($(INCLUDE_SYSTEM_GNMI), y)
 SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_GNMI_WATCHDOG_DBG)
 endif
diff --git a/rules/docker-gnmi.mk b/rules/docker-gnmi.mk
index c3e7165c839..2b224333b18 100644
--- a/rules/docker-gnmi.mk
+++ b/rules/docker-gnmi.mk
@@ -8,14 +8,14 @@ $(DOCKER_GNMI)_PATH = $(DOCKERS_PATH)/$(DOCKER_GNMI_STEM)
 
 $(DOCKER_GNMI)_DEPENDS += $(SONIC_MGMT_COMMON)
 $(DOCKER_GNMI)_DEPENDS += $(SONIC_TELEMETRY)
-$(DOCKER_GNMI)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_DEPENDS)
+$(DOCKER_GNMI)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_TRIXIE)_DBG_DEPENDS)
 
-$(DOCKER_GNMI)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BOOKWORM)
+$(DOCKER_GNMI)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_TRIXIE)
 
 $(DOCKER_GNMI)_VERSION = 1.0.0
 $(DOCKER_GNMI)_PACKAGE_NAME = gnmi
 
-$(DOCKER_GNMI)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_IMAGE_PACKAGES)
+$(DOCKER_GNMI)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_TRIXIE)_DBG_IMAGE_PACKAGES)
 
 # Ensure docker-telemetry-watchdog (which uses a docker-sonic-gnmi-based image)
 # is built before the docker-sonic-gnmi debug image, because the debug image build removes
@@ -23,13 +23,13 @@ $(DOCKER_GNMI)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_IMAGE
 $(DOCKER_GNMI_DBG)_AFTER += $(DOCKER_TELEMETRY_WATCHDOG)
 
 SONIC_DOCKER_IMAGES += $(DOCKER_GNMI)
-SONIC_BOOKWORM_DOCKERS += $(DOCKER_GNMI)
+SONIC_TRIXIE_DOCKERS += $(DOCKER_GNMI)
 ifeq ($(INCLUDE_SYSTEM_GNMI), y)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_GNMI)
 endif
 
 SONIC_DOCKER_DBG_IMAGES += $(DOCKER_GNMI_DBG)
-SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_GNMI_DBG)
+SONIC_TRIXIE_DBG_DOCKERS += $(DOCKER_GNMI_DBG)
 ifeq ($(INCLUDE_SYSTEM_GNMI), y)
 SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_GNMI_DBG)
 endif
diff --git a/rules/docker-telemetry-watchdog.mk b/rules/docker-telemetry-watchdog.mk
index 4f22e2ca63f..5badfc4499d 100644
--- a/rules/docker-telemetry-watchdog.mk
+++ b/rules/docker-telemetry-watchdog.mk
@@ -12,11 +12,11 @@ $(DOCKER_TELEMETRY_WATCHDOG)_VERSION = 1.0.0
 $(DOCKER_TELEMETRY_WATCHDOG)_PACKAGE_NAME = telemetry_watchdog
 
 SONIC_DOCKER_IMAGES += $(DOCKER_TELEMETRY_WATCHDOG)
-SONIC_BOOKWORM_DOCKERS += $(DOCKER_TELEMETRY_WATCHDOG)
+SONIC_TRIXIE_DOCKERS += $(DOCKER_TELEMETRY_WATCHDOG)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_TELEMETRY_WATCHDOG)
 
 SONIC_DOCKER_DBG_IMAGES += $(DOCKER_TELEMETRY_WATCHDOG_DBG)
-SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_TELEMETRY_WATCHDOG_DBG)
+SONIC_TRIXIE_DBG_DOCKERS += $(DOCKER_TELEMETRY_WATCHDOG_DBG)
 SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_TELEMETRY_WATCHDOG_DBG)
 
 $(DOCKER_TELEMETRY_WATCHDOG)_CONTAINER_NAME = telemetry_watchdog
diff --git a/rules/docker-telemetry.mk b/rules/docker-telemetry.mk
index 5869f7885b9..b83ad981219 100644
--- a/rules/docker-telemetry.mk
+++ b/rules/docker-telemetry.mk
@@ -16,13 +16,13 @@ $(DOCKER_TELEMETRY)_PACKAGE_NAME = telemetry
 $(DOCKER_TELEMETRY)_DBG_IMAGE_PACKAGES = $($(DOCKER_GNMI)_DBG_IMAGE_PACKAGES)
 
 SONIC_DOCKER_IMAGES += $(DOCKER_TELEMETRY)
-SONIC_BOOKWORM_DOCKERS += $(DOCKER_TELEMETRY)
+SONIC_TRIXIE_DOCKERS += $(DOCKER_TELEMETRY)
 ifeq ($(INCLUDE_SYSTEM_TELEMETRY), y)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_TELEMETRY)
 endif
 
 SONIC_DOCKER_DBG_IMAGES += $(DOCKER_TELEMETRY_DBG)
-SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_TELEMETRY_DBG)
+SONIC_TRIXIE_DBG_DOCKERS += $(DOCKER_TELEMETRY_DBG)
 ifeq ($(INCLUDE_SYSTEM_TELEMETRY), y)
 SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_TELEMETRY_DBG)
 endif
diff --git a/rules/sonic-fips.mk b/rules/sonic-fips.mk
index fc7147ef73b..fc5d858bb0e 100644
--- a/rules/sonic-fips.mk
+++ b/rules/sonic-fips.mk
@@ -2,7 +2,7 @@
 
 
 ifeq ($(BLDENV), trixie)
-FIPS_VERSION = 1.8.0-24-gd744cf2
+FIPS_VERSION = 1.8.0-24-gd744cf2-2
 FIPS_OPENSSL_VERSION = 3.5.4-1+fips
 FIPS_OPENSSH_VERSION = 10.0p1-7+fips
 FIPS_PYTHON_MAIN_VERSION = 3.13