diff --git a/_build/build-all.sh b/_build/build-all.sh
index c9a4bd3..cd1fc91 100755
--- a/_build/build-all.sh
+++ b/_build/build-all.sh
@@ -26,7 +26,8 @@ lxc-build alpine3.9-python2.7
 lxc-build alpine3.9-python3.6
 lxc-build alpine3.9-nodejs10
 lxc-build alpine3.9-ruby2.4
-lxc-build alpine3.9-tomcat8
+lxc-build alpine3.9-tomcat7
+lxc-build alpine3.9-tomcat8.5
 
 # Build services
 lxc-build activemq
@@ -72,7 +73,8 @@ lxc-pack alpine3.9-python2.7
 lxc-pack alpine3.9-python3.6
 lxc-pack alpine3.9-nodejs10
 lxc-pack alpine3.9-ruby2.4
-lxc-pack alpine3.9-tomcat8
+lxc-pack alpine3.9-tomcat7
+lxc-pack alpine3.9-tomcat8.5
 
 # Pack services
 lxc-pack activemq
diff --git a/alpine3.9-tomcat8/lxc/srv/tomcat/bin/setenv.sh b/alpine3.9-tomcat7/lxc/srv/tomcat/bin/setenv.sh
similarity index 100%
rename from alpine3.9-tomcat8/lxc/srv/tomcat/bin/setenv.sh
rename to alpine3.9-tomcat7/lxc/srv/tomcat/bin/setenv.sh
diff --git a/alpine3.9-tomcat8/lxc/srv/tomcat/conf/logging.properties b/alpine3.9-tomcat7/lxc/srv/tomcat/conf/logging.properties
similarity index 100%
rename from alpine3.9-tomcat8/lxc/srv/tomcat/conf/logging.properties
rename to alpine3.9-tomcat7/lxc/srv/tomcat/conf/logging.properties
diff --git a/alpine3.9-tomcat7/lxcfile b/alpine3.9-tomcat7/lxcfile
new file mode 100644
index 0000000..a7e884a
--- /dev/null
+++ b/alpine3.9-tomcat7/lxcfile
@@ -0,0 +1,21 @@
+IMAGE build
+LAYER shared/alpine3.9
+LAYER shared/alpine3.9-java8
+LAYER shared/alpine3.9-tomcat7
+
+RUN EOF
+    # Install Tomcat 7
+    wget https://archive.apache.org/dist/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93.tar.gz -O - | tar xzf - -C /srv
+    mv /srv/apache-tomcat-7.0.93 /srv/tomcat
+
+    # Make catalina.sh available globally
+    ln -s /srv/tomcat/bin/catalina.sh /usr/bin/catalina.sh
+
+    # Cleanup
+    rm -f /srv/tomcat/bin/tomcat-native.tar.gz
+    rm -f /srv/tomcat/temp/safeToDelete.tmp
+    rm -rf /srv/tomcat/webapps
+    mkdir /srv/tomcat/webapps
+EOF
+
+COPY lxc
diff --git a/alpine3.9-tomcat8/meta b/alpine3.9-tomcat7/meta
similarity index 85%
rename from alpine3.9-tomcat8/meta
rename to alpine3.9-tomcat7/meta
index 512f2b1..374d387 100644
--- a/alpine3.9-tomcat8/meta
+++ b/alpine3.9-tomcat7/meta
@@ -1,7 +1,7 @@
 {
     "desc-cs": "Základní LXC vrstva s JSP a servlet kontejnerem Tomcat 8",
     "desc-en": "Basic LXC layer with Tomcat 8 JSP and servlet container",
-    "lxcpath": "shared/alpine3.9-tomcat8",
+    "lxcpath": "shared/alpine3.9-tomcat7",
     "version": "0.0.1",
     "release": "0",
     "license": "GPL",
diff --git a/alpine3.9-tomcat8/lxcfile b/alpine3.9-tomcat8/lxcfile
deleted file mode 100644
index cb2610d..0000000
--- a/alpine3.9-tomcat8/lxcfile
+++ /dev/null
@@ -1,18 +0,0 @@
-IMAGE build
-LAYER shared/alpine3.9
-LAYER shared/alpine3.9-java8
-LAYER shared/alpine3.9-tomcat8
-
-RUN EOF
-    # Install Tomcat 8
-    wget https://archive.apache.org/dist/tomcat/tomcat-8/v8.0.53/bin/apache-tomcat-8.0.53.tar.gz -O - | tar xzf - -C /srv
-    mv /srv/apache-tomcat-8.0.53 /srv/tomcat
-
-    # Make catalina.sh available globally
-    ln -s /srv/tomcat/bin/catalina.sh /usr/bin/catalina.sh
-
-    # Cleanup
-    rm -rf /srv/tomcat/webapps/ROOT /srv/tomcat/webapps/docs /srv/tomcat/webapps/examples /srv/tomcat/webapps/host-manager /srv/tomcat/webapps/manager
-EOF
-
-COPY lxc