diff --git a/.gitmodules b/.gitmodules
index ed949b9..63e8a6b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "proto"]
-	path = s2-internal/src/main/proto
-	url = https://github.com/s2-streamstore/s2-protos.git
+[submodule "s2-specs"]
+	path = s2-specs
+	url = https://github.com/s2-streamstore/s2-specs.git
diff --git a/s2-internal/build.gradle.kts b/s2-internal/build.gradle.kts
index a20c9e6..8d58444 100644
--- a/s2-internal/build.gradle.kts
+++ b/s2-internal/build.gradle.kts
@@ -32,6 +32,14 @@ dependencies {
     testRuntimeOnly(libs.junit.platform.launcher)
 }
 
+sourceSets {
+    main {
+        proto {
+            srcDir("../s2-specs/s2")
+        }
+    }
+}
+
 val protobufVersion: String = libs.versions.protobuf.get()
 val grpcVersion: String = libs.versions.grpc.get()
 protobuf {
diff --git a/s2-internal/src/main/proto b/s2-internal/src/main/proto
deleted file mode 160000
index b6add44..0000000
--- a/s2-internal/src/main/proto
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b6add440765c24318a61c3d3c47efaf909844b9d
diff --git a/s2-specs b/s2-specs
new file mode 160000
index 0000000..e1a7889
--- /dev/null
+++ b/s2-specs
@@ -0,0 +1 @@
+Subproject commit e1a788928c5e48efa38e0f266b92ccaf7c6747aa