diff --git a/snapcraft.yaml b/snapcraft.yaml
index eeeb986ad..9e4b0435a 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1393,6 +1393,8 @@ parts:
 
       git cherry-pick -x 2f7c7cd501d9b1b84daeb4deb95b67ebe3de1193 # lxd/instance/exec: Only use keepalives on TCP sockets
       git cherry-pick -x 5b44f9a5d9218e60f75ce5abdc6705b11121d1b7 # gomod: Revert github.com/gorilla/websocket to v1.5.1
+      git cherry-pick -x 7e468c7cb5b59e67189d0b7141007303b5f74140 # lxd: Extract certificate add token metadata from remote member
+      git cherry-pick -x af70982132866ffb9feb0f543b625abb238eb17a # lxd: Return an error if the client uses a trust password
 
       # Setup build environment
       export GOPATH="$(realpath ./.go)"