diff --git a/images/haproxy/Dockerfile b/images/haproxy/Dockerfile
index f220cda96..a282d3cdc 100644
--- a/images/haproxy/Dockerfile
+++ b/images/haproxy/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-FROM gcr.io/google_containers/debian-slim:0.1
+FROM gcr.io/google_containers/ubuntu-slim:0.1
 MAINTAINER Prashanth B <beeps@google.com>
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/images/nginx-slim/Dockerfile b/images/nginx-slim/Dockerfile
index 335ad0f7b..95a453c54 100644
--- a/images/nginx-slim/Dockerfile
+++ b/images/nginx-slim/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-FROM gcr.io/google_containers/debian-slim:0.1
+FROM gcr.io/google_containers/ubuntu-slim:0.1
 
 COPY build.sh /tmp
 
diff --git a/images/nginx-slim/build.sh b/images/nginx-slim/build.sh
index 0acd2cc70..e50b3064a 100755
--- a/images/nginx-slim/build.sh
+++ b/images/nginx-slim/build.sh
@@ -62,7 +62,7 @@ apt-get update && apt-get install --no-install-recommends -y \
   luajit \
   openssl \
   libluajit-5.1-dev \
-  linux-headers-amd64
+  linux-headers-generic
 
 # download, verify and extract the source files
 get_src 1af2eb956910ed4b11aaf525a81bc37e135907e7127948f9179f5410337da042 \
@@ -162,13 +162,16 @@ apt-mark unmarkauto \
 
 apt-get remove -y --purge \
   build-essential \
+  gcc-5 \
+  cpp-5 \
   libgeoip-dev \
   libpcre3-dev \
   libssl-dev \
   zlib1g-dev \
   libaio-dev \
   libluajit-5.1-dev \
-  linux-headers-amd64
+  linux-libc-dev \
+  linux-headers-generic
 
 apt-get autoremove -y
 
diff --git a/images/nginx-slim/rc.yaml b/images/nginx-slim/rc.yaml
index 839fbd9ba..d645ae9bf 100644
--- a/images/nginx-slim/rc.yaml
+++ b/images/nginx-slim/rc.yaml
@@ -29,6 +29,6 @@ spec:
     spec:
       containers:
       - name: nginxslim
-        image: gcr.io/google_containers/nginx-slim:0.3
+        image: gcr.io/google_containers/nginx-slim:0.4
         ports:
         - containerPort: 80