diff --git a/.gitmodules b/.gitmodules
index 766df6a..a669d6e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "uniffi-bindgen-cs/servicepoint-binding-uniffi"]
-	path = uniffi-bindgen-cs/servicepoint-binding-uniffi
-	url = https://git.berlin.ccc.de/servicepoint/servicepoint-binding-uniffi
 [submodule "servicepoint-binding-uniffi"]
 	path = servicepoint-binding-uniffi
 	url = https://git.berlin.ccc.de/servicepoint/servicepoint-binding-uniffi
diff --git a/Cargo.lock b/Cargo.lock
index 6b420cc..5f8a1c9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -612,8 +612,16 @@ dependencies = [
  "servicepoint",
  "thiserror 2.0.11",
  "uniffi",
- "uniffi-bindgen-cs 0.8.3+v0.25.0",
- "uniffi-bindgen-go",
+]
+
+[[package]]
+name = "servicepoint_binding_uniffi"
+version = "0.13.1"
+source = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-binding-uniffi.git?rev=1169d9f1d294268f699e9c4e088cb1d97d6c36ce#1169d9f1d294268f699e9c4e088cb1d97d6c36ce"
+dependencies = [
+ "servicepoint",
+ "thiserror 2.0.11",
+ "uniffi",
 ]
 
 [[package]]
@@ -796,62 +804,17 @@ dependencies = [
  "serde_json",
  "textwrap",
  "toml",
- "uniffi_bindgen 0.25.0 (git+https://github.com/NordSecurity/uniffi-bindgen-cs?rev=f68639fbc720b50ebe561ba75c66c84dc456bdce)",
+ "uniffi_bindgen 0.25.0",
 ]
 
 [[package]]
 name = "uniffi-bindgen-cs"
 version = "0.13.1"
 dependencies = [
+ "servicepoint_binding_uniffi 0.13.1 (git+https://git.berlin.ccc.de/servicepoint/servicepoint-binding-uniffi.git?rev=1169d9f1d294268f699e9c4e088cb1d97d6c36ce)",
  "uniffi-bindgen-cs 0.8.3+v0.25.0",
 ]
 
-[[package]]
-name = "uniffi-bindgen-go"
-version = "0.2.2+v0.25.0"
-source = "git+https://github.com/NordSecurity/uniffi-bindgen-go.git?rev=ba23bab72f1a9bcc39ce81924d3d9265598e017c#ba23bab72f1a9bcc39ce81924d3d9265598e017c"
-dependencies = [
- "anyhow",
- "askama 0.12.1",
- "camino",
- "cargo_metadata",
- "clap",
- "extend",
- "fs-err",
- "heck",
- "paste",
- "serde",
- "serde_json",
- "textwrap",
- "toml",
- "uniffi_bindgen 0.25.0 (git+https://github.com/NordSecurity/uniffi-bindgen-go.git?rev=ba23bab72f1a9bcc39ce81924d3d9265598e017c)",
- "uniffi_meta 0.25.0 (git+https://github.com/NordSecurity/uniffi-bindgen-go.git?rev=ba23bab72f1a9bcc39ce81924d3d9265598e017c)",
- "uniffi_udl 0.25.0 (git+https://github.com/NordSecurity/uniffi-bindgen-go.git?rev=ba23bab72f1a9bcc39ce81924d3d9265598e017c)",
-]
-
-[[package]]
-name = "uniffi_bindgen"
-version = "0.25.0"
-source = "git+https://github.com/NordSecurity/uniffi-bindgen-go.git?rev=ba23bab72f1a9bcc39ce81924d3d9265598e017c#ba23bab72f1a9bcc39ce81924d3d9265598e017c"
-dependencies = [
- "anyhow",
- "askama 0.12.1",
- "camino",
- "cargo_metadata",
- "fs-err",
- "glob",
- "goblin",
- "heck",
- "once_cell",
- "paste",
- "serde",
- "textwrap",
- "toml",
- "uniffi_meta 0.25.0 (git+https://github.com/NordSecurity/uniffi-bindgen-go.git?rev=ba23bab72f1a9bcc39ce81924d3d9265598e017c)",
- "uniffi_testing 0.25.0 (git+https://github.com/NordSecurity/uniffi-bindgen-go.git?rev=ba23bab72f1a9bcc39ce81924d3d9265598e017c)",
- "uniffi_udl 0.25.0 (git+https://github.com/NordSecurity/uniffi-bindgen-go.git?rev=ba23bab72f1a9bcc39ce81924d3d9265598e017c)",
-]
-
 [[package]]
 name = "uniffi_bindgen"
 version = "0.25.0"
@@ -870,9 +833,9 @@ dependencies = [
  "serde",
  "textwrap",
  "toml",
- "uniffi_meta 0.25.0 (git+https://github.com/NordSecurity/uniffi-bindgen-cs?rev=f68639fbc720b50ebe561ba75c66c84dc456bdce)",
- "uniffi_testing 0.25.0 (git+https://github.com/NordSecurity/uniffi-bindgen-cs?rev=f68639fbc720b50ebe561ba75c66c84dc456bdce)",
- "uniffi_udl 0.25.0 (git+https://github.com/NordSecurity/uniffi-bindgen-cs?rev=f68639fbc720b50ebe561ba75c66c84dc456bdce)",
+ "uniffi_meta 0.25.0",
+ "uniffi_testing 0.25.0",
+ "uniffi_udl 0.25.0",
 ]
 
 [[package]]
@@ -909,15 +872,6 @@ dependencies = [
  "uniffi_bindgen 0.25.3",
 ]
 
-[[package]]
-name = "uniffi_checksum_derive"
-version = "0.25.0"
-source = "git+https://github.com/NordSecurity/uniffi-bindgen-go.git?rev=ba23bab72f1a9bcc39ce81924d3d9265598e017c#ba23bab72f1a9bcc39ce81924d3d9265598e017c"
-dependencies = [
- "quote",
- "syn 2.0.96",
-]
-
 [[package]]
 name = "uniffi_checksum_derive"
 version = "0.25.0"
@@ -972,17 +926,6 @@ dependencies = [
  "uniffi_meta 0.25.3",
 ]
 
-[[package]]
-name = "uniffi_meta"
-version = "0.25.0"
-source = "git+https://github.com/NordSecurity/uniffi-bindgen-go.git?rev=ba23bab72f1a9bcc39ce81924d3d9265598e017c#ba23bab72f1a9bcc39ce81924d3d9265598e017c"
-dependencies = [
- "anyhow",
- "bytes",
- "siphasher",
- "uniffi_checksum_derive 0.25.0 (git+https://github.com/NordSecurity/uniffi-bindgen-go.git?rev=ba23bab72f1a9bcc39ce81924d3d9265598e017c)",
-]
-
 [[package]]
 name = "uniffi_meta"
 version = "0.25.0"
@@ -991,7 +934,7 @@ dependencies = [
  "anyhow",
  "bytes",
  "siphasher",
- "uniffi_checksum_derive 0.25.0 (git+https://github.com/NordSecurity/uniffi-bindgen-cs?rev=f68639fbc720b50ebe561ba75c66c84dc456bdce)",
+ "uniffi_checksum_derive 0.25.0",
 ]
 
 [[package]]
@@ -1006,18 +949,6 @@ dependencies = [
  "uniffi_checksum_derive 0.25.3",
 ]
 
-[[package]]
-name = "uniffi_testing"
-version = "0.25.0"
-source = "git+https://github.com/NordSecurity/uniffi-bindgen-go.git?rev=ba23bab72f1a9bcc39ce81924d3d9265598e017c#ba23bab72f1a9bcc39ce81924d3d9265598e017c"
-dependencies = [
- "anyhow",
- "camino",
- "cargo_metadata",
- "fs-err",
- "once_cell",
-]
-
 [[package]]
 name = "uniffi_testing"
 version = "0.25.0"
@@ -1043,25 +974,14 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "uniffi_udl"
-version = "0.25.0"
-source = "git+https://github.com/NordSecurity/uniffi-bindgen-go.git?rev=ba23bab72f1a9bcc39ce81924d3d9265598e017c#ba23bab72f1a9bcc39ce81924d3d9265598e017c"
-dependencies = [
- "anyhow",
- "uniffi_meta 0.25.0 (git+https://github.com/NordSecurity/uniffi-bindgen-go.git?rev=ba23bab72f1a9bcc39ce81924d3d9265598e017c)",
- "uniffi_testing 0.25.0 (git+https://github.com/NordSecurity/uniffi-bindgen-go.git?rev=ba23bab72f1a9bcc39ce81924d3d9265598e017c)",
- "weedle2 4.0.0 (git+https://github.com/NordSecurity/uniffi-bindgen-go.git?rev=ba23bab72f1a9bcc39ce81924d3d9265598e017c)",
-]
-
 [[package]]
 name = "uniffi_udl"
 version = "0.25.0"
 source = "git+https://github.com/NordSecurity/uniffi-bindgen-cs?rev=f68639fbc720b50ebe561ba75c66c84dc456bdce#f68639fbc720b50ebe561ba75c66c84dc456bdce"
 dependencies = [
  "anyhow",
- "uniffi_meta 0.25.0 (git+https://github.com/NordSecurity/uniffi-bindgen-cs?rev=f68639fbc720b50ebe561ba75c66c84dc456bdce)",
- "uniffi_testing 0.25.0 (git+https://github.com/NordSecurity/uniffi-bindgen-cs?rev=f68639fbc720b50ebe561ba75c66c84dc456bdce)",
+ "uniffi_meta 0.25.0",
+ "uniffi_testing 0.25.0",
  "weedle2 4.0.0 (git+https://github.com/NordSecurity/uniffi-bindgen-cs?rev=f68639fbc720b50ebe561ba75c66c84dc456bdce)",
 ]
 
@@ -1098,14 +1018,6 @@ dependencies = [
  "nom",
 ]
 
-[[package]]
-name = "weedle2"
-version = "4.0.0"
-source = "git+https://github.com/NordSecurity/uniffi-bindgen-go.git?rev=ba23bab72f1a9bcc39ce81924d3d9265598e017c#ba23bab72f1a9bcc39ce81924d3d9265598e017c"
-dependencies = [
- "nom",
-]
-
 [[package]]
 name = "weedle2"
 version = "4.0.0"
diff --git a/servicepoint-binding-uniffi b/servicepoint-binding-uniffi
index c6d2ee6..1169d9f 160000
--- a/servicepoint-binding-uniffi
+++ b/servicepoint-binding-uniffi
@@ -1 +1 @@
-Subproject commit c6d2ee6fe1edcbc630ce654e93cf94f510b19f7a
+Subproject commit 1169d9f1d294268f699e9c4e088cb1d97d6c36ce