diff --git a/ggr/Dockerfile b/ggr/Dockerfile
index 40f1503..5cdb6bd 100644
--- a/ggr/Dockerfile
+++ b/ggr/Dockerfile
@@ -2,16 +2,20 @@
 # Dockerfile for ggr
 #
 
-FROM golang:alpine
-RUN apk add --no-cache git
-RUN go get -v github.com/kelseyhightower/confd
-
 FROM aerokube/ggr
-RUN apk add --no-cache curl libxml2-utils supervisor
-COPY --from=0 /go/bin/confd /usr/bin/
+MAINTAINER EasyPi Software Foundation
+
+RUN set -xe \
+    && apk add --no-cache curl libxml2-utils supervisor \
+    && curl -sSL -o /usr/bin/confd https://github.com/kelseyhightower/confd/releases/download/v0.16.0/confd-0.16.0-linux-amd64 \
+    && chmod +x /usr/bin/confd
+
 COPY data/confd /etc/confd
 COPY data/supervisor.d /etc/supervisor.d
 COPY data/grid-router /etc/grid-router
+
 EXPOSE 4444
+
 ENTRYPOINT ["supervisord", "-n", "-c", "/etc/supervisord.conf"]
+
 HEALTHCHECK CMD ["curl", "-f", "http://127.0.0.1:4444/ping"]