diff --git a/defaults/main.yml b/defaults/main.yml
index 5390b15..29d9c89 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -50,14 +50,14 @@ tomcat_m_java_opts_heap: "-Xms{{ tomcat_m_min_heap_size }} -Xmx{{ tomcat_m_heap_
 tomcat_m_java_opts_permgen: "-XX:MaxPermSize={{ tomcat_m_permgen_size }}"
 tomcat_m_additional_java_8_opts: "-XX:+CrashOnOutOfMemoryError"
 tomcat_m_java_opts: ""
-tomcat_m_java_gc_opts: "-XX:+UseConcMarkSweepGC"
+tomcat_m_java_gc_opts: "{% if openjdk_default is version_compare('11', '<=') %}-XX:+UseConcMarkSweepGC{% else %}{% endif %}"
 tomcat_m_enable_catalina_shared_loader: true
 tomcat_m_catalina_shared_loader_path: '${catalina.base}/shared/classes,${catalina.base}/shared/*.jar'
 tomcat_m_catalina_classloader_paths: []
 # - lib/mylibdir
 # - lib/mylibdir/*.jar
 
-# Use "-XX:+UseConcMarkSweepGC" to enable the CMS garbage collector (improved
+# Use "-XX:+UseConcMarkSweepGC" with JDK <= 11 to enable the CMS garbage collector (improved
 # response time). If you use that option and you run Tomcat on a machine with
 # exactly one CPU chip that contains one or two cores, you should also add
 # the "-XX:+CMSIncrementalMode" option.