diff --git a/src/ServiceControl.DockerImages/ServiceControl.DockerImages.csproj b/src/ServiceControl.DockerImages/ServiceControl.DockerImages.csproj
index a457e8186f..216288f8ce 100644
--- a/src/ServiceControl.DockerImages/ServiceControl.DockerImages.csproj
+++ b/src/ServiceControl.DockerImages/ServiceControl.DockerImages.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-  	<!-- Location used by release CI to push each docker image to docker hub -->
+    <!-- Location used by release CI to push each docker image to docker hub -->
     <DockerfilesFolder>..\..\dockerfiles\</DockerfilesFolder>
   </PropertyGroup>
 
@@ -75,8 +75,11 @@
   </ItemGroup>
 
   <Target Name="CleanGeneratedDockerfiles" AfterTargets="Build">
-    <RemoveDir Directories="$(DockerfilesFolder)" />
-    <MakeDir Directories="$(DockerfilesFolder)" />
+    <ItemGroup>
+      <Dockerfiles Include="$(DockerfilesFolder)*.dockerfile" />
+    </ItemGroup>
+
+    <Delete Files="@(Dockerfiles)" />
   </Target>
 
   <Target Name="ExpandDockerfileTemplates" AfterTargets="CleanGeneratedDockerfiles">
@@ -91,11 +94,9 @@
     <!-- monitoring instance and sidecar dockerfiles -->
     <Copy SourceFiles="servicecontrol.transport.monitoring.init-windows.dockerfile-template" DestinationFiles="$(DockerfilesFolder)servicecontrol.%(SupportedTransport.DockerfileCustomization).monitoring.init-windows.dockerfile" />
     <Copy SourceFiles="servicecontrol.transport.monitoring-windows.dockerfile-template" DestinationFiles="$(DockerfilesFolder)servicecontrol.%(SupportedTransport.DockerfileCustomization).monitoring-windows.dockerfile" />
-
   </Target>
 
   <Target Name="PrepareDockerBuildContent" AfterTargets="ExpandDockerfileTemplates">
-
     <ItemGroup>
       <DeployErrorFiles Include="..\..\deploy\Particular.ServiceControl\**\*.*" Exclude="**\Transports\**" />
       <DeployAuditFiles Include="..\..\deploy\Particular.ServiceControl.Audit\**\*.*" Exclude="**\Transports\**" />
@@ -107,7 +108,6 @@
     <Copy SourceFiles="@(DeployAuditFiles)" DestinationFolder="$(OutputPath)\docker\Particular.ServiceControl.Audit\%(RecursiveDir)" SkipUnchangedFiles="true" />
     <Copy SourceFiles="@(DeployMonitoringFiles)" DestinationFolder="$(OutputPath)\docker\Particular.ServiceControl.Monitoring\%(RecursiveDir)" SkipUnchangedFiles="true" />
     <Copy SourceFiles="@(DeployTransportFiles)" DestinationFolder="$(OutputPath)\docker\Transports\%(RecursiveDir)" SkipUnchangedFiles="true" />
-
   </Target>
 
   <Target Name="BuildDockerImages" AfterTargets="PrepareDockerBuildContent">
@@ -124,7 +124,6 @@
     <Exec Command="docker build -f $(DockerfilesFolder)servicecontrol.%(SupportedTransport.DockerfileCustomization).monitoring-windows.dockerfile -t particular/servicecontrol.%(SupportedTransport.DockerfileCustomization).monitoring-windows:$(MinVerVersion) --build-arg TRANSPORT=%(SupportedTransport.TransportName) --build-arg TRANSPORT_CUSTOMIZATION_TYPE=%(SupportedTransport.TransportCustomizationType) $(OutputPath)/docker" />
 
     <!-- Tag as "dev" for easier local testing of containers -->
-
     <Exec Command="docker tag particular/servicecontrol.%(SupportedTransport.DockerfileCustomization).init-windows:$(MinVerVersion) particular/servicecontrol.%(SupportedTransport.DockerfileCustomization).init-windows:dev" />
     <Exec Command="docker tag particular/servicecontrol.%(SupportedTransport.DockerfileCustomization)-windows:$(MinVerVersion) particular/servicecontrol.%(SupportedTransport.DockerfileCustomization)-windows:dev" />