diff --git a/MAVSDK_SERVER_VERSION b/MAVSDK_SERVER_VERSION
index c0c4025..130165b 100644
--- a/MAVSDK_SERVER_VERSION
+++ b/MAVSDK_SERVER_VERSION
@@ -1 +1 @@
-v3.5.0
+v3.6.0
diff --git a/proto b/proto
index e053eca..20aa335 160000
--- a/proto
+++ b/proto
@@ -1 +1 @@
-Subproject commit e053ecabc5b825bb9c831f3f31ab24ff727ce1e6
+Subproject commit 20aa335ef85b50d844ffb3d3a53420c6fbcc289b