diff --git a/bitwarden_license/src/Scim/Dockerfile b/bitwarden_license/src/Scim/Dockerfile
index 6970dfa7b..8e5231283 100644
--- a/bitwarden_license/src/Scim/Dockerfile
+++ b/bitwarden_license/src/Scim/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
LABEL com.bitwarden.product="bitwarden"
diff --git a/bitwarden_license/src/Sso/Dockerfile b/bitwarden_license/src/Sso/Dockerfile
index 6970dfa7b..8e5231283 100644
--- a/bitwarden_license/src/Sso/Dockerfile
+++ b/bitwarden_license/src/Sso/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
LABEL com.bitwarden.product="bitwarden"
diff --git a/bitwarden_license/test/Scim.IntegrationTest/Scim.IntegrationTest.csproj b/bitwarden_license/test/Scim.IntegrationTest/Scim.IntegrationTest.csproj
index 4fc79f202..887066a9b 100644
--- a/bitwarden_license/test/Scim.IntegrationTest/Scim.IntegrationTest.csproj
+++ b/bitwarden_license/test/Scim.IntegrationTest/Scim.IntegrationTest.csproj
@@ -9,7 +9,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
diff --git a/src/Admin/Dockerfile b/src/Admin/Dockerfile
index 79d117681..71ad31898 100644
--- a/src/Admin/Dockerfile
+++ b/src/Admin/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
LABEL com.bitwarden.product="bitwarden"
diff --git a/src/Api/Dockerfile b/src/Api/Dockerfile
index 6970dfa7b..8e5231283 100644
--- a/src/Api/Dockerfile
+++ b/src/Api/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
LABEL com.bitwarden.product="bitwarden"
diff --git a/src/Billing/Dockerfile b/src/Billing/Dockerfile
index 9abbe1647..625aa0409 100644
--- a/src/Billing/Dockerfile
+++ b/src/Billing/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
LABEL com.bitwarden.product="bitwarden"
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
index 913c4b387..16ff2843f 100644
--- a/src/Core/Core.csproj
+++ b/src/Core/Core.csproj
@@ -25,7 +25,7 @@
-
+
@@ -35,15 +35,15 @@
-
+
-
+
-
+
@@ -58,7 +58,7 @@
-
+
diff --git a/src/Events/Dockerfile b/src/Events/Dockerfile
index 6970dfa7b..8e5231283 100644
--- a/src/Events/Dockerfile
+++ b/src/Events/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
LABEL com.bitwarden.product="bitwarden"
diff --git a/src/EventsProcessor/Dockerfile b/src/EventsProcessor/Dockerfile
index 4344452f6..4bed13d6a 100644
--- a/src/EventsProcessor/Dockerfile
+++ b/src/EventsProcessor/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
LABEL com.bitwarden.product="bitwarden"
diff --git a/src/Icons/Dockerfile b/src/Icons/Dockerfile
index edc1e0905..fb70d2cdd 100644
--- a/src/Icons/Dockerfile
+++ b/src/Icons/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
LABEL com.bitwarden.product="bitwarden"
diff --git a/src/Identity/Dockerfile b/src/Identity/Dockerfile
index 050859a49..db09a7024 100644
--- a/src/Identity/Dockerfile
+++ b/src/Identity/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
LABEL com.bitwarden.product="bitwarden"
diff --git a/src/Notifications/Dockerfile b/src/Notifications/Dockerfile
index ae9e693c2..b4d6f08cb 100644
--- a/src/Notifications/Dockerfile
+++ b/src/Notifications/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
LABEL com.bitwarden.product="bitwarden"
diff --git a/test/Common/Common.csproj b/test/Common/Common.csproj
index 2f11798ce..c758f904c 100644
--- a/test/Common/Common.csproj
+++ b/test/Common/Common.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/test/Identity.IntegrationTest/Identity.IntegrationTest.csproj b/test/Identity.IntegrationTest/Identity.IntegrationTest.csproj
index d7a7bb9a0..533d5a73a 100644
--- a/test/Identity.IntegrationTest/Identity.IntegrationTest.csproj
+++ b/test/Identity.IntegrationTest/Identity.IntegrationTest.csproj
@@ -10,7 +10,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
diff --git a/test/Infrastructure.IntegrationTest/Infrastructure.IntegrationTest.csproj b/test/Infrastructure.IntegrationTest/Infrastructure.IntegrationTest.csproj
index 159572f38..5e6ddee60 100644
--- a/test/Infrastructure.IntegrationTest/Infrastructure.IntegrationTest.csproj
+++ b/test/Infrastructure.IntegrationTest/Infrastructure.IntegrationTest.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/test/IntegrationTestCommon/IntegrationTestCommon.csproj b/test/IntegrationTestCommon/IntegrationTestCommon.csproj
index 3e8e55524..1103f8003 100644
--- a/test/IntegrationTestCommon/IntegrationTestCommon.csproj
+++ b/test/IntegrationTestCommon/IntegrationTestCommon.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/util/MsSqlMigratorUtility/Dockerfile b/util/MsSqlMigratorUtility/Dockerfile
index b3da6a53f..764f2455c 100644
--- a/util/MsSqlMigratorUtility/Dockerfile
+++ b/util/MsSqlMigratorUtility/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
LABEL com.bitwarden.product="bitwarden"
diff --git a/util/Server/Dockerfile b/util/Server/Dockerfile
index 6755a8528..baf2de11b 100644
--- a/util/Server/Dockerfile
+++ b/util/Server/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
LABEL com.bitwarden.product="bitwarden"
diff --git a/util/Setup/Dockerfile b/util/Setup/Dockerfile
index 0d0b0d764..71c55454f 100644
--- a/util/Setup/Dockerfile
+++ b/util/Setup/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
LABEL com.bitwarden.product="bitwarden" com.bitwarden.project="setup"