diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index b64313f92d..be4d238c7b 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -134,7 +134,7 @@ jobs:
                 elif [ '${{ matrix.os }}' == 'macOS' ]; then
                   [ $RC -eq 0 ] || _run sudo cat /Library/Logs/Multipass/multipassd.log
                   # Authenticate the root user
-                  _run sudo $MP set local.passphrase=foobar || true
+                  _run $MP set local.passphrase=foobar || true
                   _run sudo $MP authenticate foobar || true
                   ( echo y; echo y ) | _run sudo PATH=/bin:/usr/local/bin /bin/sh "/Library/Application\\ Support/com.canonical.multipass/uninstall.sh" || true
                   _run sudo rm -rf /Library/Logs/Multipass
@@ -177,7 +177,7 @@ jobs:
               fi
 
               _retry_grep 12 5 "multipassd" _run $MP version
-              _run ${{ matrix.os != 'Windows' && 'sudo' || '' }} $MP set local.driver=${{ matrix.driver }}
+              _run $MP set local.driver=${{ matrix.driver }}
 
               # Give multipassd time to settle (#1995)
               _retry_grep 12 5 "\w,lts\W" _run $MP find
diff --git a/src/daemon/daemon_rpc.cpp b/src/daemon/daemon_rpc.cpp
index 95706b04b7..b2717537dc 100644
--- a/src/daemon/daemon_rpc.cpp
+++ b/src/daemon/daemon_rpc.cpp
@@ -323,13 +323,13 @@ grpc::Status mp::DaemonRpc::verify_client_and_dispatch_operation(OperationSignal
 grpc::Status mp::DaemonRpc::set(grpc::ServerContext* context, const SetRequest* request,
                                 grpc::ServerWriter<SetReply>* response)
 {
-    return emit_signal_and_wait_for_result(
-        std::bind(&DaemonRpc::on_set, this, request, response, std::placeholders::_1));
+    return verify_client_and_dispatch_operation(
+        std::bind(&DaemonRpc::on_set, this, request, response, std::placeholders::_1), client_cert_from(context));
 }
 
 grpc::Status mp::DaemonRpc::keys(grpc::ServerContext* context, const KeysRequest* request,
                                  grpc::ServerWriter<KeysReply>* response)
 {
-    return emit_signal_and_wait_for_result(
-        std::bind(&DaemonRpc::on_keys, this, request, response, std::placeholders::_1));
+    return verify_client_and_dispatch_operation(
+        std::bind(&DaemonRpc::on_keys, this, request, response, std::placeholders::_1), client_cert_from(context));
 }