diff --git a/.azurepipelines/Ubuntu-GCC.yml b/.azurepipelines/Ubuntu-GCC.yml
index 987dc3f10f..2d53eb58fa 100644
--- a/.azurepipelines/Ubuntu-GCC.yml
+++ b/.azurepipelines/Ubuntu-GCC.yml
@@ -29,6 +29,6 @@ jobs:
   parameters:
     tool_chain_tag: GCC
     vm_image: ${{ variables.default_linux_vm }}
-    container: ${{ variables.default_linux_image }}
+    container: ${{ variables.default_linux_container }}
     arch_list: "IA32,X64,AARCH64,RISCV64,LOONGARCH64"
     usePythonVersion: ''  # use Python from the container image
diff --git a/.azurepipelines/templates/defaults.yml b/.azurepipelines/templates/defaults.yml
index 176035de63..c04e3cc008 100644
--- a/.azurepipelines/templates/defaults.yml
+++ b/.azurepipelines/templates/defaults.yml
@@ -9,6 +9,6 @@
 
 variables:
   default_python_version: "3.12"
-  default_linux_image: "ghcr.io/tianocore/containers/fedora-43-test:bde74f8"
+  default_linux_container: "ghcr.io/tianocore/containers/fedora-43-test:bde74f8"
   default_linux_vm: "ubuntu-24.04"
   default_windows_vm: "windows-2022"
diff --git a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
index b1e9f9f524..e385c10441 100644
--- a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
+++ b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
@@ -113,7 +113,7 @@ jobs:
     pool:
       vmImage: $(vm_image)
 
-    container: ${{ variables.default_linux_image }}
+    container: ${{ variables.default_linux_container }}
 
     steps:
     - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml
diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
index 27c650f1a3..e31fe0e2c1 100644
--- a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
+++ b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
@@ -87,7 +87,7 @@ jobs:
     pool:
       vmImage: $(vm_image)
 
-    container: ${{ variables.default_linux_image }}
+    container: ${{ variables.default_linux_container }}
 
     steps:
     - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml
diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
index c6938ebfa9..fde3927ded 100644
--- a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
+++ b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml
@@ -155,7 +155,7 @@ jobs:
     pool:
       vmImage: $(vm_image)
 
-    container: ${{ variables.default_linux_image }}
+    container: ${{ variables.default_linux_container }}
 
     steps:
     - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml