diff --git a/grafana/Dockerfile b/grafana/Dockerfile
index 2e80509..4b187b3 100644
--- a/grafana/Dockerfile
+++ b/grafana/Dockerfile
@@ -5,12 +5,16 @@
 FROM debian:jessie
 MAINTAINER kev <noreply@datageek.info>
 
+ENV GRAFANA_VER 2.5.0
+ENV GRAFANA_FILE grafana_${GRAFANA_VER}_amd64.deb
+ENV GRAFANA_URL https://grafanarel.s3.amazonaws.com/builds/${GRAFANA_FILE}
+
 RUN apt-get update \
     && apt-get install -y libfontconfig wget \
-    && wget https://grafanarel.s3.amazonaws.com/builds/grafana_2.1.1_amd64.deb \
-    && dpkg -i grafana_2.1.1_amd64.deb \
+    && wget ${GRAFANA_URL} \
+    && dpkg -i ${GRAFANA_FILE} \
     && apt-get purge --auto-remove -y wget \
-    && rm -rf grafana_2.1.1_amd64.deb \
+    && rm -rf ${GRAFANA_FILE} \
               /var/lib/apt/lists/*
 
 ENV GRAFANA_HOME=/usr/share/grafana
diff --git a/l2tpd/Dockerfile b/l2tpd/Dockerfile
index a84b1ea..2def8a7 100644
--- a/l2tpd/Dockerfile
+++ b/l2tpd/Dockerfile
@@ -23,6 +23,6 @@ EXPOSE 500/udp 1701/udp 4500/udp
 
 CMD iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE \
     && ipsec _stackmanager start \
-    && ipsec pluto --config /etc/ipsec.conf \
+    && ipsec pluto \
     && xl2tpd -D