diff --git a/build/.run/Artifacts DotnetTool Test.run.xml b/build/.run/Artifacts DotnetTool Test.run.xml
index f09edd6a7e..c4c33a96bc 100644
--- a/build/.run/Artifacts DotnetTool Test.run.xml	
+++ b/build/.run/Artifacts DotnetTool Test.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts DotnetTool Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts" />
-    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsDotnetToolTest --arch=amd64 --dotnet_version=8.0 --docker_distro=alpine.3.20" />
+    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsDotnetToolTest --arch=amd64 --dotnet_version=8.0 --docker_distro=alpine.3.21" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
@@ -20,4 +20,4 @@
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Artifacts MsBuildCore Test.run.xml b/build/.run/Artifacts MsBuildCore Test.run.xml
index 034885bdb1..c39a0ea675 100644
--- a/build/.run/Artifacts MsBuildCore Test.run.xml	
+++ b/build/.run/Artifacts MsBuildCore Test.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts MsBuildCore Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts" />
-    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsMsBuildCoreTest --arch=amd64 --dotnet_version=8.0 --docker_distro=alpine.3.20" />
+    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsMsBuildCoreTest --arch=amd64 --dotnet_version=8.0 --docker_distro=alpine.3.21" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
@@ -20,4 +20,4 @@
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Artifacts Native Test.run.xml b/build/.run/Artifacts Native Test.run.xml
index 185bfa09bc..a36059f498 100644
--- a/build/.run/Artifacts Native Test.run.xml	
+++ b/build/.run/Artifacts Native Test.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts Native Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts" />
-    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsNativeTest --arch=amd64 --dotnet_version=8.0 --docker_distro=alpine.3.20" />
+    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsNativeTest --arch=amd64 --dotnet_version=8.0 --docker_distro=alpine.3.21" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
@@ -20,4 +20,4 @@
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Artifacts Prepare.run.xml b/build/.run/Artifacts Prepare.run.xml
index c662b76166..2f1148d96e 100644
--- a/build/.run/Artifacts Prepare.run.xml	
+++ b/build/.run/Artifacts Prepare.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts Prepare" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts" />
-    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsPrepare --dotnet_version=8.0 --docker_distro=alpine.3.20" />
+    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsPrepare --dotnet_version=8.0 --docker_distro=alpine.3.21" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
@@ -20,4 +20,4 @@
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/.run/Artifacts Test.run.xml b/build/.run/Artifacts Test.run.xml
index 9f07df0d26..2463d6a13c 100644
--- a/build/.run/Artifacts Test.run.xml	
+++ b/build/.run/Artifacts Test.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts" />
-    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsTest --dotnet_version=8.0 --docker_distro=alpine.3.20" />
+    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsTest --dotnet_version=8.0 --docker_distro=alpine.3.21" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
@@ -20,4 +20,4 @@
       <option name="Build" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build/common/Utilities/Constants.cs b/build/common/Utilities/Constants.cs
index 6a21c36e31..4abc5f16d9 100644
--- a/build/common/Utilities/Constants.cs
+++ b/build/common/Utilities/Constants.cs
@@ -24,11 +24,10 @@ public static class Constants
     public const string GitHubContainerRegistry = "ghcr.io";
     public static readonly string[] DockerRegistries = [DockerHub, GitHub];
 
-    public const string AlpineLatest = "alpine.3.20";
+    public const string AlpineLatest = "alpine.3.21";
     public const string CentosStreamLatest = "centos.stream.9";
     public const string DebianLatest = "debian.12";
-    public const string FedoraLatest = "fedora.40";
-    public const string Ubuntu2004 = "ubuntu.20.04";
+    public const string FedoraLatest = "fedora.41";
     public const string Ubuntu2204 = "ubuntu.22.04";
     public const string Ubuntu2404 = "ubuntu.24.04";
 
@@ -40,7 +39,6 @@ public static class Constants
         CentosStreamLatest,
         DebianLatest,
         FedoraLatest,
-        Ubuntu2004,
         Ubuntu2204,
         Ubuntu2404
     ];