diff --git a/backend/src/ee/services/license/license-fns.ts b/backend/src/ee/services/license/license-fns.ts
index f55f7f605..c2db3e6e7 100644
--- a/backend/src/ee/services/license/license-fns.ts
+++ b/backend/src/ee/services/license/license-fns.ts
@@ -6,7 +6,6 @@ import { logger } from "@app/lib/logger";
 
 import { TFeatureSet } from "./license-types";
 
-// TODO(andrey): Revert this
 export const getDefaultOnPremFeatures = (): TFeatureSet => ({
   _id: null,
   slug: null,
@@ -19,33 +18,33 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({
   environmentsUsed: 0,
   identityLimit: null,
   identitiesUsed: 0,
-  dynamicSecret: true,
+  dynamicSecret: false,
   secretVersioning: true,
-  pitRecovery: true,
-  ipAllowlisting: true,
-  rbac: true,
-  githubOrgSync: true,
+  pitRecovery: false,
+  ipAllowlisting: false,
+  rbac: false,
+  githubOrgSync: false,
   customRateLimits: false,
-  customAlerts: true,
-  secretAccessInsights: true,
-  auditLogs: true,
-  auditLogsRetentionDays: 3,
-  auditLogStreams: true,
+  customAlerts: false,
+  secretAccessInsights: false,
+  auditLogs: false,
+  auditLogsRetentionDays: 0,
+  auditLogStreams: false,
   auditLogStreamLimit: 3,
-  samlSSO: true,
-  hsm: true,
-  oidcSSO: true,
-  scim: true,
-  ldap: true,
-  groups: true,
+  samlSSO: false,
+  hsm: false,
+  oidcSSO: false,
+  scim: false,
+  ldap: false,
+  groups: false,
   status: null,
   trial_end: null,
   has_used_trial: true,
-  secretApproval: true,
-  secretRotation: true,
-  caCrl: true,
-  instanceUserManagement: true,
-  externalKms: true,
+  secretApproval: false,
+  secretRotation: false,
+  caCrl: false,
+  instanceUserManagement: false,
+  externalKms: false,
   rateLimits: {
     readLimit: 60,
     writeLimit: 200,
@@ -53,13 +52,13 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({
   },
   pkiEst: false,
   enforceMfa: false,
-  projectTemplates: true,
-  kmip: true,
-  gateway: true,
-  sshHostGroups: true,
-  enterpriseAppConnections: true,
-  enterpriseSecretSyncs: true,
-  secretScanning: true
+  projectTemplates: false,
+  kmip: false,
+  gateway: false,
+  sshHostGroups: false,
+  secretScanning: false,
+  enterpriseSecretSyncs: false,
+  enterpriseAppConnections: false
 });
 
 export const setupLicenseRequestWithStore = (
diff --git a/backend/src/server/plugins/secret-scanner-v2.ts b/backend/src/server/plugins/secret-scanner-v2.ts
index 4c35adcbb..f1d034f30 100644
--- a/backend/src/server/plugins/secret-scanner-v2.ts
+++ b/backend/src/server/plugins/secret-scanner-v2.ts
@@ -79,7 +79,7 @@ export const registerSecretScanningV2Webhooks = async (server: FastifyZodProvide
       rateLimit: writeLimit
     },
     handler: async (req, res) => {
-      // TODO(andrey): Verify IP is from bitbucket
+      // TODO(andrey): Verify request is from bitbucket
 
       const { dataSourceId } = req.query;
 
diff --git a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConfigFields/BitBucketDataSourceConfigFields.tsx b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConfigFields/BitBucketDataSourceConfigFields.tsx
index 98369f2c4..092e7d623 100644
--- a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConfigFields/BitBucketDataSourceConfigFields.tsx
+++ b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConfigFields/BitBucketDataSourceConfigFields.tsx
@@ -38,7 +38,7 @@ export const BitbucketDataSourceConfigFields = () => {
 
   const { data: repositories, isPending: areRepositoriesLoading } =
     useBitbucketConnectionListRepositories(connectionId, selectedWorkspaceSlug, {
-      enabled: Boolean(connectionId) && Boolean(selectedWorkspaceSlug) // Enable only if both are present
+      enabled: Boolean(connectionId) && Boolean(selectedWorkspaceSlug)
     });
 
   const includeRepos = watch("config.includeRepos");
@@ -127,7 +127,6 @@ export const BitbucketDataSourceConfigFields = () => {
       {scanMethod === ScanMethod.SelectRepositories && (
         <Controller
           name="config.includeRepos"
-          // defaultValue={["*"]} // This defaultValue is handled by the useEffect above
           control={control}
           render={({ field: { value, onChange }, fieldState: { error } }) => (
             <FormControl
@@ -149,16 +148,14 @@ export const BitbucketDataSourceConfigFields = () => {
               <FilterableSelect
                 menuPlacement="top"
                 isLoading={areRepositoriesLoading && Boolean(connectionId)}
-                // Disable if no connection or no workspace slug is selected for fetching repositories
                 isDisabled={!connectionId || !selectedWorkspaceSlug}
                 isMulti
-                // Ensure 'value' is treated as a string array for filtering
                 value={repositories?.filter((repository) =>
                   (value as string[]).includes(repository.full_name)
                 )}
                 onChange={(newValue) => {
                   onChange(
-                    newValue ? (newValue as MultiValue<TBitbucketRepo>).map((p) => p.full_name) : [] // Ensure it's an empty array if cleared
+                    newValue ? (newValue as MultiValue<TBitbucketRepo>).map((p) => p.full_name) : []
                   );
                 }}
                 options={repositories}