diff --git a/ansible/roles/sapp/templates/sapp.toml.j2.j2 b/ansible/roles/sapp/templates/sapp.toml.j2.j2
index 9179abb1..bef1056f 100644
--- a/ansible/roles/sapp/templates/sapp.toml.j2.j2
+++ b/ansible/roles/sapp/templates/sapp.toml.j2.j2
@@ -120,8 +120,9 @@ dictator_enable=1
 ### note, stream_id_base_time format is "%Y-%m-%d %H:%M:%S" 
     stream_id_base_time="2021-01-01 00:00:00"
     [stream.tcp]
-    max=100000
-    timeout=30
+    {% raw %}max={{ advanced_settings.stream_tcp_max }}
+    timeout={{ advanced_settings.stream_tcp_timeout }}
+    {% endraw %}
     syn_mandatory=1
     reorder_pkt_max=128
     analyse_option_enabled=1
@@ -142,8 +143,9 @@ dictator_enable=1
         remedy_kill_tcp_by_inline_device=0
 	
     [stream.udp]
-    max=100000
-    timeout=60
+    {% raw %}max={{ advanced_settings.stream_udp_max }}
+    timeout={{ advanced_settings.stream_udp_timeout }}
+    {% endraw %}
     meaningful_statistics_minimum_pkt=3
     meaningful_statistics_minimum_byte=5
     
diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01
index d2fa3e75..22f804ea 100644
--- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01
+++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01
@@ -31,4 +31,10 @@ app:
 coredump:
   format: minidump
   collect: sentry
-  sentry_url: http://127.0.0.1:9000/api/2/minidump/?sentry_key=3203b43fd5384a7dbe6a48ecb1f3c595
\ No newline at end of file
+  sentry_url: http://127.0.0.1:9000/api/2/minidump/?sentry_key=3203b43fd5384a7dbe6a48ecb1f3c595
+
+advanced_settings:
+  stream_tcp_max: 100000
+  stream_tcp_timeout: 30
+  stream_udp_max: 100000
+  stream_udp_timeout: 60
\ No newline at end of file
diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01
index fbf8ce23..06dccdb5 100644
--- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01
+++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01
@@ -30,4 +30,10 @@ app:
 coredump:
   format: minidump
   collect: sentry
-  sentry_url: http://127.0.0.1:9000/api/2/minidump/?sentry_key=3203b43fd5384a7dbe6a48ecb1f3c595
\ No newline at end of file
+  sentry_url: http://127.0.0.1:9000/api/2/minidump/?sentry_key=3203b43fd5384a7dbe6a48ecb1f3c595
+
+advanced_settings:
+  stream_tcp_max: 100000
+  stream_tcp_timeout: 30
+  stream_udp_max: 100000
+  stream_udp_timeout: 60
\ No newline at end of file