diff --git a/tests/samourai-crew/audit/audit_array_alias.sh b/tests/samourai-crew/audit/audit_array_alias.sh
index 10f45c7..dd360a4 100755
--- a/tests/samourai-crew/audit/audit_array_alias.sh
+++ b/tests/samourai-crew/audit/audit_array_alias.sh
@@ -9,7 +9,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/common.sh"
 
 SUFFIX=$(date +%s)
-PKGPATH="gno.land/r/${KEY_ADDR}/audit/arrayalias${SUFFIX}"
+PKGPATH="gno.land/r/${NAMESPACE}/audit/arrayalias${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -41,7 +41,7 @@ EOF
 echo -n "   Deploying realm... "
 DEPLOY=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH" -pkgdir "$TMPDIR" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/audit/audit_blog_revocation.sh b/tests/samourai-crew/audit/audit_blog_revocation.sh
index 5f922e0..98c50ff 100755
--- a/tests/samourai-crew/audit/audit_blog_revocation.sh
+++ b/tests/samourai-crew/audit/audit_blog_revocation.sh
@@ -18,7 +18,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/common.sh"
 
 SUFFIX=$(date +%s)
-PKGPATH="gno.land/r/${KEY_ADDR}/audit/testblog${SUFFIX}"
+PKGPATH="gno.land/r/${NAMESPACE}/audit/testblog${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -84,7 +84,7 @@ echo -n "   Step 1: AddModerator($KEY_ADDR)... "
 ADD=$(echo "$PASSWORD" | gnokey maketx call \
 	-pkgpath "$PKGPATH" -func "AddModerator" \
 	-args "$KEY_ADDR" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
@@ -98,7 +98,7 @@ echo -n "   Step 2: RemoveModerator($KEY_ADDR)... "
 REM=$(echo "$PASSWORD" | gnokey maketx call \
 	-pkgpath "$PKGPATH" -func "RemoveModerator" \
 	-args "$KEY_ADDR" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
@@ -111,7 +111,7 @@ fi
 echo -n "   Step 3: ModOnlyAction() as revoked moderator (expect: still works = KNOWN_VULNERABLE)... "
 MOD=$(echo "$PASSWORD" | gnokey maketx call \
 	-pkgpath "$PKGPATH" -func "ModOnlyAction" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/audit/audit_byteslice.sh b/tests/samourai-crew/audit/audit_byteslice.sh
index 2be5ef0..40dbb62 100755
--- a/tests/samourai-crew/audit/audit_byteslice.sh
+++ b/tests/samourai-crew/audit/audit_byteslice.sh
@@ -8,7 +8,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/common.sh"
 
 SUFFIX=$(date +%s)
-PKGPATH="gno.land/r/${KEY_ADDR}/audit/byteslice${SUFFIX}"
+PKGPATH="gno.land/r/${NAMESPACE}/audit/byteslice${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -47,7 +47,7 @@ EOF
 echo -n "   Deploying realm... "
 DEPLOY=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH" -pkgdir "$TMPDIR" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/audit/audit_cross_realm_p_arithmetic.sh b/tests/samourai-crew/audit/audit_cross_realm_p_arithmetic.sh
index f95fe1c..7099651 100755
--- a/tests/samourai-crew/audit/audit_cross_realm_p_arithmetic.sh
+++ b/tests/samourai-crew/audit/audit_cross_realm_p_arithmetic.sh
@@ -12,7 +12,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 
 SUFFIX=$(date +%s)
 PKGPATH_P="gno.land/p/${KEY_ADDR}/audit/pcounter${SUFFIX}"
-PKGPATH_R="gno.land/r/${KEY_ADDR}/audit/arithmetic${SUFFIX}"
+PKGPATH_R="gno.land/r/${NAMESPACE}/audit/arithmetic${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -39,7 +39,7 @@ EOF
 echo -n "   Deploying /p/ Counter... "
 DEPLOY_P=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH_P" -pkgdir "$TMPDIR/p" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
@@ -71,7 +71,7 @@ EOF
 echo -n "   Deploying realm... "
 DEPLOY_R=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH_R" -pkgdir "$TMPDIR/r" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/audit/audit_cross_realm_recover.sh b/tests/samourai-crew/audit/audit_cross_realm_recover.sh
index 984bfaa..5e6533f 100755
--- a/tests/samourai-crew/audit/audit_cross_realm_recover.sh
+++ b/tests/samourai-crew/audit/audit_cross_realm_recover.sh
@@ -9,7 +9,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/common.sh"
 
 SUFFIX=$(date +%s)
-PKGPATH="gno.land/r/${KEY_ADDR}/audit/realmrecov${SUFFIX}"
+PKGPATH="gno.land/r/${NAMESPACE}/audit/realmrecov${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -49,7 +49,7 @@ EOF
 echo -n "   Deploying realm... "
 DEPLOY=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH" -pkgdir "$TMPDIR" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/audit/audit_launder_panic_recover.sh b/tests/samourai-crew/audit/audit_launder_panic_recover.sh
index e2a1c3c..55c8b6c 100755
--- a/tests/samourai-crew/audit/audit_launder_panic_recover.sh
+++ b/tests/samourai-crew/audit/audit_launder_panic_recover.sh
@@ -15,7 +15,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 
 SUFFIX=$(date +%s)
 PKGPATH_P="gno.land/p/${KEY_ADDR}/audit/saferun${SUFFIX}"
-PKGPATH_R="gno.land/r/${KEY_ADDR}/audit/panicvictim${SUFFIX}"
+PKGPATH_R="gno.land/r/${NAMESPACE}/audit/panicvictim${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -51,7 +51,7 @@ EOF
 echo -n "   Deploying SafeRunner (/p/)... "
 DEPLOY_P=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH_P" -pkgdir "$TMPDIR/p" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
@@ -84,7 +84,7 @@ EOF
 echo -n "   Deploying victim realm (/r/)... "
 DEPLOY_R=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH_R" -pkgdir "$TMPDIR/r" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
@@ -111,7 +111,7 @@ EOF
 
 echo -n "   Calling PSafe.Run(SetAndPanic(100))... "
 CALL=$(echo "$PASSWORD" | gnokey maketx run \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/audit/audit_launder_pointer_write.sh b/tests/samourai-crew/audit/audit_launder_pointer_write.sh
index 5a42a7a..9a43b0e 100755
--- a/tests/samourai-crew/audit/audit_launder_pointer_write.sh
+++ b/tests/samourai-crew/audit/audit_launder_pointer_write.sh
@@ -11,7 +11,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/common.sh"
 
 SUFFIX=$(date +%s)
-PKGPATH="gno.land/r/${KEY_ADDR}/audit/ptrwrite${SUFFIX}"
+PKGPATH="gno.land/r/${NAMESPACE}/audit/ptrwrite${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -37,7 +37,7 @@ EOF
 echo -n "   Deploying victim realm... "
 DEPLOY=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH" -pkgdir "$TMPDIR" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/audit/audit_nil_func_call.sh b/tests/samourai-crew/audit/audit_nil_func_call.sh
index 0e374d4..5af9918 100755
--- a/tests/samourai-crew/audit/audit_nil_func_call.sh
+++ b/tests/samourai-crew/audit/audit_nil_func_call.sh
@@ -11,7 +11,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/common.sh"
 
 SUFFIX=$(date +%s)
-PKGPATH="gno.land/r/${KEY_ADDR}/audit/nilfunc${SUFFIX}"
+PKGPATH="gno.land/r/${NAMESPACE}/audit/nilfunc${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -37,7 +37,7 @@ EOF
 echo -n "   Deploying realm... "
 DEPLOY=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH" -pkgdir "$TMPDIR" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/audit/audit_nil_realm_hole.sh b/tests/samourai-crew/audit/audit_nil_realm_hole.sh
index 05b853c..1e44a12 100755
--- a/tests/samourai-crew/audit/audit_nil_realm_hole.sh
+++ b/tests/samourai-crew/audit/audit_nil_realm_hole.sh
@@ -13,7 +13,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 
 SUFFIX=$(date +%s)
 PKGPATH_P="gno.land/p/${KEY_ADDR}/audit/nilhole${SUFFIX}"
-PKGPATH_R="gno.land/r/${KEY_ADDR}/audit/nilvictim${SUFFIX}"
+PKGPATH_R="gno.land/r/${NAMESPACE}/audit/nilvictim${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -55,7 +55,7 @@ EOF
 echo -n "   Deploying attack package (/p/)... "
 DEPLOY_P=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH_P" -pkgdir "$TMPDIR/p" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
@@ -88,7 +88,7 @@ EOF
 echo -n "   Deploying victim realm (/r/)... "
 DEPLOY_R=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH_R" -pkgdir "$TMPDIR/r" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/audit/audit_panic_log_dos.sh b/tests/samourai-crew/audit/audit_panic_log_dos.sh
index a8f485d..755fa6a 100755
--- a/tests/samourai-crew/audit/audit_panic_log_dos.sh
+++ b/tests/samourai-crew/audit/audit_panic_log_dos.sh
@@ -12,7 +12,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/common.sh"
 
 SUFFIX=$(date +%s)
-PKGPATH="gno.land/r/${KEY_ADDR}/audit/panicdos${SUFFIX}"
+PKGPATH="gno.land/r/${NAMESPACE}/audit/panicdos${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -38,7 +38,7 @@ EOF
 echo -n "   Deploying realm... "
 DEPLOY=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH" -pkgdir "$TMPDIR" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/audit/audit_preprocess_alloc_caps.sh b/tests/samourai-crew/audit/audit_preprocess_alloc_caps.sh
index 97d1a9a..59c45bb 100755
--- a/tests/samourai-crew/audit/audit_preprocess_alloc_caps.sh
+++ b/tests/samourai-crew/audit/audit_preprocess_alloc_caps.sh
@@ -52,7 +52,7 @@ EOF
 echo -n "   Test 1: deploying 10-level embed chain (expect rejection)... "
 DEEP=$(timeout 30 sh -c "echo '$PASSWORD' | gnokey maketx addpkg \
 	-pkgpath '$PKGPATH_DEEP' -pkgdir '$TMPDIR/deep' \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid '$CHAINID' -remote '$RPC' \
 	-insecure-password-stdin \
 	-home '$GNOKEY_HOME' \
@@ -96,7 +96,7 @@ EOF
 echo -n "   Test 2: deploying 6-level embed chain (expect success)... "
 SHALLOW=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH_SHALLOW" -pkgdir "$TMPDIR/shallow" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/audit/audit_profile_arbitrary_field.sh b/tests/samourai-crew/audit/audit_profile_arbitrary_field.sh
index 29373ac..71b9f05 100755
--- a/tests/samourai-crew/audit/audit_profile_arbitrary_field.sh
+++ b/tests/samourai-crew/audit/audit_profile_arbitrary_field.sh
@@ -43,7 +43,7 @@ echo -n "   SetStringField(\"$TEST_FIELD\", \"$TEST_VALUE\")... "
 CALL=$(echo "$PASSWORD" | gnokey maketx call \
 	-pkgpath "$PROFILE_PKGPATH" -func "SetStringField" \
 	-args "$TEST_FIELD" -args "$TEST_VALUE" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/audit/audit_profile_realm_spoof.sh b/tests/samourai-crew/audit/audit_profile_realm_spoof.sh
index 57c0d0a..75e263e 100755
--- a/tests/samourai-crew/audit/audit_profile_realm_spoof.sh
+++ b/tests/samourai-crew/audit/audit_profile_realm_spoof.sh
@@ -18,7 +18,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/common.sh"
 
 SUFFIX=$(date +%s)
-PKGPATH="gno.land/r/${KEY_ADDR}/audit/testprofilecaller${SUFFIX}"
+PKGPATH="gno.land/r/${NAMESPACE}/audit/testprofilecaller${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -57,7 +57,7 @@ EOF
 echo -n "   Deploying testprofilecaller realm... "
 DEPLOY=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH" -pkgdir "$TMPDIR" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
@@ -84,7 +84,7 @@ echo -n "   Step 1: SpoofProfile(\"$TEST_FIELD\", \"$TEST_VALUE\")... "
 SPOOF=$(echo "$PASSWORD" | gnokey maketx call \
 	-pkgpath "$PKGPATH" -func "SpoofProfile" \
 	-args "$TEST_FIELD" -args "$TEST_VALUE" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/audit/audit_type_assert_nil.sh b/tests/samourai-crew/audit/audit_type_assert_nil.sh
index 2548ec3..222191f 100755
--- a/tests/samourai-crew/audit/audit_type_assert_nil.sh
+++ b/tests/samourai-crew/audit/audit_type_assert_nil.sh
@@ -11,7 +11,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/common.sh"
 
 SUFFIX=$(date +%s)
-PKGPATH="gno.land/r/${KEY_ADDR}/audit/typeassert${SUFFIX}"
+PKGPATH="gno.land/r/${NAMESPACE}/audit/typeassert${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -37,7 +37,7 @@ EOF
 echo -n "   Deploying realm... "
 DEPLOY=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH" -pkgdir "$TMPDIR" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/audit/audit_var_init_order.sh b/tests/samourai-crew/audit/audit_var_init_order.sh
index 32168c9..2e0d28b 100755
--- a/tests/samourai-crew/audit/audit_var_init_order.sh
+++ b/tests/samourai-crew/audit/audit_var_init_order.sh
@@ -9,7 +9,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/common.sh"
 
 SUFFIX=$(date +%s)
-PKGPATH="gno.land/r/${KEY_ADDR}/audit/varinit${SUFFIX}"
+PKGPATH="gno.land/r/${NAMESPACE}/audit/varinit${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -37,7 +37,7 @@ EOF
 echo -n "   Deploying realm (var B = A+1 declared before var A = 2)... "
 DEPLOY=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH" -pkgdir "$TMPDIR" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/audit/common.sh b/tests/samourai-crew/audit/common.sh
index 43384b3..24fe8f1 100755
--- a/tests/samourai-crew/audit/common.sh
+++ b/tests/samourai-crew/audit/common.sh
@@ -9,3 +9,4 @@ KEY="${KEY:-runner}"
 PASSWORD="${PASSWORD:-runner1234}"
 GNOKEY_HOME="${GNOKEY_HOME:-/tmp/gnokey}"
 KEY_ADDR="${KEY_ADDR:-}"
+NAMESPACE="${NAMESPACE:-${KEY_ADDR}}"
diff --git a/tests/samourai-crew/e2e/e2e_access_control.sh b/tests/samourai-crew/e2e/e2e_access_control.sh
index dc59b19..00f3aa9 100755
--- a/tests/samourai-crew/e2e/e2e_access_control.sh
+++ b/tests/samourai-crew/e2e/e2e_access_control.sh
@@ -15,7 +15,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/../audit/common.sh"
 
 SUFFIX=$(date +%s)
-PKGPATH="gno.land/r/${KEY_ADDR}/e2e/acl${SUFFIX}"
+PKGPATH="gno.land/r/${NAMESPACE}/e2e/acl${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -55,7 +55,7 @@ EOF
 echo -n "   Deploying vault realm... "
 DEPLOY=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH" -pkgdir "$TMPDIR" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/e2e/e2e_counter.sh b/tests/samourai-crew/e2e/e2e_counter.sh
index e574885..68f1354 100755
--- a/tests/samourai-crew/e2e/e2e_counter.sh
+++ b/tests/samourai-crew/e2e/e2e_counter.sh
@@ -9,7 +9,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/../audit/common.sh"
 
 SUFFIX=$(date +%s)
-PKGPATH="gno.land/r/${KEY_ADDR}/e2e/counter${SUFFIX}"
+PKGPATH="gno.land/r/${NAMESPACE}/e2e/counter${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -42,7 +42,7 @@ EOF
 echo -n "   Deploying counter realm... "
 DEPLOY=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH" -pkgdir "$TMPDIR" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/e2e/e2e_cross_realm_callback.sh b/tests/samourai-crew/e2e/e2e_cross_realm_callback.sh
index 919b035..624a0d9 100755
--- a/tests/samourai-crew/e2e/e2e_cross_realm_callback.sh
+++ b/tests/samourai-crew/e2e/e2e_cross_realm_callback.sh
@@ -12,7 +12,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/../audit/common.sh"
 
 SUFFIX=$(date +%s)
-PKGPATH="gno.land/r/${KEY_ADDR}/e2e/cbhost${SUFFIX}"
+PKGPATH="gno.land/r/${NAMESPACE}/e2e/cbhost${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -41,7 +41,7 @@ EOF
 echo -n "   Deploying callback host realm... "
 DEPLOY=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH" -pkgdir "$TMPDIR" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
@@ -69,7 +69,7 @@ EOF
 
 echo -n "   Sending reentrant callback tx... "
 CALL=$(echo "$PASSWORD" | gnokey maketx run \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/e2e/e2e_mempool_stress.sh b/tests/samourai-crew/e2e/e2e_mempool_stress.sh
index c4fec1e..6b88224 100755
--- a/tests/samourai-crew/e2e/e2e_mempool_stress.sh
+++ b/tests/samourai-crew/e2e/e2e_mempool_stress.sh
@@ -8,7 +8,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/../audit/common.sh"
 
 SUFFIX=$(date +%s)
-PKGPATH="gno.land/r/${KEY_ADDR}/e2e/counter${SUFFIX}"
+PKGPATH="gno.land/r/${NAMESPACE}/e2e/counter${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -43,7 +43,7 @@ EOF
 echo -n "   Deploying counter realm... "
 DEPLOY=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH" -pkgdir "$TMPDIR" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/e2e/e2e_nonce_replay.sh b/tests/samourai-crew/e2e/e2e_nonce_replay.sh
index d935b9f..7b5c0d1 100755
--- a/tests/samourai-crew/e2e/e2e_nonce_replay.sh
+++ b/tests/samourai-crew/e2e/e2e_nonce_replay.sh
@@ -24,7 +24,7 @@ echo -n "   Tx 1 — normal broadcast... "
 TX1=$(echo "$PASSWORD" | gnokey maketx run \
 	-gas-fee 1000000ugnot -gas-wanted 1000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
-	-insecure-password-stdin \
+	-insecure-password-stdin=true \
 	-home "$GNOKEY_HOME" \
 	"$KEY" "$TMPDIR/noop.gno" 2>&1)
 
diff --git a/tests/samourai-crew/e2e/e2e_storage_metering.sh b/tests/samourai-crew/e2e/e2e_storage_metering.sh
index ef9c5a8..b5f0781 100755
--- a/tests/samourai-crew/e2e/e2e_storage_metering.sh
+++ b/tests/samourai-crew/e2e/e2e_storage_metering.sh
@@ -11,7 +11,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/../audit/common.sh"
 
 SUFFIX=$(date +%s)
-PKGPATH="gno.land/r/${KEY_ADDR}/e2e/storage${SUFFIX}"
+PKGPATH="gno.land/r/${NAMESPACE}/e2e/storage${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -41,7 +41,7 @@ EOF
 echo -n "   Deploying storage realm... "
 DEPLOY=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH" -pkgdir "$TMPDIR" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/run_tests.sh b/tests/samourai-crew/run_tests.sh
index 2d1a05f..4895ce8 100755
--- a/tests/samourai-crew/run_tests.sh
+++ b/tests/samourai-crew/run_tests.sh
@@ -18,6 +18,7 @@ export GNOKEY_HOME="${GNOKEY_HOME:-/tmp/gnokey}"
 export KEY="runner"
 export PASSWORD="runner1234"
 export KEY_ADDR="${RUNNER_ADDR}"
+export NAMESPACE="${NAMESPACE:-nym-samcrew123}"
 
 # Poll auth/accounts until the account sequence for ADDR is >= EXPECTED.
 # Exits 0 (non-fatal) after 30s even if not reached — tests will surface the real error.
@@ -47,6 +48,38 @@ echo "Mode   : $MODE"
 echo "Runner : $KEY_ADDR"
 echo ""
 
+# --- namespace check/register ---
+check_or_register_namespace() {
+    NAME="$NAMESPACE"
+    RESULT=$(gnokey query vm/qrender \
+        -data "gno.land/r/sys/namereg/v1:${NAME}" \
+        -remote "$REMOTE" 2>&1)
+    if echo "$RESULT" | grep -qF "$KEY_ADDR"; then
+        echo "Namespace ${NAME} already registered."
+        return 0
+    fi
+    echo "Namespace ${NAME} not found, registering..."
+    OUT=$(echo "$PASSWORD" | gnokey maketx call \
+        -pkgpath gno.land/r/sys/namereg/v1 \
+        -func Register \
+        -args "$NAME" \
+        -gas-wanted 50000000 \
+        -gas-fee 1000000ugnot \
+        -broadcast \
+        -chainid "$CHAINID" \
+        -remote "$REMOTE" \
+        -insecure-password-stdin=true \
+        -home "$GNOKEY_HOME" \
+        "$KEY" 2>&1)
+    if echo "$OUT" | grep -q "OK!\|TX HASH"; then
+        echo "Namespace ${NAME} registered."
+    else
+        echo "ERROR: failed to register namespace ${NAME}"
+        echo "$OUT"
+        exit 1
+    fi
+}
+
 # --- connectivity check ---
 echo "Checking connectivity..."
 RETRIES=10
@@ -59,6 +92,7 @@ while [ "$RETRIES" -gt 0 ]; do
     [ "$RETRIES" -eq 0 ] && echo "ERROR: cannot reach $REMOTE" && exit 1
     sleep 3
 done
+check_or_register_namespace
 
 # --- import all keys before CLA signing ---
 import_key() {
@@ -104,7 +138,7 @@ sign_cla() {
         -func "Sign" \
         -args "$CLA_HASH" \
         -gas-fee 1000000ugnot \
-        -gas-wanted 10000000 \
+        -gas-wanted 20000000 \
         -broadcast \
         -chainid "$CHAINID" \
         -remote "$REMOTE" \
@@ -139,6 +173,7 @@ if [ -n "$CLA_HASH" ]; then
 
     if [ "$CLA_SENT" -eq 1 ]; then
         wait_for_sequence_gte "$KEY_ADDR" $((SEQ_BEFORE + 1))
+        sleep 2
     fi
 fi
 echo ""
diff --git a/tests/samourai-crew/security-markdown/audit_md_blockquote.sh b/tests/samourai-crew/security-markdown/audit_md_blockquote.sh
index 481c906..af3de41 100755
--- a/tests/samourai-crew/security-markdown/audit_md_blockquote.sh
+++ b/tests/samourai-crew/security-markdown/audit_md_blockquote.sh
@@ -10,7 +10,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/common.sh"
 
 SUFFIX=$(date +%s)
-PKGPATH="gno.land/r/${KEY_ADDR}/audit/mdbq${SUFFIX}"
+PKGPATH="gno.land/r/${NAMESPACE}/audit/mdbq${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -44,7 +44,7 @@ EOF
 echo -n "   Deploying realm... "
 DEPLOY=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH" -pkgdir "$TMPDIR" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/security-markdown/audit_md_html_inject.sh b/tests/samourai-crew/security-markdown/audit_md_html_inject.sh
index f88b600..a962b7e 100755
--- a/tests/samourai-crew/security-markdown/audit_md_html_inject.sh
+++ b/tests/samourai-crew/security-markdown/audit_md_html_inject.sh
@@ -10,7 +10,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/common.sh"
 
 SUFFIX=$(date +%s)
-PKGPATH="gno.land/r/${KEY_ADDR}/audit/mdhtml${SUFFIX}"
+PKGPATH="gno.land/r/${NAMESPACE}/audit/mdhtml${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -40,7 +40,7 @@ EOF
 echo -n "   Deploying realm... "
 DEPLOY=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH" -pkgdir "$TMPDIR" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/security-markdown/audit_md_image_tracking.sh b/tests/samourai-crew/security-markdown/audit_md_image_tracking.sh
index 8f9394b..f9ef1d7 100755
--- a/tests/samourai-crew/security-markdown/audit_md_image_tracking.sh
+++ b/tests/samourai-crew/security-markdown/audit_md_image_tracking.sh
@@ -11,7 +11,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/common.sh"
 
 SUFFIX=$(date +%s)
-PKGPATH="gno.land/r/${KEY_ADDR}/audit/mdimage${SUFFIX}"
+PKGPATH="gno.land/r/${NAMESPACE}/audit/mdimage${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -41,7 +41,7 @@ EOF
 echo -n "   Deploying realm... "
 DEPLOY=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH" -pkgdir "$TMPDIR" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/security-markdown/audit_md_link_hijack.sh b/tests/samourai-crew/security-markdown/audit_md_link_hijack.sh
index 1567779..28251fe 100755
--- a/tests/samourai-crew/security-markdown/audit_md_link_hijack.sh
+++ b/tests/samourai-crew/security-markdown/audit_md_link_hijack.sh
@@ -11,7 +11,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/common.sh"
 
 SUFFIX=$(date +%s)
-PKGPATH="gno.land/r/${KEY_ADDR}/audit/mdlink${SUFFIX}"
+PKGPATH="gno.land/r/${NAMESPACE}/audit/mdlink${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -41,7 +41,7 @@ EOF
 echo -n "   Deploying realm... "
 DEPLOY=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH" -pkgdir "$TMPDIR" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/security-markdown/audit_md_title_leak.sh b/tests/samourai-crew/security-markdown/audit_md_title_leak.sh
index 350ba59..5cd1192 100755
--- a/tests/samourai-crew/security-markdown/audit_md_title_leak.sh
+++ b/tests/samourai-crew/security-markdown/audit_md_title_leak.sh
@@ -11,7 +11,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/common.sh"
 
 SUFFIX=$(date +%s)
-PKGPATH="gno.land/r/${KEY_ADDR}/audit/mdtitle${SUFFIX}"
+PKGPATH="gno.land/r/${NAMESPACE}/audit/mdtitle${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -42,7 +42,7 @@ EOF
 echo -n "   Deploying realm... "
 DEPLOY=$(echo "$PASSWORD" | gnokey maketx addpkg \
 	-pkgpath "$PKGPATH" -pkgdir "$TMPDIR" \
-	-gas-fee 1000000ugnot -gas-wanted 10000000 \
+	-gas-fee 1000000ugnot -gas-wanted 20000000 \
 	-broadcast -chainid "$CHAINID" -remote "$RPC" \
 	-insecure-password-stdin \
 	-home "$GNOKEY_HOME" \
diff --git a/tests/samourai-crew/security-markdown/common.sh b/tests/samourai-crew/security-markdown/common.sh
index 8afbcb7..1158fcb 100755
--- a/tests/samourai-crew/security-markdown/common.sh
+++ b/tests/samourai-crew/security-markdown/common.sh
@@ -9,3 +9,4 @@ KEY="${KEY:-runner}"
 PASSWORD="${PASSWORD:-runner1234}"
 GNOKEY_HOME="${GNOKEY_HOME:-/tmp/gnokey}"
 KEY_ADDR="${KEY_ADDR:-}"
+NAMESPACE="${NAMESPACE:-${KEY_ADDR}}"
diff --git a/tests/samourai-crew/stress/common.sh b/tests/samourai-crew/stress/common.sh
index b77b882..08dad36 100644
--- a/tests/samourai-crew/stress/common.sh
+++ b/tests/samourai-crew/stress/common.sh
@@ -2,6 +2,8 @@
 # Shared helpers for stress test scripts.
 # REMOTE must be exported by the caller (run_tests.sh via env).
 
+NAMESPACE="${NAMESPACE:-${KEY_ADDR}}"
+
 # Poll vm/qeval until the package is accessible (max 30s).
 # Non-fatal on timeout — the subsequent transactions will surface the real error.
 wait_for_package() {
diff --git a/tests/samourai-crew/stress/sybil_chaos.sh b/tests/samourai-crew/stress/sybil_chaos.sh
index f91ed52..17b718f 100755
--- a/tests/samourai-crew/stress/sybil_chaos.sh
+++ b/tests/samourai-crew/stress/sybil_chaos.sh
@@ -11,7 +11,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/common.sh"
 TX_PER_ACCOUNT="${TX_PER_ACCOUNT:-10}"
 SUFFIX=$(date +%s)
-COUNTER_PKGPATH="gno.land/r/${KEY_ADDR}/stress/chaos${SUFFIX}"
+COUNTER_PKGPATH="gno.land/r/${NAMESPACE}/stress/chaos${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -38,7 +38,7 @@ SEQ_BEFORE="${SEQ_BEFORE:-0}"
 echo "$PASSWORD" | gnokey maketx addpkg \
     -pkgpath "$COUNTER_PKGPATH" \
     -pkgdir "$TMPDIR" \
-    -gas-fee 1000000ugnot -gas-wanted 10000000 \
+    -gas-fee 1000000ugnot -gas-wanted 20000000 \
     -broadcast -chainid "$CHAINID" -remote "$REMOTE" \
     -insecure-password-stdin=true -home "$GNOKEY_HOME" \
     "$KEY" > /dev/null || { echo "FAIL: could not deploy counter"; exit 1; }
diff --git a/tests/samourai-crew/stress/sybil_oog_spam.sh b/tests/samourai-crew/stress/sybil_oog_spam.sh
index d05c00f..1025ffa 100755
--- a/tests/samourai-crew/stress/sybil_oog_spam.sh
+++ b/tests/samourai-crew/stress/sybil_oog_spam.sh
@@ -8,7 +8,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/common.sh"
 TX_PER_ACCOUNT="${TX_PER_ACCOUNT:-10}"
 SUFFIX=$(date +%s)
-COUNTER_PKGPATH="gno.land/r/${KEY_ADDR}/stress/oogspam${SUFFIX}"
+COUNTER_PKGPATH="gno.land/r/${NAMESPACE}/stress/oogspam${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -35,7 +35,7 @@ SEQ_BEFORE="${SEQ_BEFORE:-0}"
 echo "$PASSWORD" | gnokey maketx addpkg \
     -pkgpath "$COUNTER_PKGPATH" \
     -pkgdir "$TMPDIR" \
-    -gas-fee 1000000ugnot -gas-wanted 10000000 \
+    -gas-fee 1000000ugnot -gas-wanted 20000000 \
     -broadcast -chainid "$CHAINID" -remote "$REMOTE" \
     -insecure-password-stdin=true -home "$GNOKEY_HOME" \
     "$KEY" > /dev/null || { echo "FAIL: could not deploy counter"; exit 1; }
diff --git a/tests/samourai-crew/stress/sybil_panic_spam.sh b/tests/samourai-crew/stress/sybil_panic_spam.sh
index 8f5a275..2bc48ea 100755
--- a/tests/samourai-crew/stress/sybil_panic_spam.sh
+++ b/tests/samourai-crew/stress/sybil_panic_spam.sh
@@ -8,8 +8,8 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/common.sh"
 TX_PER_ACCOUNT="${TX_PER_ACCOUNT:-10}"
 SUFFIX=$(date +%s)
-BOOM_PKGPATH="gno.land/r/${KEY_ADDR}/stress/panicspam${SUFFIX}"
-COUNTER_PKGPATH="gno.land/r/${KEY_ADDR}/stress/panicspamcounter${SUFFIX}"
+BOOM_PKGPATH="gno.land/r/${NAMESPACE}/stress/panicspam${SUFFIX}"
+COUNTER_PKGPATH="gno.land/r/${NAMESPACE}/stress/panicspamcounter${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -43,7 +43,7 @@ SEQ_BEFORE="${SEQ_BEFORE:-0}"
 echo "$PASSWORD" | gnokey maketx addpkg \
     -pkgpath "$BOOM_PKGPATH" \
     -pkgdir "$TMPDIR/boom" \
-    -gas-fee 1000000ugnot -gas-wanted 10000000 \
+    -gas-fee 1000000ugnot -gas-wanted 20000000 \
     -broadcast -chainid "$CHAINID" -remote "$REMOTE" \
     -insecure-password-stdin=true -home "$GNOKEY_HOME" \
     "$KEY" > /dev/null || { echo "FAIL: could not deploy boom realm"; exit 1; }
@@ -60,7 +60,7 @@ SEQ_BEFORE="${SEQ_BEFORE:-0}"
 echo "$PASSWORD" | gnokey maketx addpkg \
     -pkgpath "$COUNTER_PKGPATH" \
     -pkgdir "$TMPDIR/counter" \
-    -gas-fee 1000000ugnot -gas-wanted 10000000 \
+    -gas-fee 1000000ugnot -gas-wanted 20000000 \
     -broadcast -chainid "$CHAINID" -remote "$REMOTE" \
     -insecure-password-stdin=true -home "$GNOKEY_HOME" \
     "$KEY" > /dev/null || { echo "FAIL: could not deploy counter"; exit 1; }
diff --git a/tests/samourai-crew/stress/sybil_precision.sh b/tests/samourai-crew/stress/sybil_precision.sh
index 7bf2444..6d33735 100644
--- a/tests/samourai-crew/stress/sybil_precision.sh
+++ b/tests/samourai-crew/stress/sybil_precision.sh
@@ -8,7 +8,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 TX_PER_ACCOUNT="${TX_PER_ACCOUNT:-10}"
 TX_DELAY="${TX_DELAY:-0.8}"
 SUFFIX=$(date +%s)
-COUNTER_PKGPATH="gno.land/r/${KEY_ADDR}/stress/precision${SUFFIX}"
+COUNTER_PKGPATH="gno.land/r/${NAMESPACE}/stress/precision${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -34,7 +34,7 @@ SEQ_BEFORE="${SEQ_BEFORE:-0}"
 echo "$PASSWORD" | gnokey maketx addpkg \
     -pkgpath "$COUNTER_PKGPATH" \
     -pkgdir "$TMPDIR" \
-    -gas-fee 1000000ugnot -gas-wanted 10000000 \
+    -gas-fee 1000000ugnot -gas-wanted 20000000 \
     -broadcast -chainid "$CHAINID" -remote "$REMOTE" \
     -insecure-password-stdin=true -home "$GNOKEY_HOME" \
     "$KEY" > /dev/null || { echo "FAIL: could not deploy counter"; exit 1; }
diff --git a/tests/samourai-crew/stress/sybil_salted_chaos.sh b/tests/samourai-crew/stress/sybil_salted_chaos.sh
index 6e760ff..8c05812 100755
--- a/tests/samourai-crew/stress/sybil_salted_chaos.sh
+++ b/tests/samourai-crew/stress/sybil_salted_chaos.sh
@@ -7,7 +7,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 . "$SCRIPT_DIR/common.sh"
 TX_PER_ACCOUNT="${TX_PER_ACCOUNT:-10}"
 SUFFIX=$(date +%s)
-COUNTER_PKGPATH="gno.land/r/${KEY_ADDR}/stress/salted${SUFFIX}"
+COUNTER_PKGPATH="gno.land/r/${NAMESPACE}/stress/salted${SUFFIX}"
 TMPDIR=$(mktemp -d)
 trap 'rm -rf "$TMPDIR"' EXIT
 
@@ -33,7 +33,7 @@ SEQ_BEFORE="${SEQ_BEFORE:-0}"
 echo "$PASSWORD" | gnokey maketx addpkg \
     -pkgpath "$COUNTER_PKGPATH" \
     -pkgdir "$TMPDIR" \
-    -gas-fee 1000000ugnot -gas-wanted 10000000 \
+    -gas-fee 1000000ugnot -gas-wanted 20000000 \
     -broadcast -chainid "$CHAINID" -remote "$REMOTE" \
     -insecure-password-stdin=true -home "$GNOKEY_HOME" \
     "$KEY" > /dev/null || { echo "FAIL: could not deploy counter"; exit 1; }