diff --git a/src/LiteCharmsSecurity.Admin.Api/Dockerfile b/src/LiteCharmsSecurity.Admin.Api/Dockerfile
index c2aa46f..40167e2 100644
--- a/src/LiteCharmsSecurity.Admin.Api/Dockerfile
+++ b/src/LiteCharmsSecurity.Admin.Api/Dockerfile
@@ -12,14 +12,14 @@ COPY ["src/LiteCharmsSecurity.Admin.EntityFramework.SqlServer/LiteCharmsSecurity
 COPY ["src/LiteCharmsSecurity.Shared/LiteCharmsSecurity.Shared.csproj", "src/LiteCharmsSecurity.Shared/"]
 COPY ["src/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL.csproj", "src/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL/"]
 
-RUN dotnet restore -a $TARGETARCH "src/LiteCharmsSecurity.Admin.Api/LiteCharmsSecurity.Admin.Api.csproj" --source "https://nexus.khongisa.co.za/repository/nuget-group/index.json"
+RUN dotnet restore "src/LiteCharmsSecurity.Admin.Api/LiteCharmsSecurity.Admin.Api.csproj" --source "https://nexus.khongisa.co.za/repository/nuget-group/index.json"
 
 COPY . .
 WORKDIR "src/LiteCharmsSecurity.Admin.Api"
-RUN dotnet build -a $TARGETARCH "LiteCharmsSecurity.Admin.Api.csproj" -c Release -o /app/build
+RUN dotnet build "LiteCharmsSecurity.Admin.Api.csproj" -c Release -o /app/build
 
 FROM build AS publish
-RUN dotnet publish -a $TARGETARCH "LiteCharmsSecurity.Admin.Api.csproj" -c Release --no-restore -o /app/publish
+RUN dotnet publish "LiteCharmsSecurity.Admin.Api.csproj" -c Release --no-restore -o /app/publish
 
 FROM base AS final
 WORKDIR /app
diff --git a/src/LiteCharmsSecurity.Admin/Dockerfile b/src/LiteCharmsSecurity.Admin/Dockerfile
index 7568911..0f3e162 100644
--- a/src/LiteCharmsSecurity.Admin/Dockerfile
+++ b/src/LiteCharmsSecurity.Admin/Dockerfile
@@ -23,14 +23,14 @@ COPY ["src/LiteCharmsSecurity.Admin.EntityFramework.Shared/LiteCharmsSecurity.Ad
 COPY ["src/LiteCharmsSecurity.Admin.EntityFramework.SqlServer/LiteCharmsSecurity.Admin.EntityFramework.SqlServer.csproj", "src/LiteCharmsSecurity.Admin.EntityFramework.SqlServer/"]
 COPY ["src/LiteCharmsSecurity.Shared/LiteCharmsSecurity.Shared.csproj", "src/LiteCharmsSecurity.Shared/"]
 
-RUN dotnet restore -a $TARGETARCH "src/LiteCharmsSecurity.Admin/LiteCharmsSecurity.Admin.csproj" --source "https://nexus.khongisa.co.za/repository/nuget-group/index.json"
+RUN dotnet restore "src/LiteCharmsSecurity.Admin/LiteCharmsSecurity.Admin.csproj" --source "https://nexus.khongisa.co.za/repository/nuget-group/index.json"
 
 COPY . .
 WORKDIR "src/LiteCharmsSecurity.Admin"
-RUN dotnet build -a $TARGETARCH "LiteCharmsSecurity.Admin.csproj" -c Release -o /app/build
+RUN dotnet build "LiteCharmsSecurity.Admin.csproj" -c Release -o /app/build
 
 FROM build AS publish
-RUN dotnet publish -a $TARGETARCH "LiteCharmsSecurity.Admin.csproj" -c Release --no-restore -o /app/publish
+RUN dotnet publish "LiteCharmsSecurity.Admin.csproj" -c Release --no-restore -o /app/publish
 
 FROM base AS final
 WORKDIR /app
diff --git a/src/LiteCharmsSecurity.STS.Identity/Dockerfile b/src/LiteCharmsSecurity.STS.Identity/Dockerfile
index 6d6eeb9..ad4e51e 100644
--- a/src/LiteCharmsSecurity.STS.Identity/Dockerfile
+++ b/src/LiteCharmsSecurity.STS.Identity/Dockerfile
@@ -10,14 +10,14 @@ COPY ["src/LiteCharmsSecurity.STS.Identity/LiteCharmsSecurity.STS.Identity.cspro
 COPY ["src/LiteCharmsSecurity.Admin.EntityFramework.Shared/LiteCharmsSecurity.Admin.EntityFramework.Shared.csproj", "src/LiteCharmsSecurity.Admin.EntityFramework.Shared/"]
 COPY ["src/LiteCharmsSecurity.Shared/LiteCharmsSecurity.Shared.csproj", "src/LiteCharmsSecurity.Shared/"]
 
-RUN dotnet restore -a $TARGETARCH "src/LiteCharmsSecurity.STS.Identity/LiteCharmsSecurity.STS.Identity.csproj" --source "https://nexus.khongisa.co.za/repository/nuget-group/index.json"
+RUN dotnet restore "src/LiteCharmsSecurity.STS.Identity/LiteCharmsSecurity.STS.Identity.csproj" --source "https://nexus.khongisa.co.za/repository/nuget-group/index.json"
 
 COPY . .
 WORKDIR "src/LiteCharmsSecurity.STS.Identity"
-RUN dotnet build -a $TARGETARCH "LiteCharmsSecurity.STS.Identity.csproj" -c Release -o /app/build
+RUN dotnet build "LiteCharmsSecurity.STS.Identity.csproj" -c Release -o /app/build
 
 FROM build AS publish
-RUN dotnet publish -a $TARGETARCH "LiteCharmsSecurity.STS.Identity.csproj" -c Release --no-restore -o /app/publish
+RUN dotnet publish "LiteCharmsSecurity.STS.Identity.csproj" -c Release --no-restore -o /app/publish
 
 FROM base AS final
 WORKDIR /app