diff --git a/home.admin/config.scripts/cl-plugin.cln-grpc.sh b/home.admin/config.scripts/cl-plugin.cln-grpc.sh
index a9f4c1ddc..408156fda 100644
--- a/home.admin/config.scripts/cl-plugin.cln-grpc.sh
+++ b/home.admin/config.scripts/cl-plugin.cln-grpc.sh
@@ -47,7 +47,7 @@ elif [ "$1" = on ]; then
    /home/bitcoin/${netprefix}cl-plugins-enabled/
 
   # blitz.conf.sh set [key] [value] [?conffile] <noquotes>
-  /home/admin/config.scripts/blitz.conf.sh set "grpc-port" "${PORT}" "${CLCONF}" noquotes
+  /home/admin/config.scripts/blitz.conf.sh set "grpc-port" "${PORT}" "${CLCONF}" "noquotes"
   /home/admin/config.scripts/blitz.conf.sh set "${netprefix}clnGRPCport" "${PORT}"
 
   # firewall
@@ -58,12 +58,12 @@ elif [ "$1" = on ]; then
 
 elif [ "$1" = off ]; then
   sed -i "/^grpc-port/d" "${CLCONF}"
-  rm -rf /home/bitcoin/${netprefix}cl-plugins-enabled/cln-grpc
-  /home/admin/config.scripts/blitz.conf.sh set ${netprefix}cln-grpc-port "off"
+  sudo rm -rf /home/bitcoin/${netprefix}cl-plugins-enabled/cln-grpc
+  /home/admin/config.scripts/blitz.conf.sh set "${netprefix}clnGRPCport" "off"
   # firewall
-  sudo ufw deny "${PORT}" comment "clnGRPCport"
+  sudo ufw deny "${PORT}" comment "${netprefix}clnGRPCport"
   # Tor
-  /home/admin/config.scripts/tor.onion-service.sh off ${netprefix}cln-grpc-port
+  /home/admin/config.scripts/tor.onion-service.sh off "${netprefix}clnGRPCport"
   exit 0
 
 else
diff --git a/home.admin/config.scripts/cl.install.sh b/home.admin/config.scripts/cl.install.sh
index 656d13d93..4d178e0a9 100644
--- a/home.admin/config.scripts/cl.install.sh
+++ b/home.admin/config.scripts/cl.install.sh
@@ -392,7 +392,7 @@ alias ${netprefix}clconf=\"sudo\
     /home/admin/config.scripts/blitz.conf.sh set ${netprefix}feeadjuster "off"
   fi
   if [ ! -f /home/bitcoin/${netprefix}cl-plugins-enabled/cln-grpc ];then
-    /home/admin/config.scripts/blitz.conf.sh set ${netprefix}cln-grpc "off"
+    /home/admin/config.scripts/blitz.conf.sh set "${netprefix}clnGRPCport" "off"
   fi
 
   # if this is the first lightning mainnet turned on - make default