diff --git a/.gitignore b/.gitignore
index bff2d76..92bc551 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 *.iml
+*.idea
+
diff --git a/Dockerfile b/Dockerfile
index c27aa69..152a6bd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,27 +1,18 @@
-ARG TOMCAT_VERSION=9.0.38
-ARG JAVA_VERSION=8
-ARG IMAGE_VERSION=${TOMCAT_VERSION}-jdk${JAVA_VERSION}-openjdk-slim
+FROM tomcat:jdk11-openjdk-slim
 
-FROM tomcat:$IMAGE_VERSION
-
-ARG GS_VERSION=2.18.0
-ARG MARLIN_TAG=0_9_4_3
-ARG MARLIN_VERSION=0.9.4.3
+ARG GS_VERSION=2.18.1
 
 ARG WAR_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/geoserver-${GS_VERSION}-war.zip
 ARG STABLE_PLUGIN_URL=https://sourceforge.net/projects/geoserver/files/GeoServer/${GS_VERSION}/extensions
 
 # environment variables
 ENV GS_VERSION=${GS_VERSION} \
-    MARLIN_TAG=${MARLIN_TAG} \
-    MARLIN_VERSION=${MARLIN_VERSION} \
     WAR_URL=${WAR_URL} \
     STABLE_PLUGIN_URL=${STABLE_PLUGIN_URL} \
     INITIAL_MEMORY="2G" \
     MAXIMUM_MEMORY="4G" \
     JAIEXT_ENABLED=true \
     STABLE_EXTENSIONS='' \
-#    COMMUNITY_EXTENSIONS='' \
     DEBIAN_FRONTEND=noninteractive \
     EXTENSION_DOWNLOAD_DIR=/opt/geoserver_extension_downloads \
     GEOSERVER_DATA_DIR=/opt/geoserver_data \
@@ -42,9 +33,6 @@ RUN wget --progress=bar:force:noscroll -c --no-check-certificate "${WAR_URL}" -O
     unzip -q ${CATALINA_HOME}/webapps/geoserver.war -d ${CATALINA_HOME}/webapps/geoserver && \
     rm ${CATALINA_HOME}/webapps/geoserver.war
 
-# install marlin renderer
-RUN wget --progress=bar:force:noscroll -c --no-check-certificate https://github.com/bourgesl/marlin-renderer/releases/download/v${MARLIN_TAG}/marlin-${MARLIN_VERSION}-Unsafe.jar -O ${CATALINA_HOME}/lib/marlin-${MARLIN_VERSION}-Unsafe.jar
-
 # copy scripts
 COPY scripts /scripts
 RUN chmod +x /scripts/*.sh
diff --git a/README.md b/README.md
index 07818f4..61d679c 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,6 @@ Work is still in progress!
 1. The [Dockerfile](Dockerfile)
     1. installs dependencies
     1. installs the GeoServer by downloading and extracting the war file
-    1. installs the marlin renderer
     1. defines defaults for environment variables
 1. The [entrypoint.sh](scripts/entrypoint.sh) startup script (in a running container)
     1. executes [install-extensions.sh](scripts/install-extensions.sh) to download and install GeoServer extensions based on the `STABLE_EXTENSIONS` environment variable.
diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh
index d329090..b545daa 100644
--- a/scripts/entrypoint.sh
+++ b/scripts/entrypoint.sh
@@ -12,10 +12,8 @@ export GEOSERVER_OPTS="-Djava.awt.headless=true -server \
        -Djavax.servlet.request.encoding=UTF-8 \
        -Djavax.servlet.response.encoding=UTF-8 \
        -Xms${INITIAL_MEMORY} -Xmx${MAXIMUM_MEMORY} \
-       -XX:SoftRefLRUPolicyMSPerMB=36000 -XX:+UseG1GC \
+       -XX:SoftRefLRUPolicyMSPerMB=36000 \
        -XX:MaxGCPauseMillis=200 -XX:ParallelGCThreads=20 -XX:ConcGCThreads=5 \
-       -Xbootclasspath/a:${CATALINA_HOME}/lib/marlin-${MARLIN_VERSION}-Unsafe.jar \
-       -Dsun.java2d.renderer=org.marlin.pisces.MarlinRenderingEngine \
        -Dorg.geotools.coverage.jaiext.enabled=${JAIEXT_ENABLED}"
 
 ## JVM command line arguments