diff --git a/Dockerfile b/Dockerfile
index aa7bdd4..e7c1d58 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,10 +13,12 @@ RUN \
  echo "**** install build packages ****" && \
  apk add --no-cache  \
 	curl \
+	memcached \
 	php7-ctype \
 	php7-dom \
 	php7-gd \
 	php7-mbstring \
+	php7-memcached \
 	php7-mysqlnd \
 	php7-openssl \
 	php7-pdo_mysql \
diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config
index f7993a0..2ec0c41 100644
--- a/root/etc/cont-init.d/50-config
+++ b/root/etc/cont-init.d/50-config
@@ -16,6 +16,8 @@ do
 [[ ! -L "$i" ]] && ln -s /config/www/"$(basename "$i")" "$i"
 done
 
+# .env file setup
+
 # Check for ADVANCED_MODE to be set. If set, copy sample env file to /config and then copy to /var/www/html.env so advanced users can make their own customisations
 #  If not set, runs in basic mode where .example.env is copied to /var/www/html/.env and seds are applied to set documented variables
 if [ "$ADVANCED_MODE" == 1 ];
@@ -45,6 +47,12 @@ if [ ! -z "$APP_URL" -a -z "$ADVANCED_MODE" ];
 	sed -i "s,#\sAPP_URL.*,APP_URL=${APP_URL},g" /var/www/html/.env
 fi
 
+# email=1 set? let's do some more work
+if [ ! -z "$USE_EMAIL" ];
+	then
+	echo "Setting up email vars"
+	sed i "s\"
+
 # Create API key if needed
 if [ ! -f "/config/BOOKSTACK_APP_KEY.txt" ]
 	then
diff --git a/root/etc/services.d/memcached/run b/root/etc/services.d/memcached/run
new file mode 100644
index 0000000..a42215d
--- /dev/null
+++ b/root/etc/services.d/memcached/run
@@ -0,0 +1,2 @@
+#!/usr/bin/with-contenv bash
+exec memcache memcached