diff --git a/containers/jetty/conf/athenz.properties b/containers/jetty/conf/athenz.properties
index d17a0610631..b7cf0bfb54b 100644
--- a/containers/jetty/conf/athenz.properties
+++ b/containers/jetty/conf/athenz.properties
@@ -209,3 +209,9 @@ athenz.jetty_home=/home/athenz
 # In Athenz this is required to support AWS temporary credentials request when
 # the role name contains the / character.
 #athenz.decode_ambiguous_uris=true
+
+# Jetty configuration option to dump the configuration after the server
+# has started. This is useful for debugging purposes to see the
+# configuration that was used to start the server. The dump is
+# written to the system log file.
+#athenz.dump_after_start=false
diff --git a/containers/jetty/src/main/java/com/yahoo/athenz/container/AthenzConsts.java b/containers/jetty/src/main/java/com/yahoo/athenz/container/AthenzConsts.java
index ab97a284025..d0c2a7730af 100644
--- a/containers/jetty/src/main/java/com/yahoo/athenz/container/AthenzConsts.java
+++ b/containers/jetty/src/main/java/com/yahoo/athenz/container/AthenzConsts.java
@@ -29,6 +29,7 @@ public final class AthenzConsts {
     public static final String ATHENZ_PROP_ACCESS_SLF4J_LOGGER    = "athenz.access_slf4j_logger";
     public static final String ATHENZ_PROP_ACCESS_LOG_DIR         = "athenz.access_log_dir";
     public static final String ATHENZ_PROP_CONFIG_SOURCE_PATHS    = "athenz.config.source_paths";
+    public static final String ATHENZ_PROP_DUMP_AFTER_START       = "athenz.dump_after_start";
 
     public static final String ATHENZ_PROP_KEYSTORE_PASSWORD      = "athenz.ssl_key_store_password";
     public static final String ATHENZ_PROP_KEYMANAGER_PASSWORD    = "athenz.ssl_key_manager_password";
diff --git a/containers/jetty/src/main/java/com/yahoo/athenz/container/AthenzJettyContainer.java b/containers/jetty/src/main/java/com/yahoo/athenz/container/AthenzJettyContainer.java
index d5432aaac16..f582fa327d4 100644
--- a/containers/jetty/src/main/java/com/yahoo/athenz/container/AthenzJettyContainer.java
+++ b/containers/jetty/src/main/java/com/yahoo/athenz/container/AthenzJettyContainer.java
@@ -657,8 +657,7 @@ public static void initConfigManager() {
 
     public void run() {
         try {
-            server.setDumpAfterStart(true);
-
+            server.setDumpAfterStart(Boolean.parseBoolean(System.getProperty(AthenzConsts.ATHENZ_PROP_DUMP_AFTER_START, "false")));
             server.start();
 
             // we're going to set the decodeAmbiguousURIs flag for all our servlet