diff --git a/dbflute.xml b/dbflute.xml
index 25d86f204..36f85d212 100644
--- a/dbflute.xml
+++ b/dbflute.xml
@@ -2,7 +2,7 @@
 <project name="dbflute" basedir=".">
 	<property name="mydbflute.dir" value="${basedir}/mydbflute" />
 	<property name="target.dir" value="${basedir}/target" />
-	<property name="branch.name" value="es-6.0" />
+	<property name="branch.name" value="es-6.1" />
 	<property name="mydbflute.url" value="https://github.com/lastaflute/lastaflute-example-waterfront/archive/${branch.name}.zip" />
 
 	<target name="mydbflute.check">
diff --git a/pom.xml b/pom.xml
index 1dc0305d6..7dc6a79c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
 		<cluster.runner.version>${elasticsearch.version}.0</cluster.runner.version>
 
 		<!-- Tomcat -->
-		<tomcat.version>9.0.2</tomcat.version>
+		<tomcat.version>8.5.23</tomcat.version>
 		<tomcat.boot.version>0.6.0</tomcat.boot.version>
 
 		<!-- DEB & RPM build -->