diff --git a/docker-compose.yml b/docker-compose.yml
index 39a0217be..122123644 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -109,25 +109,25 @@ services:
     image: rabbitmq:3-management-alpine
 
   mobileshoppingapigw:
-    image: eshop/ocelotapigw-ms:${TAG:-latest}
+    image: eshop/ocelotapigw:${TAG:-latest}
     build:
       context: .
       dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
  
   mobilemarketingapigw:
-    image: eshop/ocelotapigw-mm:${TAG:-latest}
+    image: eshop/ocelotapigw:${TAG:-latest}
     build:
       context: .
-      dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile2
+      dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
  
   webshoppingapigw:
-    image: eshop/ocelotapigw-ws:${TAG:-latest}
+    image: eshop/ocelotapigw:${TAG:-latest}
     build:
       context: .
-      dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile3
+      dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
 
   webmarketingapigw:
-    image: eshop/ocelotapigw-wm:${TAG:-latest}
+    image: eshop/ocelotapigw:${TAG:-latest}
     build:
       context: .
       dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
diff --git a/src/ApiGateways/ApiGw-Base/Dockerfile2 b/src/ApiGateways/ApiGw-Base/Dockerfile2
deleted file mode 100644
index 7f0cf43a6..000000000
--- a/src/ApiGateways/ApiGw-Base/Dockerfile2
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM microsoft/aspnetcore:2.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM microsoft/aspnetcore-build:2.0 AS build
-WORKDIR /src
-COPY src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj src/ApiGateways/ApiGw-Base/
-RUN dotnet restore src/ApiGateways/ApiGw-Base/
-COPY . .
-WORKDIR /src/src/ApiGateways/ApiGw-Base/
-RUN dotnet build -c Release -o /app
-
-FROM build AS publish
-RUN dotnet publish -c Release -o /app
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app .
-ENTRYPOINT ["dotnet", "OcelotApiGw.dll"]
diff --git a/src/ApiGateways/ApiGw-Base/Dockerfile3 b/src/ApiGateways/ApiGw-Base/Dockerfile3
deleted file mode 100644
index 7f0cf43a6..000000000
--- a/src/ApiGateways/ApiGw-Base/Dockerfile3
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM microsoft/aspnetcore:2.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM microsoft/aspnetcore-build:2.0 AS build
-WORKDIR /src
-COPY src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj src/ApiGateways/ApiGw-Base/
-RUN dotnet restore src/ApiGateways/ApiGw-Base/
-COPY . .
-WORKDIR /src/src/ApiGateways/ApiGw-Base/
-RUN dotnet build -c Release -o /app
-
-FROM build AS publish
-RUN dotnet publish -c Release -o /app
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app .
-ENTRYPOINT ["dotnet", "OcelotApiGw.dll"]
diff --git a/src/ApiGateways/ApiGw-Base/Dockerfile4 b/src/ApiGateways/ApiGw-Base/Dockerfile4
deleted file mode 100644
index 7f0cf43a6..000000000
--- a/src/ApiGateways/ApiGw-Base/Dockerfile4
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM microsoft/aspnetcore:2.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM microsoft/aspnetcore-build:2.0 AS build
-WORKDIR /src
-COPY src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj src/ApiGateways/ApiGw-Base/
-RUN dotnet restore src/ApiGateways/ApiGw-Base/
-COPY . .
-WORKDIR /src/src/ApiGateways/ApiGw-Base/
-RUN dotnet build -c Release -o /app
-
-FROM build AS publish
-RUN dotnet publish -c Release -o /app
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app .
-ENTRYPOINT ["dotnet", "OcelotApiGw.dll"]