diff --git a/build/Build.cs b/build/Build.cs
index b4e20527..2dd8e7a3 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -114,21 +114,23 @@ public sealed class Build : NukeBuild
         .DependsOn(Publish)
         .Executes(() =>
         {
+            var gatewayProject = "Inc.TeamAssistant.Gateway";
             DockerBuild(x => x
                 .DisableProcessLogOutput()
                 .SetProcessWorkingDirectory(RootDirectory)
                 .SetPath(".")
                 .SetFile("cicd/dockerfile.app_component")
-                .SetBuildArg("PROJECT=Inc.TeamAssistant.Gateway")
-                .SetTag(GetImageName("inc.teamassistant.gateway")));
+                .SetBuildArg($"PROJECT={gatewayProject}")
+                .SetTag(GetImageName(gatewayProject.ToLowerInvariant())));
 
+            var migrationsProject = "Inc.TeamAssistant.MigrationsRunner";
             DockerBuild(x => x
                 .DisableProcessLogOutput()
                 .SetProcessWorkingDirectory(RootDirectory)
                 .SetPath(".")
                 .SetFile("cicd/dockerfile.migrations_runner")
-                .SetBuildArg("PROJECT=Inc.TeamAssistant.MigrationsRunner")
-                .SetTag(GetImageName("inc.teamassistant.migrationsrunner")));
+                .SetBuildArg($"PROJECT={migrationsProject}")
+                .SetTag(GetImageName(migrationsProject.ToLowerInvariant())));
         });
 
     private Target PushImages => _ => _
diff --git a/cicd/dockerfile.migrations_runner b/cicd/dockerfile.migrations_runner
index 1f969c80..f7760ca4 100644
--- a/cicd/dockerfile.migrations_runner
+++ b/cicd/dockerfile.migrations_runner
@@ -24,4 +24,4 @@ RUN rm -f *.sh \
 # Run app as non root user
 USER ${APP_USER}
 
-ENTRYPOINT dotnet ${APP_DLL}
\ No newline at end of file
+ENTRYPOINT ["dotnet", ${APP_DLL}]
\ No newline at end of file