diff --git a/src/Identity/Dockerfile b/src/Identity/Dockerfile
index 3e9fb769aa..cbcc32413e 100644
--- a/src/Identity/Dockerfile
+++ b/src/Identity/Dockerfile
@@ -19,42 +19,29 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
 
 # Copy csproj files as distinct layers
 WORKDIR /source
-COPY src/Admin/*.csproj ./src/Admin/
+COPY src/Identity/*.csproj ./src/Identity/
 COPY src/Core/*.csproj ./src/Core/
 COPY src/Infrastructure.Dapper/*.csproj ./src/Infrastructure.Dapper/
 COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFramework/
 COPY src/SharedWeb/*.csproj ./src/SharedWeb/
-COPY util/Migrator/*.csproj ./util/Migrator/
-COPY util/MySqlMigrations/*.csproj ./util/MySqlMigrations/
-COPY util/PostgresMigrations/*.csproj ./util/PostgresMigrations/
-COPY util/SqliteMigrations/*.csproj ./util/SqliteMigrations/
-COPY bitwarden_license/src/Commercial.Core/*.csproj ./bitwarden_license/src/Commercial.Core/
-COPY bitwarden_license/src/Commercial.Infrastructure.EntityFramework/*.csproj ./bitwarden_license/src/Commercial.Infrastructure.EntityFramework/
 COPY Directory.Build.props .
 
-# Restore Admin project dependencies and tools
-WORKDIR /source/src/Admin
+# Restore Identity project dependencies and tools
+WORKDIR /source/src/Identity
 RUN . /tmp/rid.txt && dotnet restore -r $RID
 
 # Copy required project files
 WORKDIR /source
-COPY src/Admin/. ./src/Admin/
+COPY src/Identity/. ./src/Identity/
 COPY src/Core/. ./src/Core/
 COPY src/Infrastructure.Dapper/. ./src/Infrastructure.Dapper/
 COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
 COPY src/SharedWeb/. ./src/SharedWeb/
-COPY util/Migrator/. ./util/Migrator/
-COPY util/MySqlMigrations/. ./util/MySqlMigrations/
-COPY util/PostgresMigrations/. ./util/PostgresMigrations/
-COPY util/SqliteMigrations/. ./util/SqliteMigrations/
-COPY util/EfShared/. ./util/EfShared/
-COPY bitwarden_license/src/Commercial.Core/. ./bitwarden_license/src/Commercial.Core/
-COPY bitwarden_license/src/Commercial.Infrastructure.EntityFramework/. ./bitwarden_license/src/Commercial.Infrastructure.EntityFramework/
 COPY .git/. ./.git/
 
-# Build Admin app
-WORKDIR /source/src/Admin
-RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Admin --no-restore --no-self-contained -r $RID
+# Build Identity app
+WORKDIR /source/src/Identity
+RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Identity --no-restore --no-self-contained -r $RID
 
 WORKDIR /app
 
diff --git a/util/Setup/Dockerfile b/util/Setup/Dockerfile
index 34570ecae8..dce42a14bb 100644
--- a/util/Setup/Dockerfile
+++ b/util/Setup/Dockerfile
@@ -19,6 +19,7 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
 
 # Copy csproj files as distinct layers
 WORKDIR /source
+COPY src/Core/*.csproj ./src/Core/
 COPY util/Migrator/*.csproj ./util/Migrator/
 COPY util/Setup/*.csproj ./util/Setup/
 COPY Directory.Build.props .
@@ -29,6 +30,7 @@ RUN . /tmp/rid.txt && dotnet restore -r $RID
 
 # Copy required project files
 WORKDIR /source
+COPY src/Core/. ./src/Core/
 COPY util/Migrator/. ./util/Migrator/
 COPY util/Setup/. ./util/Setup/
 COPY .git/. ./.git/