diff --git a/OptixServe.Api/Endpoints/UserEndpoint.cs b/OptixServe.Api/Endpoints/UserEndpoint.cs
index 0a76567..10ad026 100644
--- a/OptixServe.Api/Endpoints/UserEndpoint.cs
+++ b/OptixServe.Api/Endpoints/UserEndpoint.cs
@@ -11,9 +11,9 @@ public partial class UserJsonContext : JsonSerializerContext { }
 
 public static class UserEndpoint
 {
-    public static void Register(WebApplication app)
+    public static void Register(RouteGroupBuilder parentGroup)
     {
-        var group = app.MapGroup("/users");
+        var group = parentGroup.MapGroup("/users");
 
         group.MapGet("/", GetAllUsers);
         group.MapGet("/{id}", GetUserById);
diff --git a/OptixServe.Api/Program.cs b/OptixServe.Api/Program.cs
index 5a6961c..4952dd1 100644
--- a/OptixServe.Api/Program.cs
+++ b/OptixServe.Api/Program.cs
@@ -46,7 +46,8 @@ class Program
             builder.RegiserJsonContext();
 
             var app = builder.Build();
-            app.RegisterEndpoints();
+            var apiGroup = app.MapGroup("api/v1");
+            ExtensionMethods.RegisterEndpoints(apiGroup);
 
             app.Run();
         });
@@ -113,9 +114,9 @@ static class ExtensionMethods
     /// Registers all API endpoints
     /// </summary>
     /// <param name="app">WebApplication instance</param>
-    public static void RegisterEndpoints(this WebApplication app)
+    public static void RegisterEndpoints(RouteGroupBuilder rootGroup)
     {
-        UserEndpoint.Register(app);
+        UserEndpoint.Register(rootGroup);
     }
 
 }
\ No newline at end of file