diff --git a/Samples/Universal/shorewall.conf b/Samples/Universal/shorewall.conf
index dba2b208b..44f58f8e1 100644
--- a/Samples/Universal/shorewall.conf
+++ b/Samples/Universal/shorewall.conf
@@ -156,7 +156,7 @@ HIGH_ROUTE_MARKS=No
 
 USE_ACTIONS=Yes
 
-OPTIMIZE=0
+OPTIMIZE=15
 
 EXPORTPARAMS=Yes
 
@@ -180,9 +180,9 @@ RESTORE_DEFAULT_ROUTE=Yes
 
 AUTOMAKE=No
 
-WIDE_TC_MARKS=No
+WIDE_TC_MARKS=Yes
 
-TRACK_PROVIDERS=No
+TRACK_PROVIDERS=Yes
 
 ZONE2ZONE=2
 
@@ -192,7 +192,7 @@ DYNAMIC_BLACKLIST=Yes
 
 OPTIMIZE_ACCOUNTING=No
 
-LOAD_HELPERS_ONLY=No
+LOAD_HELPERS_ONLY=Yes
 
 REQUIRE_INTERFACE=Yes
 
diff --git a/Samples6/Universal/shorewall6.conf b/Samples6/Universal/shorewall6.conf
index 66badef6b..bc426d178 100644
--- a/Samples6/Universal/shorewall6.conf
+++ b/Samples6/Universal/shorewall6.conf
@@ -99,7 +99,7 @@ TC_EXPERT=No
 
 TC_PRIOMAP="2 3 3 3 2 3 1 1 2 2 2 2 2 2 2 2"
 
-CLEAR_TC=No
+CLEAR_TC=Yes
 
 MARK_IN_FORWARD_CHAIN=No
 
@@ -137,9 +137,9 @@ MANGLE_ENABLED=Yes
 
 AUTOMAKE=No
 
-WIDE_TC_MARKS=No
+WIDE_TC_MARKS=Yes
 
-TRACK_PROVIDERS=No
+TRACK_PROVIDERS=Yes
 
 ZONE2ZONE=2
 
@@ -149,7 +149,7 @@ OPTIMIZE_ACCOUNTING=No
 
 DYNAMIC_BLACKLIST=Yes
 
-LOAD_HELPERS_ONLY=No
+LOAD_HELPERS_ONLY=Yes
 
 REQUIRE_INTERFACE=Yes