diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b17811f..797572f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -16,7 +16,7 @@ grpc-netty = "1.55.1"
 grpc-services = "1.55.1"
 koin = "3.4.0"
 rsocket = "0.15.4"
-rsproto = "0.5.2"
+rsproto = "0.6.3"
 ksp = "1.9.21-1.0.16"
 koin-annotations = "1.3.0"
 
@@ -84,9 +84,9 @@ vanniktech-maven-publish = { module = "com.vanniktech.maven.publish:com.vannikte
 
 kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 
-timemates-rsproto-server = { module = "io.timemates.rsproto:server-core", version.ref = "rsproto" }
-timemates-rsproto-client = { module = "io.timemates.rsproto:client-core", version.ref = "rsproto" }
-timemates-rsproto-common = { module = "io.timemates.rsproto:common-core", version.ref = "rsproto" }
+timemates-rsproto-server = { module = "org.timemates.rsproto:server-core", version.ref = "rsproto" }
+timemates-rsproto-client = { module = "org.timemates.rsproto:client-core", version.ref = "rsproto" }
+timemates-rsproto-common = { module = "org.timemates.rsproto:common-core", version.ref = "rsproto" }
 
 [plugins]
 kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
@@ -96,5 +96,5 @@ cashapp-sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
 shadow-jar = { id = "com.github.johnrengelman.shadow", version.require = "8.1.1" }
 jvm-module-convention = { id = "jvm-module-convention", version.require = "SNAPSHOT" }
 conventions-multiplatform-library = { id = "multiplatform-library-convention", version.require = "SNAPSHOT" }
-timemates-rsproto = { id = "io.timemates.rsproto", version.ref = "rsproto" }
+timemates-rsproto = { id = "org.timemates.rsproto", version.ref = "rsproto" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 9ae3b51..89a67a6 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,7 +7,7 @@ dependencyResolutionManagement {
         mavenCentral()
         maven("https://jitpack.io")
         maven("https://maven.y9vad9.com")
-        maven("https://maven.timemates.io")
+        maven("https://maven.timemates.org")
     }
 }
 
@@ -17,7 +17,7 @@ pluginManagement {
         mavenCentral()
         google()
         maven("https://maven.y9vad9.com")
-        maven("https://maven.timemates.io")
+        maven("https://maven.timemates.org")
     }
 }