diff --git a/build.rs b/build.rs
index 18bca34..32f9c58 100644
--- a/build.rs
+++ b/build.rs
@@ -27,7 +27,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         // Make all messages serde-serializable.
         .type_attribute(".", "#[derive(serde::Serialize,serde::Deserialize)]")
         // Compiling protos using path on build time.
-        .compile_protos(&["proto/core/proxy.proto"], &["proto/core"])?;
+        .compile_protos(
+            &[
+                "proto/v2/proxy.proto",
+                "proto/v2/common.proto",
+                "proto/common/client_types.proto",
+            ],
+            &["proto"],
+        )?;
 
     println!("cargo:rerun-if-changed=proto");
     Ok(())
diff --git a/flake.lock b/flake.lock
index 0830d0e..f528663 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1771848320,
-        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
+        "lastModified": 1774106199,
+        "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
+        "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
         "type": "github"
       },
       "original": {
@@ -48,11 +48,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771988922,
-        "narHash": "sha256-Fc6FHXtfEkLtuVJzd0B6tFYMhmcPLuxr90rWfb/2jtQ=",
+        "lastModified": 1774408260,
+        "narHash": "sha256-Jn9d9r85dmf3gTMnSRt6t+DP2nQ5uJns/MMXg2FpzfM=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "f4443dc3f0b6c5e6b77d923156943ce816d1fcb9",
+        "rev": "d6471ee5a8f470251e6e5b83a20a182eb6c46c9b",
         "type": "github"
       },
       "original": {
diff --git a/proto b/proto
index f600c25..7adfe3b 160000
--- a/proto
+++ b/proto
@@ -1 +1 @@
-Subproject commit f600c25c2715d798225cc2441c4f79fdbba48af8
+Subproject commit 7adfe3bfd1b7b701e58d25ddadd0c0c7a4a3e046
diff --git a/src/enterprise/handlers/desktop_client_mfa.rs b/src/enterprise/handlers/desktop_client_mfa.rs
index f366898..9b65cbe 100644
--- a/src/enterprise/handlers/desktop_client_mfa.rs
+++ b/src/enterprise/handlers/desktop_client_mfa.rs
@@ -80,8 +80,6 @@ pub(super) async fn mfa_auth_callback(
         code: payload.code,
         nonce,
         state: payload.state,
-        #[allow(deprecated)]
-        callback_url: String::new(),
     };
 
     debug!("Sending MFA OIDC authenticate request to core service");
diff --git a/src/enterprise/handlers/openid_login.rs b/src/enterprise/handlers/openid_login.rs
index 1a6badc..6f59d4b 100644
--- a/src/enterprise/handlers/openid_login.rs
+++ b/src/enterprise/handlers/openid_login.rs
@@ -164,8 +164,6 @@ async fn auth_callback(
     let request = AuthCallbackRequest {
         code: payload.code,
         nonce,
-        #[allow(deprecated)]
-        callback_url: String::new(),
     };
 
     let rx = state
diff --git a/src/lib.rs b/src/lib.rs
index 9920f3f..ff93efe 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -16,8 +16,30 @@ pub mod http;
 pub mod logging;
 mod setup;
 
+pub(crate) mod generated {
+    pub(crate) mod defguard {
+        pub(crate) mod proxy {
+            pub(crate) mod v2 {
+                tonic::include_proto!("defguard.proxy.v2");
+            }
+        }
+
+        pub(crate) mod common {
+            pub(crate) mod v2 {
+                tonic::include_proto!("defguard.common.v2");
+            }
+        }
+
+        pub mod client_types {
+            tonic::include_proto!("defguard.client_types");
+        }
+    }
+}
+
 pub(crate) mod proto {
-    tonic::include_proto!("defguard.proxy");
+    pub(crate) use crate::generated::defguard::client_types::*;
+    pub(crate) use crate::generated::defguard::common::v2::*;
+    pub(crate) use crate::generated::defguard::proxy::v2::*;
 }
 
 #[macro_use]