diff --git a/Dockerfile b/Dockerfile
index f750a93..4cd9a13 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,11 @@
-FROM alpine
+FROM alpine AS jekyll
+
+###
+# Environment variables
+###
+
+ENV UNIFI_SITE=default
+ENV UNIFI_VERSION=5.13.32
 
 ###
 # Jekyll
@@ -7,8 +14,10 @@ FROM alpine
 # Install Jekyll dependencies
 RUN apk add --no-cache build-base libxml2-dev libxslt-dev ruby-full ruby-dev gcc linux-headers
 
-# Copy Jekyll files
+# Create www user
 RUN adduser -D -u 1000 -h /tmp/www www
+
+# Copy Jekyll files
 COPY --chown=www:www jekyll /tmp/jekyll
 WORKDIR /tmp/jekyll
 
@@ -28,6 +37,8 @@ RUN mv _site /opt/www/
 # Remove Jekyll dependencies
 RUN apk del build-base libxml2-dev libxslt-dev ruby-full ruby-dev gcc linux-headers
 
+FROM alpine
+
 ###
 # PHP
 ###
@@ -35,6 +46,9 @@ RUN apk del build-base libxml2-dev libxslt-dev ruby-full ruby-dev gcc linux-head
 # Install PHP dependencies
 RUN apk add --no-cache php-fpm php-curl php-json php-session composer
 
+# Create www user
+RUN adduser -D -u 1000 -h /tmp/www www
+
 # Set up PHP-FPM
 COPY php-install.sh /
 RUN chmod +x /php-install.sh; /bin/sh /php-install.sh; rm /php-install.sh
@@ -63,5 +77,7 @@ RUN mkdir /run/nginx
 RUN sed -i 's/cgi.fix_pathinfo= 0/cgi.fix_pathinfo=1/g' /etc/php7/php.ini
 ONBUILD RUN chown www:www /opt/www/ -R
 
+COPY --chown=1000 --from=jekyll /opt/www/ /opt/www/
+
 EXPOSE 80
 CMD php-fpm7 && nginx; tail -F /var/log/nginx/error.log
\ No newline at end of file