diff --git a/ridgeback/__init__.py b/ridgeback/__init__.py
index 0b167e61..edc60b35 100644
--- a/ridgeback/__init__.py
+++ b/ridgeback/__init__.py
@@ -1 +1 @@
-__version__ = "2.1.5"
+__version__ = "2.1.6"
diff --git a/ridgeback/settings.py b/ridgeback/settings.py
index d70a7097..d82545b7 100644
--- a/ridgeback/settings.py
+++ b/ridgeback/settings.py
@@ -304,6 +304,7 @@
 TOIL_STATE_POLLING_WAIT = os.environ.get("TOIL_STATE_POLLING_WAIT", 60)
 TOIL_MAX_CORES = os.environ.get("RIDGEBACK_TOIL_MAX_CORES", "40")
 TOIL_DEFAULT_MEMORY = os.environ.get("RIDGEBACK_TOIL_DEFAULT_MEMORY", "8G")
+TOIL_JOB_STORE_TIMEOUT = os.environ.get("RIDGEBACK_TOIL_JOB_STORE_TIMEOUT", "1800")
 SINGLE_MACHINE_CORES = os.environ.get("RIDGEBACK_SINGLE_MACHINE_CORES", 16)
 SINGLE_MACHINE_MEMORY = os.environ.get("RIDGEBACK_SINGLE_MACHINE_MEMORY", 25)
 
diff --git a/submitter/toil_submitter/toil_jobsubmitter.py b/submitter/toil_submitter/toil_jobsubmitter.py
index b64f7eda..bee9eef6 100644
--- a/submitter/toil_submitter/toil_jobsubmitter.py
+++ b/submitter/toil_submitter/toil_jobsubmitter.py
@@ -263,7 +263,7 @@ def _command_line(self):
                 "--maxCores",
                 settings.TOIL_MAX_CORES,
                 "--jobStoreTimeout",
-                "600",
+                settings.TOIL_JOB_STORE_TIMEOUT,
                 "--maxMemory",
                 "256G",
                 "--not-strict",
@@ -314,7 +314,7 @@ def _command_line(self):
                 "--maxCores",
                 settings.TOIL_MAX_CORES,
                 "--jobStoreTimeout",
-                "600",
+                settings.TOIL_JOB_STORE_TIMEOUT,
                 "--maxMemory",
                 "256G",
                 "--not-strict",