diff --git a/apps/client/src/ee/hooks/use-license.tsx b/apps/client/src/ee/hooks/use-license.tsx
new file mode 100644
index 00000000..e3f72d82
--- /dev/null
+++ b/apps/client/src/ee/hooks/use-license.tsx
@@ -0,0 +1,9 @@
+import { useAtom } from "jotai";
+import { currentUserAtom } from "@/features/user/atoms/current-user-atom.ts";
+
+export const useLicense = () => {
+  const [currentUser] = useAtom(currentUserAtom);
+  return { hasLicenseKey: currentUser?.workspace?.hasLicenseKey };
+};
+
+export default useLicense;
diff --git a/apps/client/src/ee/security/pages/security.tsx b/apps/client/src/ee/security/pages/security.tsx
index 4ea20d47..5399acfb 100644
--- a/apps/client/src/ee/security/pages/security.tsx
+++ b/apps/client/src/ee/security/pages/security.tsx
@@ -1,5 +1,5 @@
 import { Helmet } from "react-helmet-async";
-import { getAppName } from "@/lib/config.ts";
+import { getAppName, isCloud } from "@/lib/config.ts";
 import SettingsTitle from "@/components/settings/settings-title.tsx";
 import { Divider, Title } from "@mantine/core";
 import React from "react";
@@ -9,15 +9,12 @@ import CreateSsoProvider from "@/ee/security/components/create-sso-provider.tsx"
 import EnforceSso from "@/ee/security/components/enforce-sso.tsx";
 import AllowedDomains from "@/ee/security/components/allowed-domains.tsx";
 import { useTranslation } from "react-i18next";
-import usePlan from "@/ee/hooks/use-plan.tsx";
+import useLicense from "@/ee/hooks/use-license.tsx";
 
 export default function Security() {
   const { t } = useTranslation();
   const { isAdmin } = useUserRole();
-  const { isStandard } = usePlan();
-
-  // if is not cloud or enterprise return null
-  //{(isCloud() || isEnterprise()) && (
+  const { hasLicenseKey } = useLicense();
 
   if (!isAdmin) {
     return null;
@@ -42,7 +39,11 @@ export default function Security() {
 
       <Divider my="lg" />
 
-      {!isStandard && <CreateSsoProvider />}
+      {!isCloud() && hasLicenseKey ? <CreateSsoProvider /> : ""}
+
+      {/*TODO: revisit when we add a second plan
+         <CreateSsoProvider />
+      */}
 
       <Divider size={0} my="lg" />
 
diff --git a/apps/server/src/core/workspace/services/workspace.service.ts b/apps/server/src/core/workspace/services/workspace.service.ts
index a68cef02..f515c172 100644
--- a/apps/server/src/core/workspace/services/workspace.service.ts
+++ b/apps/server/src/core/workspace/services/workspace.service.ts
@@ -104,7 +104,10 @@ export class WorkspaceService {
           hostname = await this.generateHostname(
             createWorkspaceDto.hostname ?? createWorkspaceDto.name,
           );
-          trialEndAt = addDays(new Date(), 14);
+          trialEndAt = addDays(
+            new Date(),
+            this.environmentService.getBillingTrialDays(),
+          );
           status = WorkspaceStatus.Active;
           plan = 'standard';
         }
diff --git a/apps/server/src/integrations/environment/environment.service.ts b/apps/server/src/integrations/environment/environment.service.ts
index 281595c9..6854184e 100644
--- a/apps/server/src/integrations/environment/environment.service.ts
+++ b/apps/server/src/integrations/environment/environment.service.ts
@@ -45,10 +45,7 @@ export class EnvironmentService {
   }
 
   getDatabaseMaxPool(): number {
-    return parseInt(
-      this.configService.get<string>('DATABASE_MAX_POOL', '10'),
-      10,
-    );
+    return parseInt(this.configService.get<string>('DATABASE_MAX_POOL', '10'));
   }
 
   getRedisUrl(): string {
@@ -171,8 +168,8 @@ export class EnvironmentService {
     return this.configService.get<string>('STRIPE_WEBHOOK_SECRET');
   }
 
-  getEnterpriseKey(): string {
-    return this.configService.get<string>('ENTERPRISE_KEY');
+  getBillingTrialDays(): number {
+    return parseInt(this.configService.get<string>('BILLING_TRIAL_DAYS', '14'));
   }
 
   getCollabUrl(): string {