diff --git a/src/main/java/io/kamax/matrix/MatrixPath.java b/src/main/java/io/kamax/matrix/MatrixPath.java
index 89e799b..7cc421a 100644
--- a/src/main/java/io/kamax/matrix/MatrixPath.java
+++ b/src/main/java/io/kamax/matrix/MatrixPath.java
@@ -53,7 +53,7 @@ public class MatrixPath {
     }
 
     public static MatrixPath clientR0() {
-        return client().add("r0");
+        return client().add("v3");
     }
 
     private StringBuilder path = new StringBuilder();
diff --git a/src/main/java/io/kamax/matrix/client/AMatrixHttpClient.java b/src/main/java/io/kamax/matrix/client/AMatrixHttpClient.java
index 72bad39..fa889ac 100644
--- a/src/main/java/io/kamax/matrix/client/AMatrixHttpClient.java
+++ b/src/main/java/io/kamax/matrix/client/AMatrixHttpClient.java
@@ -375,13 +375,13 @@ public abstract class AMatrixHttpClient implements _MatrixClientRaw {
     }
 
     protected HttpUrl.Builder getClientPathBuilder(String... segments) {
-        String[] base = { "client", "r0" };
+        String[] base = { "client", "v3" };
         segments = ArrayUtils.addAll(base, segments);
         return getPathBuilder(segments);
     }
 
     protected HttpUrl.Builder getMediaPathBuilder(String... segments) {
-        String[] base = { "media", "r0" };
+        String[] base = { "media", "v3" };
         segments = ArrayUtils.addAll(base, segments);
         return getPathBuilder(segments);
     }
diff --git a/src/main/java/io/kamax/mxisd/http/undertow/handler/auth/v1/LoginHandler.java b/src/main/java/io/kamax/mxisd/http/undertow/handler/auth/v1/LoginHandler.java
index afdca34..4924582 100644
--- a/src/main/java/io/kamax/mxisd/http/undertow/handler/auth/v1/LoginHandler.java
+++ b/src/main/java/io/kamax/mxisd/http/undertow/handler/auth/v1/LoginHandler.java
@@ -24,6 +24,6 @@ import io.kamax.mxisd.http.undertow.handler.BasicHttpHandler;
 
 public abstract class LoginHandler extends BasicHttpHandler {
 
-    public static final String Path = "/_matrix/client/r0/login";
+    public static final String Path = "/_matrix/client/v3/login";
 
 }
diff --git a/src/main/java/io/kamax/mxisd/http/undertow/handler/directory/v1/UserDirectorySearchHandler.java b/src/main/java/io/kamax/mxisd/http/undertow/handler/directory/v1/UserDirectorySearchHandler.java
index d59116f..2415436 100644
--- a/src/main/java/io/kamax/mxisd/http/undertow/handler/directory/v1/UserDirectorySearchHandler.java
+++ b/src/main/java/io/kamax/mxisd/http/undertow/handler/directory/v1/UserDirectorySearchHandler.java
@@ -31,7 +31,7 @@ import java.net.URI;
 
 public class UserDirectorySearchHandler extends HomeserverProxyHandler {
 
-    public static final String Path = "/_matrix/client/r0/user_directory/search";
+    public static final String Path = "/_matrix/client/v3/user_directory/search";
 
     private DirectoryManager mgr;
 
diff --git a/src/main/java/io/kamax/mxisd/http/undertow/handler/invite/v1/RoomInviteHandler.java b/src/main/java/io/kamax/mxisd/http/undertow/handler/invite/v1/RoomInviteHandler.java
index 20e3420..0b3def4 100644
--- a/src/main/java/io/kamax/mxisd/http/undertow/handler/invite/v1/RoomInviteHandler.java
+++ b/src/main/java/io/kamax/mxisd/http/undertow/handler/invite/v1/RoomInviteHandler.java
@@ -44,7 +44,7 @@ import java.util.Optional;
 
 public class RoomInviteHandler extends BasicHttpHandler {
 
-    public static final String Path = "/_matrix/client/r0/rooms/{roomId}/invite";
+    public static final String Path = "/_matrix/client/v3/rooms/{roomId}/invite";
 
     private static final Logger log = LoggerFactory.getLogger(RoomInviteHandler.class);
 
@@ -62,7 +62,7 @@ public class RoomInviteHandler extends BasicHttpHandler {
     public void handleRequest(HttpServerExchange exchange) {
         String accessToken = getAccessToken(exchange);
 
-        String whoamiUri = dns.transform(URI.create(exchange.getRequestURL()).resolve(URI.create("/_matrix/client/r0/account/whoami"))).toString();
+        String whoamiUri = dns.transform(URI.create(exchange.getRequestURL()).resolve(URI.create("/_matrix/client/v3/account/whoami"))).toString();
         log.info("Who Am I URL: {}", whoamiUri);
         HttpGet whoAmIReq = new HttpGet(whoamiUri);
         whoAmIReq.addHeader("Authorization", "Bearer " + accessToken);
diff --git a/src/main/java/io/kamax/mxisd/http/undertow/handler/profile/v1/ProfileHandler.java b/src/main/java/io/kamax/mxisd/http/undertow/handler/profile/v1/ProfileHandler.java
index 9ceb2ce..d6c0a0a 100644
--- a/src/main/java/io/kamax/mxisd/http/undertow/handler/profile/v1/ProfileHandler.java
+++ b/src/main/java/io/kamax/mxisd/http/undertow/handler/profile/v1/ProfileHandler.java
@@ -34,7 +34,7 @@ import java.util.Optional;
 public class ProfileHandler extends HomeserverProxyHandler {
 
     public static final String UserID = "userId";
-    public static final String Path = "/_matrix/client/r0/profile/{" + UserID + "}";
+    public static final String Path = "/_matrix/client/v3/profile/{" + UserID + "}";
 
     protected ProfileManager mgr;
 
diff --git a/src/main/java/io/kamax/mxisd/http/undertow/handler/register/v1/Register3pidRequestTokenHandler.java b/src/main/java/io/kamax/mxisd/http/undertow/handler/register/v1/Register3pidRequestTokenHandler.java
index d077e84..6c39422 100644
--- a/src/main/java/io/kamax/mxisd/http/undertow/handler/register/v1/Register3pidRequestTokenHandler.java
+++ b/src/main/java/io/kamax/mxisd/http/undertow/handler/register/v1/Register3pidRequestTokenHandler.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
 public class Register3pidRequestTokenHandler extends BasicHttpHandler {
 
     public static final String Key = "medium";
-    public static final String Path = "/_matrix/client/r0/register/{" + Key + "}/requestToken";
+    public static final String Path = "/_matrix/client/v3/register/{" + Key + "}/requestToken";
 
     private static final Logger log = LoggerFactory.getLogger(Register3pidRequestTokenHandler.class);