diff --git a/Dockerfile b/Dockerfile
index 104ba63..7d5ef99 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-FROM unidata/tomcat-docker:8.5@sha256:3cf99db8113eeea94a5f27dfa50f843a94ab7eaad373fd92e071e3afd912d44b
+FROM unidata/tomcat-docker:8.5@sha256:0d65eef935da7bc00242360269070261fb6e6428cb906aa4ce7509301a2216f9
 LABEL maintainer="Kyle Wilcox <kyle@axiomdatascience.com>"
 
-ENV ERDDAP_VERSION 2.14
+ENV ERDDAP_VERSION 2.18
 ENV ERDDAP_CONTENT_URL https://github.com/BobSimons/erddap/releases/download/v$ERDDAP_VERSION/erddapContent.zip
 ENV ERDDAP_WAR_URL https://github.com/BobSimons/erddap/releases/download/v$ERDDAP_VERSION/erddap.war
 ENV ERDDAP_bigParentDirectory /erddapData
diff --git a/README.md b/README.md
index 2adbfd2..7ab0e64 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@ A feature full Tomcat (SSL over APR, etc.) running [ERDDAP](http://coastwatch.pf
 Available versions:
 
 * `axiom/docker-erddap:latest`
+* `axiom/docker-erddap:2.18`
 * `axiom/docker-erddap:2.14`
 * `axiom/docker-erddap:2.11`
 * `axiom/docker-erddap:2.10`