diff --git a/build/build-all.sh b/build/build-all.sh
index 1ade7ad..8390e31 100755
--- a/build/build-all.sh
+++ b/build/build-all.sh
@@ -12,23 +12,11 @@ cd ${ROOT}/vm
 tar czpf /srv/build/vm.tar.gz *
 
 # Build native apps
-cd ${ROOT}/apk/geos
-apk add -U swig python2-dev
-abuild -F
-
-cd ${ROOT}/apk/gdal
-apk add -U curl-dev geos-dev@vm giflib-dev jpeg-dev libjpeg-turbo-dev libpng-dev linux-headers postgresql-dev python2-dev sqlite-dev swig tiff-dev zlib-dev
-abuild -F
-
-cd ${ROOT}/apk/proj4
-abuild -F
-
 cd ${ROOT}/apk/rabbitmq-server
 apk add -U elixir erlang-compiler erlang-dev erlang-edoc erlang-eldap erlang-erl-docgen erlang-mnesia erlang-os-mon erlang-runtime-tools erlang-tools erlang-eunit erlang-xmerl gawk grep libxslt py3-simplejson python3 rsync socat xmlto zip
 abuild -F
 
-cd ${ROOT}/apk/postgis
-apk add -U gdal-dev@vm geos-dev@vm json-c-dev libxml2-dev pcre-dev perl perl-dev postgresql postgresql-dev proj4-dev@vm
+cd ${ROOT}/apk/spoc
 abuild -F
 
 cd ${ROOT}/apk/vmmgr
diff --git a/lxc-services/solr6/lxcfile b/lxc-services/solr6/image
similarity index 98%
rename from lxc-services/solr6/lxcfile
rename to lxc-services/solr6/image
index 783e741..b4041af 100644
--- a/lxc-services/solr6/lxcfile
+++ b/lxc-services/solr6/image
@@ -18,7 +18,7 @@ RUN EOF
     ln -s /opt/solr/bin/solr /usr/bin/solr
 EOF
 
-COPY lxc
+COPY image.d
 
 USER solr
 CMD /usr/bin/solr start -f
diff --git a/lxc-services/solr6/lxc/usr/bin/solr.in.sh b/lxc-services/solr6/image.d/usr/bin/solr.in.sh
similarity index 100%
rename from lxc-services/solr6/lxc/usr/bin/solr.in.sh
rename to lxc-services/solr6/image.d/usr/bin/solr.in.sh