diff --git a/cmd/loki/Dockerfile b/cmd/loki/Dockerfile
index 3054e3dfde3be..0f822e44d6dd4 100644
--- a/cmd/loki/Dockerfile
+++ b/cmd/loki/Dockerfile
@@ -7,21 +7,22 @@ WORKDIR /src/loki
 RUN make clean && (if [ "${TOUCH_PROTOS}" ]; then make touch-protos; fi) && make BUILD_IN_CONTAINER=false loki
 
 FROM alpine:3.9
-RUN apk add --update --no-cache ca-certificates libcap \
-    && rm -rf /var/cache/apk/*
+
+RUN apk add --no-cache ca-certificates libcap
 
 COPY --from=build /src/loki/cmd/loki/loki /usr/bin/loki
 COPY cmd/loki/loki-local-config.yaml /etc/loki/local-config.yaml
 
 RUN setcap cap_net_bind_service=+ep /usr/bin/loki
 
-RUN apk del --no-cache libcap && rm -rf /var/cache/apk/*
-
-RUN addgroup -g 1000 -S loki && \
-    adduser -u 1000 -S loki -G loki
+RUN addgroup -g 10001 -S loki && \
+    adduser -u 10001 -S loki -G loki
 RUN mkdir -p /loki && \
     chown -R loki:loki /etc/loki /loki
 
+# See https://github.com/grafana/loki/issues/1928
+RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
+
 USER loki
 EXPOSE 3100
 ENTRYPOINT [ "/usr/bin/loki" ]
diff --git a/cmd/loki/Dockerfile.cross b/cmd/loki/Dockerfile.cross
index cef4419dcd913..87ab48cd57018 100644
--- a/cmd/loki/Dockerfile.cross
+++ b/cmd/loki/Dockerfile.cross
@@ -13,9 +13,21 @@ WORKDIR /src/loki
 RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false loki
 
 FROM alpine:3.9
-RUN apk add --update --no-cache ca-certificates
+
+RUN apk add --no-cache ca-certificates
+
 COPY --from=build /src/loki/cmd/loki/loki /usr/bin/loki
 COPY cmd/loki/loki-local-config.yaml /etc/loki/local-config.yaml
-EXPOSE 80
+
+RUN addgroup -g 10001 -S loki && \
+    adduser -u 10001 -S loki -G loki
+RUN mkdir -p /loki && \
+    chown -R loki:loki /etc/loki /loki
+
+# See https://github.com/grafana/loki/issues/1928
+RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
+
+USER loki
+EXPOSE 3100
 ENTRYPOINT [ "/usr/bin/loki" ]
 CMD ["-config.file=/etc/loki/local-config.yaml"]