diff --git a/client b/client
index 0ab21a07..7687c805 160000
--- a/client
+++ b/client
@@ -1 +1 @@
-Subproject commit 0ab21a0764728c47baa6c5ebf2fc51ea7d35f1e7
+Subproject commit 7687c805242841e800cece78d04ce0a29c42819e
diff --git a/client-gui2 b/client-gui2
index e7151989..957ad911 160000
--- a/client-gui2
+++ b/client-gui2
@@ -1 +1 @@
-Subproject commit e715198949162cf08be9570995036931c81c67a7
+Subproject commit 957ad911eb37ba3b72650e39956c1d96735dac05
diff --git a/server b/server
index cac5233a..cc585a2a 160000
--- a/server
+++ b/server
@@ -1 +1 @@
-Subproject commit cac5233a110d778f5e9467131ffddc02e9e14cb2
+Subproject commit cc585a2a9c7be3e3dfe4ab1fcfeafb7a79ef4864
diff --git a/web/src/lib.rs b/web/src/lib.rs
index 7687e797..e59ceba1 100644
--- a/web/src/lib.rs
+++ b/web/src/lib.rs
@@ -22,12 +22,7 @@ mod grpc_error;
 #[path = "../../common/src/system_column.rs"]
 #[allow(dead_code)]
 mod system_column;
-mod analytics {
-    include!(concat!(
-        env!("CARGO_MANIFEST_DIR"),
-        "/../common/src/proto/komp_ac.analytics.rs"
-    ));
-}
+use common::proto::komp_ac::analytics;
 mod auth {
     include!(concat!(
         env!("CARGO_MANIFEST_DIR"),