diff --git a/.gitmodules b/.gitmodules
index 1c0b1d97..6bbdd2fa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,8 +4,8 @@
 	branch = main
 [submodule "nymea-remoteproxy"]
 	path = nymea-remoteproxy
-	url = https://github.com/guh/nymea-remoteproxy.git
-	branch = master
+	url = https://github.com/nymea/nymea-remoteproxy.git
+	branch = qt6-cmake
 [submodule "android_openssl"]
 	path = 3rdParty/android/android_openssl
 	url = https://github.com/KDAB/android_openssl.git
diff --git a/nymea-remoteproxy b/nymea-remoteproxy
index 9fba0847..a345a418 160000
--- a/nymea-remoteproxy
+++ b/nymea-remoteproxy
@@ -1 +1 @@
-Subproject commit 9fba08477f507ae15b2909cf637c31a74a9c5028
+Subproject commit a345a4183ad22c8878dd2d49d846c28815a0fd0d