diff --git a/.gitmodules b/.gitmodules
index 9fab0f5..d2e3d12 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,15 +2,12 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-[submodule "webapp/zenflows-crypto"]
-	path = webapp/zenflows-crypto
-	url = https://github.com/interfacerproject/zenflows-crypto
 [submodule "webapp/client_zencode"]
 	path = webapp/client_zencode
 	url = https://github.com/ForkbombEu/client_zencode
 [submodule "webapp/src/lib/openid-vc-typescript-json-schema"]
 	path = webapp/src/lib/openid-vc-typescript-json-schema
 	url = https://github.com/ForkbombEu/openid-vc-typescript-json-schema
-[submodule "pkg/internal/pb/zenflows-crypto"]
-	path = pkg/internal/pb/zenflows-crypto
-	url = https://github.com/interfacerproject/zenflows-crypto
+[submodule "pkg/internal/pb/client_zencode"]
+	path = pkg/internal/pb/client_zencode
+	url = https://github.com/ForkbombEu/client_zencode
diff --git a/pkg/internal/pb/client_zencode b/pkg/internal/pb/client_zencode
new file mode 160000
index 0000000..15a60d0
--- /dev/null
+++ b/pkg/internal/pb/client_zencode
@@ -0,0 +1 @@
+Subproject commit 15a60d0158db979af0c3f69ce7a8e0a52ef54fce
diff --git a/pkg/internal/pb/zencode.go b/pkg/internal/pb/zencode.go
index 5c973eb..4f5647d 100644
--- a/pkg/internal/pb/zencode.go
+++ b/pkg/internal/pb/zencode.go
@@ -8,10 +8,10 @@ import (
 	slangroom "github.com/dyne/slangroom-exec/bindings/go"
 )
 
-//go:embed zenflows-crypto/src/keypairoomServer-6-7.zen
+//go:embed client_zencode/keypairoom/keypairoomServer-6-7.zen
 var KEYPAIROOM_ZENCODE string
 
-//go:embed zenflows-crypto/src/pubkeys-request-signed-02-24.zen
+//go:embed client_zencode/keypairoom/pubkeys-request-signed-02-24.zen
 var PUBKEYS_REQUEST_SIGNED_ZENCODE string
 
 func KeypairoomServer(conf *KeypairoomConfig, data map[string]interface{}) (string, error) {
diff --git a/pkg/internal/pb/zenflows-crypto b/pkg/internal/pb/zenflows-crypto
deleted file mode 160000
index 0ffcce9..0000000
--- a/pkg/internal/pb/zenflows-crypto
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0ffcce9b90799c9cb61f11fc594aeb513a01326f