diff --git a/images/1/alpine/runtime/Dockerfile b/images/1/alpine/runtime/Dockerfile
index 43a2e16..bc99d25 100644
--- a/images/1/alpine/runtime/Dockerfile
+++ b/images/1/alpine/runtime/Dockerfile
@@ -3,5 +3,4 @@ FROM alpine:3.8
 RUN apk update && apk upgrade \
   && apk add ca-certificates \
   && rm -rf /var/cache/apk/*
-
 RUN addgroup -g 1000 -S fn && adduser -S -u 1000 -G fn fn
diff --git a/images/1/stretch/runtime/Dockerfile b/images/1/stretch/runtime/Dockerfile
index 791438a..01c12de 100644
--- a/images/1/stretch/runtime/Dockerfile
+++ b/images/1/stretch/runtime/Dockerfile
@@ -1,3 +1,4 @@
 FROM debian:stretch-slim
 
-RUN apt-get update && apt-get upgrade -qy
+RUN apt-get update && apt-get upgrade -qy && apt-get clean
+RUN addgroup --system --gid 1000 --system fn && adduser --system --uid 1000 --ingroup fn fn