diff --git a/dokuwiki/Dockerfile b/dokuwiki/Dockerfile
index 67aa6d8..97187c6 100644
--- a/dokuwiki/Dockerfile
+++ b/dokuwiki/Dockerfile
@@ -2,25 +2,25 @@
 # Dockerfile for dokuwiki
 #
 
-FROM alpine
-MAINTAINER kev <noreply@easypi.pro>
+FROM alpine:3
+MAINTAINER EasyPi Software Foundation
 
 WORKDIR /var/www/html
 
 RUN set -xe \
-    && apk add --no-cache ca-certificates \
-                          gzip \
-                          nginx \
-                          openssl \
-                          php5-fpm \
-                          php5-json \
-                          php5-openssl \
-                          php5-pdo_sqlite \
-                          php5-sqlite3 \
-                          php5-xml \
-                          php5-zlib \
-                          tar \
-    && touch /etc/php5/fpm.d/empty.conf \
+    && apk add --no-cache \
+        ca-certificates \
+        gzip \
+        nginx \
+        openssl \
+        php7-fpm \
+        php7-json \
+        php7-openssl \
+        php7-pdo_sqlite \
+        php7-sqlite3 \
+        php7-xml \
+        php7-zlib \
+        tar \
     && wget -O- http://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz | tar xz --strip 1 \
     && chown -R nobody:nobody .
 
@@ -37,4 +37,4 @@ VOLUME /var/www/html/conf \
 
 EXPOSE 80
 
-CMD php-fpm5 && nginx -g 'daemon off;'
+CMD php-fpm7 && nginx -g 'daemon off;'
diff --git a/dokuwiki/README.md b/dokuwiki/README.md
index f6a8ce8..3757b53 100644
--- a/dokuwiki/README.md
+++ b/dokuwiki/README.md
@@ -7,19 +7,19 @@ dokuwiki
 
 ## Run
 
-```
+```bash
 $ docker run -d -p 8000:80 --restart always --name dokuwiki vimagick/dokuwiki
 ```
 
 ## Backup
 
-```
+```bash
 $ docker run --rm --volumes-from dokuwiki -v `pwd`:/backup alpine tar czf /backup/dw-backup.tgz /var/www/html
 ```
 
 ## Restore
 
-```
+```bash
 $ docker run --rm --volumes-from dokuwiki -v `pwd`:/backup alpine tar xzf /backup/dw-backup.tgz
 ```
 
@@ -33,7 +33,7 @@ You can install [plugins][2] via **Extension Manager**.
 
 You can also install them manually.
 
-```
+```bash
 $ docker exec -it dokuwiki sh
 >>> cd /var/www/html/lib/plugins/
 >>> mkdir backup emoji wrap
diff --git a/dokuwiki/arm/Dockerfile b/dokuwiki/arm/Dockerfile
index 1f7c143..add4f10 100644
--- a/dokuwiki/arm/Dockerfile
+++ b/dokuwiki/arm/Dockerfile
@@ -8,18 +8,19 @@ MAINTAINER EasyPi Software Foundation
 WORKDIR /var/www/html
 
 RUN set -xe \
-    && apk add --no-cache ca-certificates \
-                          gzip \
-                          nginx \
-                          openssl \
-                          php5-fpm \
-                          php5-openssl \
-                          php5-pdo_sqlite \
-                          php5-sqlite3 \
-                          php5-xml \
-                          php5-zlib \
-                          tar \
-    && touch /etc/php5/fpm.d/empty.conf \
+    && apk add --no-cache \
+        ca-certificates \
+        gzip \
+        nginx \
+        openssl \
+        php7-fpm \
+        php7-json \
+        php7-openssl \
+        php7-pdo_sqlite \
+        php7-sqlite3 \
+        php7-xml \
+        php7-zlib \
+        tar \
     && wget -O- http://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz | tar xz --strip 1 \
     && chown -R nobody:nobody .
 
diff --git a/freegeoip/Dockerfile b/freegeoip/Dockerfile
index bd84ab7..99ef2e8 100644
--- a/freegeoip/Dockerfile
+++ b/freegeoip/Dockerfile
@@ -5,9 +5,9 @@
 FROM alpine
 MAINTAINER EasyPi Software Foundation
 
-ENV FREEGEOIP_VERSION 3.4.1
-ENV FREEGEOIP_FILE freegeoip-${FREEGEOIP_VERSION}-linux-amd64.tar.gz
-ENV FREEGEOIP_URL https://github.com/fiorix/freegeoip/releases/download/v${FREEGEOIP_VERSION}/${FREEGEOIP_FILE}
+ENV FREEGEOIP_VERSION=3.4.1
+ENV FREEGEOIP_FILE=freegeoip-${FREEGEOIP_VERSION}-linux-amd64.tar.gz
+ENV FREEGEOIP_URL=https://github.com/fiorix/freegeoip/releases/download/v${FREEGEOIP_VERSION}/${FREEGEOIP_FILE}
 
 WORKDIR /opt/freegeoip
 
@@ -16,7 +16,9 @@ RUN set -xe \
     && curl -sSL ${FREEGEOIP_URL} | tar xz --strip 1 \
     && apk del curl tar
 
+COPY data/GeoLite2-City.mmdb.gz /opt/freegeoip/data/
+
 EXPOSE 8080 8888
 
 ENTRYPOINT ["./freegeoip"]
-CMD ["-public", "public", "-http", ":8080", "-internal-server", ":8888"]
+CMD ["-public", "public", "-http", ":8080", "-internal-server", ":8888", "-db", "data/GeoLite2-City.mmdb.gz"]
diff --git a/freegeoip/data/GeoLite2-City.mmdb.gz b/freegeoip/data/GeoLite2-City.mmdb.gz
new file mode 100644
index 0000000..fe45449
Binary files /dev/null and b/freegeoip/data/GeoLite2-City.mmdb.gz differ
diff --git a/freegeoip/freegeoip.service b/freegeoip/freegeoip.service
index 944042c..75cd88b 100644
--- a/freegeoip/freegeoip.service
+++ b/freegeoip/freegeoip.service
@@ -4,7 +4,7 @@ After=network-online.target
 
 [Service]
 WorkingDirectory=/opt/freegeoip
-ExecStart=/opt/freegeoip/freegeoip -public public -http :8080 -internal-server :8888
+ExecStart=/opt/freegeoip/freegeoip -public public -http :8080 -internal-server :8888 -db data/GeoLite2-City.mmdb.gz
 Restart=always
 RestartSec=5