diff --git a/skel/share/defaults/qos-engine.properties b/skel/share/defaults/qos-engine.properties
index 63750879509..e38b63538fc 100644
--- a/skel/share/defaults/qos-engine.properties
+++ b/skel/share/defaults/qos-engine.properties
@@ -61,7 +61,7 @@ qos.limits.engine.namespace-request-threads=32
 # ---- Thread queue used to process requests to modify the qos.  These can
 #      be from the bulk service or the frontend.
 #
-qos.limits.engine.qos-modify-request-threads=32
+qos.limits.engine.qos-modify-request-threads=500
 
 # ---- Thread queue used to process policy state updates and queries. These
 #      can be from the engine's manager thread or from admin or frontend interfaces.
diff --git a/skel/share/defaults/qos-verifier.properties b/skel/share/defaults/qos-verifier.properties
index 1ed05e450f8..abc8b391375 100644
--- a/skel/share/defaults/qos-verifier.properties
+++ b/skel/share/defaults/qos-verifier.properties
@@ -87,7 +87,7 @@ qos.limits.verifier.bulk-threads=8
 #
 #      This queue is used for requests originating from the namespace.
 #
-qos.limits.verifier.task-threads=24
+qos.limits.verifier.task-threads=${qos.limits.verifier.max-running-operations}
 
 # ---- Thread queue used when an operation becomes active (to verify
 #      the requirements and send a message to the adjuster). Each thread makes
@@ -96,7 +96,7 @@ qos.limits.verifier.task-threads=24
 #
 #      This queue is used for requests originating from the frontend, bulk service or qos engine.
 #
-qos.limits.verifier.modify-task-threads=24
+qos.limits.verifier.modify-task-threads=${qos.limits.verifier.max-running-operations}
 
 # ---- Thread queue used when an operation becomes active (to verify
 #      the requirements and send a message to the adjuster). Each thread makes
@@ -105,11 +105,11 @@ qos.limits.verifier.modify-task-threads=24
 #
 #      This queue is used for requests originating from the scanner.
 #
-qos.limits.verifier.scanner-task-threads=12
+qos.limits.verifier.scanner-task-threads=${qos.limits.verifier.max-running-operations}
 
 # ---- Thread queue used to execute postprocess and eventual removal of operations.
 #
-qos.limits.verifier.post-process-threads=24
+qos.limits.verifier.post-process-threads=${qos.limits.verifier.max-running-operations}
 
 # ---- This number is a maximum per operation queue.
 #