diff --git a/ushahidi/Dockerfile b/ushahidi/Dockerfile
deleted file mode 100644
index e81d6c8..0000000
--- a/ushahidi/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-FROM php
-LABEL maintainer="Disassembler <disassembler@dasm.cz>"
-
-RUN \
- # Install runtime dependencies
- apk --no-cache add php7-curl php7-imap php7-mysqli php7-pdo_mysql
-
-RUN \
- # Download Ushahidi
- wget https://github.com/ushahidi/platform-client/releases/download/v3.12.3/ushahidi-platform-client-bundle-v3.12.3.tar.gz -O /tmp/ushahidi-platform-client-bundle.tar.gz \
- && wget https://github.com/ushahidi/platform/releases/download/v3.12.3/ushahidi-platform-bundle-v3.12.3.tar.gz -O /tmp/ushahidi-platform-bundle.tar.gz \
- && tar xzf /tmp/ushahidi-platform-client-bundle.tar.gz -C /srv \
- && mv /srv/ushahidi-platform-client-bundle-v3.12.3 /srv/ushahidi \
- && tar xzf /tmp/ushahidi-platform-bundle.tar.gz -C /srv/ushahidi \
- && mv /srv/ushahidi/ushahidi-platform-bundle-v3.12.3 /srv/ushahidi/platform \
- # Create OS user
- && addgroup -S -g 8014 ushahidi \
- && adduser -S -u 8014 -h /srv/ushahidi -s /bin/false -g ushahidi -G ushahidi ushahidi \
- && chown -R ushahidi:ushahidi /srv/ushahidi/platform/application/logs /srv/ushahidi/platform/application/cache /srv/ushahidi/platform/application/media/uploads \
- # Cleanup
- && rm -rf /tmp/ushahidi-platform-client-bundle.tar.gz /tmp/ushahidi-platform-bundle.tar.gz
-
-COPY docker/ /
-
-RUN \
- # Patch Previewers
- cd /srv/ushahidi \
- && patch -p0 <aura.patch
-
-VOLUME ["/srv/ushahidi/platform/application/media/uploads"]
-EXPOSE 8080
-
-CMD ["s6-svscan", "/etc/services.d"]
diff --git a/ushahidi/docker/etc/nginx/nginx.conf b/ushahidi/lxc/etc/nginx/nginx.conf
similarity index 100%
rename from ushahidi/docker/etc/nginx/nginx.conf
rename to ushahidi/lxc/etc/nginx/nginx.conf
diff --git a/ushahidi/docker/etc/php7/php-fpm.conf b/ushahidi/lxc/etc/php7/php-fpm.conf
similarity index 100%
rename from ushahidi/docker/etc/php7/php-fpm.conf
rename to ushahidi/lxc/etc/php7/php-fpm.conf
diff --git a/ushahidi/docker/etc/services.d/.s6-svscan/finish b/ushahidi/lxc/etc/services.d/.s6-svscan/finish
similarity index 100%
rename from ushahidi/docker/etc/services.d/.s6-svscan/finish
rename to ushahidi/lxc/etc/services.d/.s6-svscan/finish
diff --git a/ushahidi/docker/etc/services.d/nginx/run b/ushahidi/lxc/etc/services.d/nginx/run
similarity index 100%
rename from ushahidi/docker/etc/services.d/nginx/run
rename to ushahidi/lxc/etc/services.d/nginx/run
diff --git a/ushahidi/docker/etc/services.d/php-fpm/run b/ushahidi/lxc/etc/services.d/php-fpm/run
similarity index 100%
rename from ushahidi/docker/etc/services.d/php-fpm/run
rename to ushahidi/lxc/etc/services.d/php-fpm/run
diff --git a/ushahidi/docker/srv/ushahidi/aura.patch b/ushahidi/lxc/srv/ushahidi/aura.patch
similarity index 100%
rename from ushahidi/docker/srv/ushahidi/aura.patch
rename to ushahidi/lxc/srv/ushahidi/aura.patch
diff --git a/ushahidi/docker/srv/ushahidi/config.js b/ushahidi/lxc/srv/ushahidi/config.js
similarity index 100%
rename from ushahidi/docker/srv/ushahidi/config.js
rename to ushahidi/lxc/srv/ushahidi/config.js
diff --git a/ushahidi/docker/srv/ushahidi/locales/cs.json b/ushahidi/lxc/srv/ushahidi/locales/cs.json
similarity index 100%
rename from ushahidi/docker/srv/ushahidi/locales/cs.json
rename to ushahidi/lxc/srv/ushahidi/locales/cs.json
diff --git a/ushahidi/docker/srv/ushahidi/locales/languages.json b/ushahidi/lxc/srv/ushahidi/locales/languages.json
similarity index 100%
rename from ushahidi/docker/srv/ushahidi/locales/languages.json
rename to ushahidi/lxc/srv/ushahidi/locales/languages.json
diff --git a/ushahidi/docker/srv/ushahidi/platform/application/config/init.php b/ushahidi/lxc/srv/ushahidi/platform/application/config/init.php
similarity index 100%
rename from ushahidi/docker/srv/ushahidi/platform/application/config/init.php
rename to ushahidi/lxc/srv/ushahidi/platform/application/config/init.php
diff --git a/ushahidi/lxcfile b/ushahidi/lxcfile
new file mode 100644
index 0000000..2b6384c
--- /dev/null
+++ b/ushahidi/lxcfile
@@ -0,0 +1,38 @@
+IMAGE ushahidi
+LAYER shared/alpine
+LAYER shared/php
+LAYER ushahidi/ushahidi
+
+RUN EOF
+    # Install runtime dependencies
+    apk --no-cache add php7-curl php7-imap php7-mysqli php7-pdo_mysql
+
+    # Download Ushahidi
+    wget https://github.com/ushahidi/platform-client/releases/download/v3.12.3/ushahidi-platform-client-bundle-v3.12.3.tar.gz -O /tmp/ushahidi-platform-client-bundle.tar.gz
+    wget https://github.com/ushahidi/platform/releases/download/v3.12.3/ushahidi-platform-bundle-v3.12.3.tar.gz -O /tmp/ushahidi-platform-bundle.tar.gz
+    tar xzf /tmp/ushahidi-platform-client-bundle.tar.gz -C /srv
+    mv /srv/ushahidi-platform-client-bundle-v3.12.3 /srv/ushahidi
+    tar xzf /tmp/ushahidi-platform-bundle.tar.gz -C /srv/ushahidi
+    mv /srv/ushahidi/ushahidi-platform-bundle-v3.12.3 /srv/ushahidi/platform
+
+    # Create OS user
+    addgroup -S -g 8014 ushahidi
+    adduser -S -u 8014 -h /srv/ushahidi -s /bin/false -g ushahidi -G ushahidi ushahidi
+    chown -R ushahidi:ushahidi /srv/ushahidi/platform/application/logs /srv/ushahidi/platform/application/cache /srv/ushahidi/platform/application/media/uploads
+
+    # Cleanup
+    rm -rf /tmp/ushahidi-platform-client-bundle.tar.gz /tmp/ushahidi-platform-bundle.tar.gz
+EOF
+
+COPY lxc
+
+RUN EOF
+    # Patch Previewers
+    cd /srv/ushahidi
+    patch -p0 <aura.patch
+    rm aura.patch
+EOF
+
+MOUNT /srv/ushahidi/data srv/ushahidi/platform/application/media/uploads
+
+CMD /bin/s6-svscan /etc/services.d
diff --git a/ushahidi/build.sh b/ushahidi/setup.sh
similarity index 100%
rename from ushahidi/build.sh
rename to ushahidi/setup.sh
diff --git a/ushahidi/adminpwd.sql b/ushahidi/setup/adminpwd.sql
similarity index 100%
rename from ushahidi/adminpwd.sql
rename to ushahidi/setup/adminpwd.sql
diff --git a/ushahidi/createdb.sql b/ushahidi/setup/createdb.sql
similarity index 100%
rename from ushahidi/createdb.sql
rename to ushahidi/setup/createdb.sql
diff --git a/ushahidi/etc/init.d/ushahidi b/ushahidi/setup/etc/init.d/ushahidi
similarity index 100%
rename from ushahidi/etc/init.d/ushahidi
rename to ushahidi/setup/etc/init.d/ushahidi
diff --git a/ushahidi/etc/periodic/15min/ushahidi b/ushahidi/setup/etc/periodic/15min/ushahidi
similarity index 100%
rename from ushahidi/etc/periodic/15min/ushahidi
rename to ushahidi/setup/etc/periodic/15min/ushahidi
diff --git a/ushahidi/srv/ushahidi/conf/config.json b/ushahidi/setup/srv/ushahidi/conf/config.json
similarity index 100%
rename from ushahidi/srv/ushahidi/conf/config.json
rename to ushahidi/setup/srv/ushahidi/conf/config.json
diff --git a/ushahidi/srv/ushahidi/conf/env b/ushahidi/setup/srv/ushahidi/conf/env
similarity index 100%
rename from ushahidi/srv/ushahidi/conf/env
rename to ushahidi/setup/srv/ushahidi/conf/env