diff --git a/src/Api/Dockerfile b/src/Api/Dockerfile
index 2e77b62199..95f4010c16 100644
--- a/src/Api/Dockerfile
+++ b/src/Api/Dockerfile
@@ -1,23 +1,4 @@
-FROM microsoft/dotnet:2.0.0-runtime-jessie
-
-# FROM https://github.com/aspnet/aspnet-docker/blob/master/1.1/jessie/runtime/Dockerfile
-
-# set up network
-ENV ASPNETCORE_URLS http://+:80
-
-# set env var for packages cache
-ENV DOTNET_HOSTING_OPTIMIZATION_CACHE /packagescache
-
-# set up package cache and other tools
-RUN for version in '1.1.2' '1.1.3'; do \
-        curl -o /tmp/aspnetcore.cache.$version.tar.gz \
-            https://dist.asp.net/packagecache/$version/debian.8-x64/aspnetcore.cache.tar.gz \
-        && mkdir -p /packagescache && cd /packagescache \
-        && tar xf /tmp/aspnetcore.cache.$version.tar.gz \
-        && rm /tmp/aspnetcore.cache.$version.tar.gz; \
-done
-
-# Custom
+FROM microsoft/aspnetcore:2.0.0
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
diff --git a/src/Identity/Dockerfile b/src/Identity/Dockerfile
index 5ecf995163..66c96c6132 100644
--- a/src/Identity/Dockerfile
+++ b/src/Identity/Dockerfile
@@ -1,23 +1,4 @@
-FROM microsoft/dotnet:2.0.0-runtime-jessie
-
-# FROM https://github.com/aspnet/aspnet-docker/blob/master/1.1/jessie/runtime/Dockerfile
-
-# set up network
-ENV ASPNETCORE_URLS http://+:80
-
-# set env var for packages cache
-ENV DOTNET_HOSTING_OPTIMIZATION_CACHE /packagescache
-
-# set up package cache and other tools
-RUN for version in '1.1.2' '1.1.3'; do \
-        curl -o /tmp/aspnetcore.cache.$version.tar.gz \
-            https://dist.asp.net/packagecache/$version/debian.8-x64/aspnetcore.cache.tar.gz \
-        && mkdir -p /packagescache && cd /packagescache \
-        && tar xf /tmp/aspnetcore.cache.$version.tar.gz \
-        && rm /tmp/aspnetcore.cache.$version.tar.gz; \
-done
-
-# Custom
+FROM microsoft/aspnetcore:2.0.0
 
 WORKDIR /app
 EXPOSE 80