diff --git a/packages/types/src/__tests__/cloud.test.ts b/packages/types/src/__tests__/cloud.test.ts
new file mode 100644
index 00000000000..31a942c2d41
--- /dev/null
+++ b/packages/types/src/__tests__/cloud.test.ts
@@ -0,0 +1,173 @@
+// npx vitest run src/__tests__/cloud.test.ts
+
+import {
+	organizationFeaturesSchema,
+	organizationSettingsSchema,
+	type OrganizationFeatures,
+	type OrganizationSettings,
+} from "../cloud.js"
+
+describe("organizationFeaturesSchema", () => {
+	it("should validate empty object", () => {
+		const result = organizationFeaturesSchema.safeParse({})
+		expect(result.success).toBe(true)
+		expect(result.data).toEqual({})
+	})
+
+	it("should validate with roomoteControlEnabled as true", () => {
+		const input = { roomoteControlEnabled: true }
+		const result = organizationFeaturesSchema.safeParse(input)
+		expect(result.success).toBe(true)
+		expect(result.data).toEqual(input)
+	})
+
+	it("should validate with roomoteControlEnabled as false", () => {
+		const input = { roomoteControlEnabled: false }
+		const result = organizationFeaturesSchema.safeParse(input)
+		expect(result.success).toBe(true)
+		expect(result.data).toEqual(input)
+	})
+
+	it("should reject non-boolean roomoteControlEnabled", () => {
+		const input = { roomoteControlEnabled: "true" }
+		const result = organizationFeaturesSchema.safeParse(input)
+		expect(result.success).toBe(false)
+	})
+
+	it("should allow additional properties (for future extensibility)", () => {
+		const input = { roomoteControlEnabled: true, futureProperty: "test" }
+		const result = organizationFeaturesSchema.safeParse(input)
+		expect(result.success).toBe(true)
+		expect(result.data?.roomoteControlEnabled).toBe(true)
+		// Note: Additional properties are stripped by Zod, which is expected behavior
+	})
+
+	it("should have correct TypeScript type", () => {
+		// Type-only test to ensure TypeScript compilation
+		const features: OrganizationFeatures = {
+			roomoteControlEnabled: true,
+		}
+		expect(features.roomoteControlEnabled).toBe(true)
+
+		const emptyFeatures: OrganizationFeatures = {}
+		expect(emptyFeatures.roomoteControlEnabled).toBeUndefined()
+	})
+})
+
+describe("organizationSettingsSchema with features", () => {
+	const validBaseSettings = {
+		version: 1,
+		defaultSettings: {},
+		allowList: {
+			allowAll: true,
+			providers: {},
+		},
+	}
+
+	it("should validate without features property", () => {
+		const result = organizationSettingsSchema.safeParse(validBaseSettings)
+		expect(result.success).toBe(true)
+		expect(result.data?.features).toBeUndefined()
+	})
+
+	it("should validate with empty features object", () => {
+		const input = {
+			...validBaseSettings,
+			features: {},
+		}
+		const result = organizationSettingsSchema.safeParse(input)
+		expect(result.success).toBe(true)
+		expect(result.data?.features).toEqual({})
+	})
+
+	it("should validate with features.roomoteControlEnabled as true", () => {
+		const input = {
+			...validBaseSettings,
+			features: {
+				roomoteControlEnabled: true,
+			},
+		}
+		const result = organizationSettingsSchema.safeParse(input)
+		expect(result.success).toBe(true)
+		expect(result.data?.features?.roomoteControlEnabled).toBe(true)
+	})
+
+	it("should validate with features.roomoteControlEnabled as false", () => {
+		const input = {
+			...validBaseSettings,
+			features: {
+				roomoteControlEnabled: false,
+			},
+		}
+		const result = organizationSettingsSchema.safeParse(input)
+		expect(result.success).toBe(true)
+		expect(result.data?.features?.roomoteControlEnabled).toBe(false)
+	})
+
+	it("should reject invalid features object", () => {
+		const input = {
+			...validBaseSettings,
+			features: {
+				roomoteControlEnabled: "invalid",
+			},
+		}
+		const result = organizationSettingsSchema.safeParse(input)
+		expect(result.success).toBe(false)
+	})
+
+	it("should have correct TypeScript type for features", () => {
+		// Type-only test to ensure TypeScript compilation
+		const settings: OrganizationSettings = {
+			version: 1,
+			defaultSettings: {},
+			allowList: {
+				allowAll: true,
+				providers: {},
+			},
+			features: {
+				roomoteControlEnabled: true,
+			},
+		}
+		expect(settings.features?.roomoteControlEnabled).toBe(true)
+
+		const settingsWithoutFeatures: OrganizationSettings = {
+			version: 1,
+			defaultSettings: {},
+			allowList: {
+				allowAll: true,
+				providers: {},
+			},
+		}
+		expect(settingsWithoutFeatures.features).toBeUndefined()
+	})
+
+	it("should maintain all existing properties", () => {
+		const input = {
+			version: 1,
+			cloudSettings: {
+				recordTaskMessages: true,
+				enableTaskSharing: false,
+			},
+			defaultSettings: {},
+			allowList: {
+				allowAll: false,
+				providers: {
+					openai: {
+						allowAll: true,
+						models: ["gpt-4"],
+					},
+				},
+			},
+			features: {
+				roomoteControlEnabled: true,
+			},
+			hiddenMcps: ["test-mcp"],
+			hideMarketplaceMcps: true,
+			mcps: [],
+			providerProfiles: {},
+		}
+		const result = organizationSettingsSchema.safeParse(input)
+		expect(result.success).toBe(true)
+		expect(result.data).toEqual(input)
+	})
+})
diff --git a/packages/types/src/cloud.ts b/packages/types/src/cloud.ts
index 693868d4866..7ffb28ae5d6 100644
--- a/packages/types/src/cloud.ts
+++ b/packages/types/src/cloud.ts
@@ -133,6 +133,16 @@ export const organizationCloudSettingsSchema = z.object({
 
 export type OrganizationCloudSettings = z.infer<typeof organizationCloudSettingsSchema>
 
+/**
+ * OrganizationFeatures
+ */
+
+export const organizationFeaturesSchema = z.object({
+	roomoteControlEnabled: z.boolean().optional(),
+})
+
+export type OrganizationFeatures = z.infer<typeof organizationFeaturesSchema>
+
 /**
  * OrganizationSettings
  */
@@ -142,6 +152,7 @@ export const organizationSettingsSchema = z.object({
 	cloudSettings: organizationCloudSettingsSchema.optional(),
 	defaultSettings: organizationDefaultSettingsSchema,
 	allowList: organizationAllowListSchema,
+	features: organizationFeaturesSchema.optional(),
 	hiddenMcps: z.array(z.string()).optional(),
 	hideMarketplaceMcps: z.boolean().optional(),
 	mcps: z.array(mcpMarketplaceItemSchema).optional(),