diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index b4f8bb1..372fafb 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -2,12 +2,13 @@
 
 set -x
 
+CONFLUENCE_VERSION=6.1.0
+
 exec atlas-run-standalone \
   --server confluence \
-  --container tomcat7x \
+  --container tomcat8x \
   --product confluence \
-  --version 6.0.0-OD-2016.10.0-1050 \
-  --data-version 6.0.0-OD-2016.10.0-1050 \
-  --bundled-plugins com.atlassian.bundles:json-schema-validator-atlassian-bundle:1.0.4,com.atlassian.upm:atlassian-universal-plugin-manager-plugin:2.21-D20160128T024330,com.atlassian.jwt:jwt-plugin:1.5.9-0019,com.atlassian.plugins:atlassian-connect-plugin:1.1.77 \
+  --version $CONFLUENCE_VERSION \
+  --data-version $CONFLUENCE_VERSION \
   --jvmargs "${JAVA_OPTS}" \
    -DskipAllPrompts=true