diff --git a/src/tcp_buffer_tuner.c b/src/tcp_buffer_tuner.c
index c2b9db1..0f77047 100644
--- a/src/tcp_buffer_tuner.c
+++ b/src/tcp_buffer_tuner.c
@@ -15,12 +15,14 @@
 struct tcp_buffer_tuner_bpf *skel;
 
 static struct bpftunable_desc descs[] = {
-{ TCP_BUFFER_TCP_WMEM,	BPFTUNABLE_SYSCTL, "net.ipv4.tcp_wmem",	true, 3 },
-{ TCP_BUFFER_TCP_RMEM,	BPFTUNABLE_SYSCTL, "net.ipv4.tcp_rmem",	true, 3 },
-{ TCP_BUFFER_TCP_MEM,	BPFTUNABLE_SYSCTL, "net.ipv4.tcp_mem",	false, 3 },
-{ TCP_BUFFER_TCP_MAX_ORPHANS,
-			BPFTUNABLE_SYSCTL, "net.ipv4.tcp_max_orphans",
-								false, 1 },
+{ TCP_BUFFER_TCP_WMEM,	BPFTUNABLE_SYSCTL, "net.ipv4.tcp_wmem",
+	BPFTUNABLE_NAMESPACED, 3 },
+{ TCP_BUFFER_TCP_RMEM,	BPFTUNABLE_SYSCTL, "net.ipv4.tcp_rmem",
+	BPFTUNABLE_NAMESPACED, 3 },
+{ TCP_BUFFER_TCP_MEM,	BPFTUNABLE_SYSCTL, "net.ipv4.tcp_mem",
+	0, 3 },
+{ TCP_BUFFER_TCP_MAX_ORPHANS, BPFTUNABLE_SYSCTL, "net.ipv4.tcp_max_orphans",
+	0, 1 },
 };
 
 static struct bpftunable_scenario scenarios[] = {
diff --git a/test/rollback_legacy_test.sh b/test/rollback_legacy_test.sh
index 776026a..6185986 100644
--- a/test/rollback_legacy_test.sh
+++ b/test/rollback_legacy_test.sh
@@ -77,6 +77,7 @@ for FAMILY in ipv4 ipv6 ; do
                 read -r -a stest_results <<< $sresults
 		read -r -a rtest_results <<< $rresults
 		pkill -TERM bpftune
+		sleep $SETUPTIME
         fi
 	sleep $SLEEPTIME
    done
diff --git a/test/rollback_test.sh b/test/rollback_test.sh
index 7c4ca21..aa28536 100644
--- a/test/rollback_test.sh
+++ b/test/rollback_test.sh
@@ -77,6 +77,7 @@ for FAMILY in ipv4 ipv6 ; do
                 read -r -a stest_results <<< $sresults
 		read -r -a rtest_results <<< $rresults
 		pkill -TERM bpftune
+		sleep $SETUPTIME
         fi
 	sleep $SLEEPTIME
    done