diff --git a/mifosx/Dockerfile b/mifosx/Dockerfile
deleted file mode 100644
index 0d7f10e..0000000
--- a/mifosx/Dockerfile
+++ /dev/null
@@ -1,36 +0,0 @@
-FROM tomcat
-LABEL maintainer="Disassembler <disassembler@dasm.cz>"
-
-RUN \
- # Install full-featured wget to work around sourceforge bugs
- apk --no-cache add wget \
- # Download Mifos X
- && wget https://sourceforge.net/projects/mifos/files/latest/download -O /tmp/mifosx.zip \
- && mkdir /srv/tomcat/webapps/fineract-provider \
- && unzip /tmp/mifosx.zip -d /tmp \
- && unzip /tmp/fineractplatform-18.03.01.RELEASE/fineract-provider.war -d /srv/tomcat/webapps/fineract-provider \
- && mv /tmp/fineractplatform-18.03.01.RELEASE/apps/community-app /srv/tomcat/webapps/ROOT \
- && mv /tmp/fineractplatform-18.03.01.RELEASE/database/mifospltaform-tenants-first-time-install.sql /tmp/mifospltaform-tenants-first-time-install.sql \
- # Download Java library dependencies
- && wget http://central.maven.org/maven2/org/drizzle/jdbc/drizzle-jdbc/1.3/drizzle-jdbc-1.3.jar -O /srv/tomcat/lib/drizzle-jdbc-1.3.jar \
- # Create OS user
- && addgroup -S -g 8012 mifosx \
- && adduser -S -u 8012 -h /srv/tomcat -s /bin/false -g mifosx -G mifosx mifosx \
- && chown -R mifosx:mifosx /srv/tomcat/conf /srv/tomcat/logs /srv/tomcat/temp /srv/tomcat/webapps /srv/tomcat/work \
- # Cleanup
- && apk --no-cache del wget \
- && rm -rf /tmp/fineractplatform-18.03.01.RELEASE /tmp/mifosx.zip
-
-COPY docker/tmp/ /tmp/
-
-RUN \
- # Update Czech translation of community-app
- wget 'https://translatewiki.net/wiki/Special:ExportTranslations?group=out-mifos&language=cs&format=export-to-file' -O /srv/tomcat/webapps/ROOT/global-translations/locale-cs.json \
- && cd /srv/tomcat/webapps/ROOT/scripts/ \
- && patch -p0 </tmp/locale-cs.patch
-
-EXPOSE 8080
-
-USER mifosx
-WORKDIR /srv/tomcat
-CMD ["catalina.sh", "run"]
diff --git a/mifosx/docker/tmp/locale-cs.patch b/mifosx/lxc/tmp/locale-cs.patch
similarity index 100%
rename from mifosx/docker/tmp/locale-cs.patch
rename to mifosx/lxc/tmp/locale-cs.patch
diff --git a/mifosx/lxcfile b/mifosx/lxcfile
new file mode 100644
index 0000000..ff4a0db
--- /dev/null
+++ b/mifosx/lxcfile
@@ -0,0 +1,44 @@
+IMAGE mifosx
+LAYER shared/alpine
+LAYER shared/java
+LAYER shared/tomcat
+LAYER mifosx/mifosx
+
+COPY lxc
+
+RUN EOF
+    # Install full-featured wget to work around sourceforge bugs
+    apk --no-cache add wget
+
+    # Download Mifos X
+    wget https://sourceforge.net/projects/mifos/files/latest/download -O /tmp/mifosx.zip
+    mkdir /srv/tomcat/webapps/fineract-provider
+    unzip /tmp/mifosx.zip -d /tmp
+    unzip /tmp/fineractplatform-18.03.01.RELEASE/fineract-provider.war -d /srv/tomcat/webapps/fineract-provider
+    mv /tmp/fineractplatform-18.03.01.RELEASE/apps/community-app /srv/tomcat/webapps/ROOT
+    mv /tmp/fineractplatform-18.03.01.RELEASE/database/mifospltaform-tenants-first-time-install.sql /tmp/mifospltaform-tenants-first-time-install.sql
+
+    # Download Java library dependencies
+    wget http://central.maven.org/maven2/org/drizzle/jdbc/drizzle-jdbc/1.3/drizzle-jdbc-1.3.jar -O /srv/tomcat/lib/drizzle-jdbc-1.3.jar
+
+    # Create OS user
+    addgroup -S -g 8012 mifosx
+    adduser -S -u 8012 -h /srv/tomcat -s /bin/false -g mifosx -G mifosx mifosx
+    chown -R mifosx:mifosx /srv/tomcat/conf /srv/tomcat/logs /srv/tomcat/temp /srv/tomcat/webapps /srv/tomcat/work
+    
+    # Cleanup
+    apk --no-cache del wget
+    rm -rf /tmp/fineractplatform-18.03.01.RELEASE /tmp/mifosx.zip
+
+    # Update Czech translation of community-app
+    wget 'https://translatewiki.net/wiki/Special:ExportTranslations?group=out-mifos&language=cs&format=export-to-file' -O /srv/tomcat/webapps/ROOT/global-translations/locale-cs.json
+    cd /srv/tomcat/webapps/ROOT/scripts/
+
+    # Apply translation patch
+    patch -p0 </tmp/locale-cs.patch
+    rm /tmp/locale-cs.patch
+EOF
+
+USER 8012 8012
+WORKDIR /srv/tomcat
+CMD /usr/bin/catalina.sh run
diff --git a/mifosx/build.sh b/mifosx/setup.sh
similarity index 100%
rename from mifosx/build.sh
rename to mifosx/setup.sh
diff --git a/mifosx/adminpwd.sql b/mifosx/setup/adminpwd.sql
similarity index 100%
rename from mifosx/adminpwd.sql
rename to mifosx/setup/adminpwd.sql
diff --git a/mifosx/createdb.sql b/mifosx/setup/createdb.sql
similarity index 100%
rename from mifosx/createdb.sql
rename to mifosx/setup/createdb.sql
diff --git a/mifosx/etc/init.d/mifosx b/mifosx/setup/etc/init.d/mifosx
similarity index 100%
rename from mifosx/etc/init.d/mifosx
rename to mifosx/setup/etc/init.d/mifosx
diff --git a/mifosx/schemapwd.sql b/mifosx/setup/schemapwd.sql
similarity index 100%
rename from mifosx/schemapwd.sql
rename to mifosx/setup/schemapwd.sql
diff --git a/mifosx/srv/mifosx/conf/context.xml b/mifosx/setup/srv/mifosx/conf/context.xml
similarity index 100%
rename from mifosx/srv/mifosx/conf/context.xml
rename to mifosx/setup/srv/mifosx/conf/context.xml
diff --git a/mifosx/srv/mifosx/conf/server.xml b/mifosx/setup/srv/mifosx/conf/server.xml
similarity index 100%
rename from mifosx/srv/mifosx/conf/server.xml
rename to mifosx/setup/srv/mifosx/conf/server.xml
diff --git a/mifosx/srv/mifosx/update-url.sh b/mifosx/setup/srv/mifosx/update-url.sh
similarity index 100%
rename from mifosx/srv/mifosx/update-url.sh
rename to mifosx/setup/srv/mifosx/update-url.sh