diff --git a/web-server/libdefs/ambient.d.ts b/web-server/libdefs/ambient.d.ts
index df608b3ba..fa529dd9c 100644
--- a/web-server/libdefs/ambient.d.ts
+++ b/web-server/libdefs/ambient.d.ts
@@ -14,16 +14,10 @@ declare type Org = {
   created_at: Date;
   name: string;
   domain: string;
-  onboarding_state: OnboardingStep[];
+  onboarding_state: string[];
   integrations: Partial<IntegrationsMap>;
 };
 
-declare enum OnboardingStep {
-  'WELCOME_SCREEN' = 'WELCOME_SCREEN',
-  'CODE_PROVIDER_INTEGRATED' = 'CODE_PROVIDER_INTEGRATED',
-  'TEAM_CREATED' = 'TEAM_CREATED'
-}
-
 declare type ONBOARDING_STEP =
   | 'WELCOME_INTRODUCTION_STEP'
   | 'TOOLS_INTEGRATION_STEP'
diff --git a/web-server/pages/api/resources/orgs/[org_id]/onboarding.ts b/web-server/pages/api/resources/orgs/[org_id]/onboarding.ts
index 7c6509544..3ce209c5c 100644
--- a/web-server/pages/api/resources/orgs/[org_id]/onboarding.ts
+++ b/web-server/pages/api/resources/orgs/[org_id]/onboarding.ts
@@ -2,6 +2,7 @@ import * as yup from 'yup';
 
 import { Endpoint, nullSchema } from '@/api-helpers/global';
 import { Columns, Table } from '@/constants/db';
+import { OnboardingStep } from '@/types/resources';
 import { db } from '@/utils/db';
 
 const putSchema = yup.object().shape({
diff --git a/web-server/pages/api/resources/orgs/[org_id]/teams/v2.ts b/web-server/pages/api/resources/orgs/[org_id]/teams/v2.ts
index 843411515..51b89d949 100644
--- a/web-server/pages/api/resources/orgs/[org_id]/teams/v2.ts
+++ b/web-server/pages/api/resources/orgs/[org_id]/teams/v2.ts
@@ -17,7 +17,7 @@ import { Columns, Table } from '@/constants/db';
 import { Integration } from '@/constants/integrations';
 import { getTeamV2Mock } from '@/mocks/teams';
 import { BaseTeam } from '@/types/api/teams';
-import { ReqOrgRepo } from '@/types/resources';
+import { OnboardingStep, ReqOrgRepo } from '@/types/resources';
 import { db, getFirstRow } from '@/utils/db';
 
 const getSchema = yup.object().shape({
diff --git a/web-server/src/constants/useRoute.ts b/web-server/src/constants/useRoute.ts
index 90cfc0a43..12d477a6e 100644
--- a/web-server/src/constants/useRoute.ts
+++ b/web-server/src/constants/useRoute.ts
@@ -2,7 +2,7 @@ import { useRouter } from 'next/router';
 import { useEffect } from 'react';
 
 import { useAuth } from '@/hooks/useAuth';
-import { UserRole } from '@/types/resources';
+import { OnboardingStep, UserRole } from '@/types/resources';
 
 import { ROUTES } from './routes';
 
diff --git a/web-server/src/contexts/ThirdPartyAuthContext.tsx b/web-server/src/contexts/ThirdPartyAuthContext.tsx
index e8674e127..74b646d1b 100644
--- a/web-server/src/contexts/ThirdPartyAuthContext.tsx
+++ b/web-server/src/contexts/ThirdPartyAuthContext.tsx
@@ -11,7 +11,7 @@ import {
   initialState as initialAuthState
 } from '@/slices/auth';
 import { useDispatch, useSelector } from '@/store';
-import { UserRole, IntegrationGroup } from '@/types/resources';
+import { UserRole, IntegrationGroup, OnboardingStep } from '@/types/resources';
 import { depFn } from '@/utils/fn';
 
 export interface AuthContextValue extends AuthState {
diff --git a/web-server/src/types/resources.ts b/web-server/src/types/resources.ts
index 37ab1e454..c4b9442c8 100644
--- a/web-server/src/types/resources.ts
+++ b/web-server/src/types/resources.ts
@@ -994,3 +994,9 @@ export interface UserStat {
   MERGED: number;
   REVIEWED: number;
 }
+
+export enum OnboardingStep {
+  'WELCOME_SCREEN' = 'WELCOME_SCREEN',
+  'CODE_PROVIDER_INTEGRATED' = 'CODE_PROVIDER_INTEGRATED',
+  'TEAM_CREATED' = 'TEAM_CREATED'
+}
diff --git a/web-server/src/utils/auth-supplementary.ts b/web-server/src/utils/auth-supplementary.ts
index aa7b4e22f..44ba3edff 100644
--- a/web-server/src/utils/auth-supplementary.ts
+++ b/web-server/src/utils/auth-supplementary.ts
@@ -4,7 +4,7 @@ import { privateDecrypt, publicEncrypt } from 'crypto';
 
 const CHUNK_SIZE = 127;
 export const enc = (data?: string) => {
-  const key = process.env.SECRET_PUBLIC_KEY;
+  const key = Buffer.from(process.env.SECRET_PUBLIC_KEY, 'base64');
   try {
     return data
       ? splitEvery(CHUNK_SIZE, data).map((chunk) =>
@@ -17,7 +17,7 @@ export const enc = (data?: string) => {
 };
 
 export const dec = (chunks: string[]) => {
-  const key = process.env.SECRET_PRIVATE_KEY;
+  const key = Buffer.from(process.env.SECRET_PRIVATE_KEY, 'base64');
   return chunks
     .map((chunk) => privateDecrypt(key, Buffer.from(chunk, 'base64')))
     .join('');