diff --git a/README.md b/README.md
index 2842999..5caee8e 100644
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ Embedding model is installed by default.
 
 | Feature | Community (Free) | Enterprise (Paid) |
 |---------|-----------|------------|
-| **Users** | Up to 50 users | User licenses per seat |
+| **Users** | Up to 10 users | User licenses per seat |
 | **Support** | GitHub Issues | Dedicated human support |
 | **Billing & Reports** | Not included | Full financial tracking |
 | **Pro Agents** | Not included | Pre-built professional agents |
diff --git a/apps/control-panel-backend/app/api/users.py b/apps/control-panel-backend/app/api/users.py
index a484a7a..727266d 100644
--- a/apps/control-panel-backend/app/api/users.py
+++ b/apps/control-panel-backend/app/api/users.py
@@ -23,7 +23,7 @@ router = APIRouter(prefix="/users", tags=["users"])
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 
 # GT AI OS Community Edition - Hardcoded user limit
-MAX_USERS_COMMUNITY = 50
+MAX_USERS_COMMUNITY = 10
 
 
 def get_default_capabilities(user_type: str) -> List[Dict[str, Any]]:
diff --git a/apps/control-panel-frontend/src/app/dashboard/tenants/page.tsx b/apps/control-panel-frontend/src/app/dashboard/tenants/page.tsx
index f7f77af..3c4ed63 100644
--- a/apps/control-panel-frontend/src/app/dashboard/tenants/page.tsx
+++ b/apps/control-panel-frontend/src/app/dashboard/tenants/page.tsx
@@ -155,7 +155,7 @@ export default function TenantsPage() {
             Manage your tenant configuration
           </p>
           <p className="text-sm text-amber-600 mt-1">
-            GT AI OS Community Edition: Limited to 50 users per tenant
+            GT AI OS Community Edition: Limited to 10 users per tenant
           </p>
         </div>
       </div>
@@ -210,7 +210,7 @@ export default function TenantsPage() {
               <div className="grid grid-cols-2 md:grid-cols-4 gap-4">
                 <div>
                   <p className="text-sm font-medium text-muted-foreground">Users</p>
-                  <p className="text-2xl font-bold">{tenant.user_count} <span className="text-sm font-normal text-muted-foreground">/ 50</span></p>
+                  <p className="text-2xl font-bold">{tenant.user_count} <span className="text-sm font-normal text-muted-foreground">/ 10</span></p>
                 </div>
                 <div>
                   <p className="text-sm font-medium text-muted-foreground">Domain</p>
diff --git a/apps/control-panel-frontend/src/app/dashboard/users/page.tsx b/apps/control-panel-frontend/src/app/dashboard/users/page.tsx
index 095a729..2b6d2ab 100644
--- a/apps/control-panel-frontend/src/app/dashboard/users/page.tsx
+++ b/apps/control-panel-frontend/src/app/dashboard/users/page.tsx
@@ -329,7 +329,7 @@ export default function UsersPage() {
             Manage users and access permissions
           </p>
           <p className="text-sm text-amber-600 mt-1">
-            GT AI OS Community Edition: Limited to 50 users
+            GT AI OS Community Edition: Limited to 10 users
           </p>
         </div>
         <div className="flex space-x-2">
diff --git a/apps/control-panel-frontend/src/app/tenants/page.tsx b/apps/control-panel-frontend/src/app/tenants/page.tsx
index e092e57..bb0af47 100644
--- a/apps/control-panel-frontend/src/app/tenants/page.tsx
+++ b/apps/control-panel-frontend/src/app/tenants/page.tsx
@@ -143,7 +143,7 @@ export default function TenantsPage() {
         domain: 'betatest',
         template: 'development',
         status: 'suspended',
-        max_users: 50,
+        max_users: 10,
         current_users: 12,
         namespace: 'gt-tenant-betatest',
         resource_count: 5,