diff --git a/docker-compose.yml b/docker-compose.yml
index 955dcea..b958534 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -59,7 +59,7 @@ services:
     image: ${DOCKER_REGISTRY-}azuredevopsidentityservice
     build:
       context: .
-      dockerfile: src/AzureDevopsIdentityService/AzureDevopsIdentityService/Dockerfile
+      dockerfile: src/TimeLogIdentityService/IdentityService.API/Dockerfile
     environment:
         ServiceName : Azure_Devops_Identity_Service
         loki: http://loki:3100
@@ -82,7 +82,7 @@ services:
     image: ${DOCKER_REGISTRY-}azuredevopswebhookservice
     build:
       context: .
-      dockerfile: src/AzureDevopsWebhookService/AzureDevopsWebhookService/Dockerfile
+      dockerfile: src/AzureDevopsWebhookService/WebhookService.API/Dockerfile
     environment:
         ServiceName : Azure_Devops_Webhook_Service
         loki: http://loki:3100
@@ -106,7 +106,7 @@ services:
     image: ${DOCKER_REGISTRY-}tunnetcomaiontimetimelogserviceapi
     build:
       context: .
-      dockerfile: src/TunNetCom.AionTime.TimeLogService/TunNetCom.AionTime.TimeLogService.Budget.API/Dockerfile
+      dockerfile: src/TimeLogService/TimeLogService.API/Dockerfile
     environment:
         ServiceName : TimeLog_Service
         loki: http://loki:3100
@@ -130,7 +130,7 @@ services:
     image: ${DOCKER_REGISTRY-}tunnetcomaiontimeazuredevopsserviceapi
     build:
       context: .
-      dockerfile: src/TunNetCom.AionTime.AzureDevopsService/TunNetCom.AionTime.AzureDevopsService.API/Dockerfile
+      dockerfile: src/AzureDevopsService/AzureDevopsService.API/Dockerfile
     environment:
         ServiceName : Azure_Devops_Service
         loki: http://loki:3100
diff --git a/src/AzureDevopsService/AzureDevopsService.API/Dockerfile b/src/AzureDevopsService/AzureDevopsService.API/Dockerfile
index 98fcfa6..046a134 100644
--- a/src/AzureDevopsService/AzureDevopsService.API/Dockerfile
+++ b/src/AzureDevopsService/AzureDevopsService.API/Dockerfile
@@ -9,17 +9,17 @@ EXPOSE 8081
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
-COPY ["src/TunNetCom.AionTime.AzureDevopsService/TunNetCom.AionTime.AzureDevopsService.API/TunNetCom.AionTime.AzureDevopsService.API.csproj", "src/TunNetCom.AionTime.AzureDevopsService/TunNetCom.AionTime.AzureDevopsService.API/"]
-RUN dotnet restore "./src/TunNetCom.AionTime.AzureDevopsService/TunNetCom.AionTime.AzureDevopsService.API/TunNetCom.AionTime.AzureDevopsService.API.csproj"
+COPY ["src/AzureDevopsService/AzureDevopsService.API/AzureDevopsService.API.csproj", "src/AzureDevopsService/AzureDevopsService.API/"]
+RUN dotnet restore "./src/AzureDevopsService/AzureDevopsService.API/AzureDevopsService.API.csproj"
 COPY . .
-WORKDIR "/src/src/TunNetCom.AionTime.AzureDevopsService/TunNetCom.AionTime.AzureDevopsService.API"
-RUN dotnet build "./TunNetCom.AionTime.AzureDevopsService.API.csproj" -c $BUILD_CONFIGURATION -o /app/build
+WORKDIR "/src/AzureDevopsService/AzureDevopsService.API"
+RUN dotnet build "./AzureDevopsService.API.csproj" -c $BUILD_CONFIGURATION -o /app/build
 
 FROM build AS publish
 ARG BUILD_CONFIGURATION=Release
-RUN dotnet publish "./TunNetCom.AionTime.AzureDevopsService.API.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+RUN dotnet publish "./AzureDevopsService.API.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
 
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "TunNetCom.AionTime.AzureDevopsService.API.dll"]
\ No newline at end of file
+ENTRYPOINT ["dotnet", "AzureDevopsService.API.dll"]
\ No newline at end of file
diff --git a/src/AzureDevopsWebhookService/WebhookService.API/Dockerfile b/src/AzureDevopsWebhookService/WebhookService.API/Dockerfile
index 035c566..5f547ed 100644
--- a/src/AzureDevopsWebhookService/WebhookService.API/Dockerfile
+++ b/src/AzureDevopsWebhookService/WebhookService.API/Dockerfile
@@ -9,15 +9,15 @@ EXPOSE 8081
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
-COPY ["src/AzureDevopsWebhookService/AzureDevopsWebhookService/AzureDevopsWebhookService.csproj", "src/AzureDevopsWebhookService/AzureDevopsWebhookService/"]
-RUN dotnet restore "./src/AzureDevopsWebhookService/AzureDevopsWebhookService/AzureDevopsWebhookService.csproj"
+COPY ["src/AzureDevopsWebhookService/WebhookService/WebhookService.csproj", "src/AzureDevopsWebhookService/WebhookService/"]
+RUN dotnet restore "./src/AzureDevopsWebhookService/WebhookService/WebhookService.csproj"
 COPY . .
-WORKDIR "/src/src/AzureDevopsWebhookService/AzureDevopsWebhookService"
+WORKDIR "/src/src/AzureDevopsWebhookService/WebhookService"
 RUN dotnet build "./AzureDevopsWebhookService.csproj" -c $BUILD_CONFIGURATION -o /app/build
 
 FROM build AS publish
 ARG BUILD_CONFIGURATION=Release
-RUN dotnet publish "./AzureDevopsWebhookService.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+RUN dotnet publish "./WebhookService.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
 
 FROM base AS final
 WORKDIR /app
diff --git a/src/TimeLogIdentityService/IdentityService.API/Dockerfile b/src/TimeLogIdentityService/IdentityService.API/Dockerfile
index 17b8b60..1692f06 100644
--- a/src/TimeLogIdentityService/IdentityService.API/Dockerfile
+++ b/src/TimeLogIdentityService/IdentityService.API/Dockerfile
@@ -9,15 +9,15 @@ EXPOSE 8081
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
-COPY ["src/AzureDevopsIdentityService/AzureDevopsIdentityService/AzureDevopsIdentityService.csproj", "src/AzureDevopsIdentityService/AzureDevopsIdentityService/"]
-RUN dotnet restore "./src/AzureDevopsIdentityService/AzureDevopsIdentityService/AzureDevopsIdentityService.csproj"
+COPY ["src/TimeLogIdentityService/IdentityService.API/IdentityService.API.csproj", "src/TimeLogIdentityService/IdentityService/"]
+RUN dotnet restore "./src/TimeLogIdentityService/IdentityService.API/IdentityService.API.csproj"
 COPY . .
 WORKDIR "/src/src/AzureDevopsIdentityService/AzureDevopsIdentityService"
 RUN dotnet build "./AzureDevopsIdentityService.csproj" -c $BUILD_CONFIGURATION -o /app/build
 
 FROM build AS publish
 ARG BUILD_CONFIGURATION=Release
-RUN dotnet publish "./AzureDevopsIdentityService.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+RUN dotnet publish "./IdentityService.API.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
 
 FROM base AS final
 WORKDIR /app
diff --git a/src/TimeLogService/TimeLogService.API/Dockerfile b/src/TimeLogService/TimeLogService.API/Dockerfile
index a891feb..4e6fbaf 100644
--- a/src/TimeLogService/TimeLogService.API/Dockerfile
+++ b/src/TimeLogService/TimeLogService.API/Dockerfile
@@ -9,16 +9,16 @@ EXPOSE 8081
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
-COPY ["src/TunNetCom.AionTime.TimeLogService/TunNetCom.AionTime.TimeLogService.Budget.API/TunNetCom.AionTime.TimeLogService.API.csproj", "src/TunNetCom.AionTime.TimeLogService/TunNetCom.AionTime.TimeLogService.Budget.API/"]
+COPY ["src/TimeLogService/TimeLogService.API/TimeLogService.API.csproj", "src/TimeLogService/TimeLogService.API/"]
 COPY ["test/TunNetCom_Aion_Test/TunNetCom.AionTime.Test.csproj", "test/TunNetCom_Aion_Test/"]
-COPY ["src/TunNetCom.AionTime.TimeLogService/TunNetCom.AionTime.TimeLogService.Application/TunNetCom.AionTime.TimeLogService.Application.csproj", "src/TunNetCom.AionTime.TimeLogService/TunNetCom.AionTime.TimeLogService.Application/"]
-COPY ["src/TunNetCom.AionTime.TimeLogService/TunNetCom.AionTime.TimeLogService.Contracts/TunNetCom.AionTime.TimeLogService.Contracts.csproj", "src/TunNetCom.AionTime.TimeLogService/TunNetCom.AionTime.TimeLogService.Contracts/"]
-COPY ["src/TunNetCom.AionTime.TimeLogService/TunNetCom.AionTime.TimeLogService.Domain/TunNetCom.AionTime.TimeLogService.Domain.csproj", "src/TunNetCom.AionTime.TimeLogService/TunNetCom.AionTime.TimeLogService.Domain/"]
-COPY ["src/TunNetCom.AionTime.TimeLogService/TunNetCom.AionTime.TimeLogService.Infrastructure/TunNetCom.AionTime.TimeLogService.Infrastructure.csproj", "src/TunNetCom.AionTime.TimeLogService/TunNetCom.AionTime.TimeLogService.Infrastructure/"]
-RUN dotnet restore "./src/TunNetCom.AionTime.TimeLogService/TunNetCom.AionTime.TimeLogService.Budget.API/TunNetCom.AionTime.TimeLogService.API.csproj"
+COPY ["src/TimeLogService/TimeLogService.Application/TimeLogService.Application.csproj", "src/TimeLogService/TimeLogService.Application/"]
+COPY ["src/TimeLogService/TimeLogService.Contracts/TimeLogService.Contracts.csproj", "src/TimeLogService/TimeLogService.Contracts/"]
+COPY ["src/TimeLogService/TimeLogService.Domain/TimeLogService.Domain.csproj", "src/TimeLogService/TimeLogService.Domain/"]
+COPY ["src/TimeLogService/TimeLogService.Infrastructure/TimeLogService.Infrastructure.csproj", "src/TimeLogService/TimeLogService.Infrastructure/"]
+RUN dotnet restore "./src/TimeLogService/TimeLogService.API/TimeLogService.API.csproj"
 COPY . .
-WORKDIR "/src/src/TunNetCom.AionTime.TimeLogService/TunNetCom.AionTime.TimeLogService.Budget.API"
-RUN dotnet build "./TunNetCom.AionTime.TimeLogService.API.csproj" -c $BUILD_CONFIGURATION -o /app/build
+WORKDIR "/src/src/TimeLogService/TimeLogService.API"
+RUN dotnet build "./TimeLogService.API.csproj" -c $BUILD_CONFIGURATION -o /app/build
 
 # Copy the SSL certificate file
 COPY server.crt /usr/local/share/ca-certificates/
@@ -28,9 +28,9 @@ RUN update-ca-certificates
 
 FROM build AS publish
 ARG BUILD_CONFIGURATION=Release
-RUN dotnet publish "./TunNetCom.AionTime.TimeLogService.API.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+RUN dotnet publish "./TimeLogService.API.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
 
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "TunNetCom.AionTime.TimeLogService.API.dll"]
\ No newline at end of file
+ENTRYPOINT ["dotnet", "TimeLogService.API.dll"]
\ No newline at end of file