diff --git a/gameoflife-acceptance-tests/Dockerfile b/gameoflife-acceptance-tests/Dockerfile
new file mode 100644
index 0000000000..8fdd2d25a5
--- /dev/null
+++ b/gameoflife-acceptance-tests/Dockerfile
@@ -0,0 +1,22 @@
+FROM selenium/standalone-firefox:latest
+
+ENV MAVEN_VERSION 3.3.3
+ENV DISPLAY :99
+
+USER root
+
+RUN apt-get update -qqy \
+  && apt-get install -y openjdk-8-jdk && \
+  rm -rf /var/lib/apt/lists/*
+
+RUN wget -O- http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz | tar xzf - -C /opt \
+  && mv /opt/apache-maven-$MAVEN_VERSION /opt/maven \
+  && ln -s /opt/maven/bin/mvn /usr/bin/mvn
+
+USER seluser
+
+ENV MAVEN_HOME /opt/maven
+
+EXPOSE 9090
+
+CMD ["mvn"]
diff --git a/gameoflife-acceptance-tests/pom.xml b/gameoflife-acceptance-tests/pom.xml
index 2a33e57db3..532ceed248 100644
--- a/gameoflife-acceptance-tests/pom.xml
+++ b/gameoflife-acceptance-tests/pom.xml
@@ -13,7 +13,7 @@
         <jetty.stop.port>9999</jetty.stop.port>
         <webdriver.base.url>http://localhost:${jetty.port}</webdriver.base.url>
         <webdriver.driver>firefox</webdriver.driver>
-        <thucydides.version>0.9.22</thucydides.version>
+        <thucydides.version>0.9.268</thucydides.version>
     </properties>
     <dependencies>
         <dependency>
@@ -71,7 +71,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.9</version>
                 <configuration>
-                    <skip>true</skip>
+                    <skip>false</skip>
                 </configuration>
             </plugin>
             <plugin>
@@ -121,28 +121,28 @@
         <profile>
             <id>development</id>
             <properties>
-                <webdriver.base.url>http://gameoflife-dev.thucydides.cloudbees.net</webdriver.base.url>
-                <webdriver.driver>htmlunit</webdriver.driver>
+                <webdriver.base.url>http://gameoflife:${jetty.port}</webdriver.base.url>
+                <webdriver.driver>firefox</webdriver.driver>
             </properties>
         </profile>
         <profile>
             <id>integration</id>
             <properties>
-                <webdriver.base.url>http://gameoflife-integration.thucydides.cloudbees.net/</webdriver.base.url>
+                <webdriver.base.url>http://gameoflife:${jetty.port}</webdriver.base.url>
                 <webdriver.driver>firefox</webdriver.driver>
             </properties>
         </profile>
         <profile>
             <id>staging</id>
             <properties>
-                <webdriver.base.url>http://gameoflife-staging.thucydides.cloudbees.net</webdriver.base.url>
+                <webdriver.base.url>http://gameoflife:${jetty.port}</webdriver.base.url>
                 <webdriver.driver>firefox</webdriver.driver>
             </properties>
         </profile>
         <profile>
             <id>production</id>
             <properties>
-                <webdriver.base.url>http://gameoflife.thucydides.cloudbees.net/</webdriver.base.url>
+                <webdriver.base.url>http://gameoflife:${jetty.port}</webdriver.base.url>
                 <webdriver.driver>firefox</webdriver.driver>
             </properties>
         </profile>
diff --git a/gameoflife-web/Dockerfile b/gameoflife-web/Dockerfile
new file mode 100644
index 0000000000..d7d242da99
--- /dev/null
+++ b/gameoflife-web/Dockerfile
@@ -0,0 +1,8 @@
+FROM tomcat:8-jre8
+
+RUN rm -rf /usr/local/tomcat/webapps/*
+
+COPY target/gameoflife.war /usr/local/tomcat/webapps/ROOT.war
+
+EXPOSE 8080
+CMD ["catalina.sh", "run"]
diff --git a/gameoflife-web/pom.xml b/gameoflife-web/pom.xml
index ebba304fc7..2ec598b745 100644
--- a/gameoflife-web/pom.xml
+++ b/gameoflife-web/pom.xml
@@ -25,22 +25,20 @@
             </resource>
         </resources>
         <plugins>
-            <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>7.1.0.v20100505</version>
-                <configuration>
-                    <scanIntervalSeconds>10</scanIntervalSeconds>
-                    <connectors>
-                        <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
-                            <port>${jetty.port}</port>
-                            <maxIdleTime>60000</maxIdleTime>
-                        </connector>
-                    </connectors>
-                    <stopKey>foo</stopKey>
-                    <stopPort>${jetty.stop.port}</stopPort>
-                </configuration>
-            </plugin>
+          <plugin>
+              <groupId>org.eclipse.jetty</groupId>
+              <artifactId>jetty-maven-plugin</artifactId>
+              <version>9.3.0.v20150612</version>
+              <configuration>
+                  <scanIntervalSeconds>10</scanIntervalSeconds>
+                  <httpConnector>
+                      <port>${jetty.port}</port>
+                      <idleTimeout>60000</idleTimeout>
+                  </httpConnector>
+                  <stopKey>foo</stopKey>
+                  <stopPort>${jetty.stop.port}</stopPort>
+              </configuration>
+          </plugin>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <version>2.1.1</version>