diff --git a/db/interfaces.ts b/db/interfaces.ts
index 17c2ca1..f2baba1 100644
--- a/db/interfaces.ts
+++ b/db/interfaces.ts
@@ -57,7 +57,7 @@ export interface WebToken {
   updated_on: number;
   last_used_on?: number | null;
   is_active?: boolean | null;
-  metadata?: any | null;
+  metadata?: Record<string, unknown> | null;
 }
 
 export interface Obligation {
@@ -206,7 +206,7 @@ export interface TenantApplication {
   applicant_id?: string | null;
   application_status?: string | null;
   application_data_encrypted?: string | null;
-  document_urls_json?: any | null;
+  document_urls_json?: Record<string, unknown> | null;
   submitted_on?: number | null;
   reviewed_on?: number | null;
 }
@@ -253,7 +253,7 @@ export interface Message {
   message_type?: string | null;
   subject?: string | null;
   parent_message_id?: string | null;
-  attachments_json?: any | null;
+  attachments_json?: Record<string, unknown> | null;
   content?: string | null;
   content_encrypted?: string | null;
   is_read?: boolean | null;
diff --git a/islands/AsyncImageGenerater.tsx b/islands/AsyncImageGenerater.tsx
index 25d726e..4cc3978 100644
--- a/islands/AsyncImageGenerater.tsx
+++ b/islands/AsyncImageGenerater.tsx
@@ -32,7 +32,7 @@ export function AsyncImageGenerater() {
         text_1={popup.imageFile.image_text || popup.imageFile.image_file || ""}
         image_data={popup.imageFile.image_data}
         role={popup.role}
-        recordingCallback={(answer: any) => {
+        recordingCallback={(answer: ImageFile | null) => {
           popup.resolve(answer);
           setPopup(null);
         }}
diff --git a/islands/ClearCheckedButton.tsx b/islands/ClearCheckedButton.tsx
index 804bc41..b9c2f83 100644
--- a/islands/ClearCheckedButton.tsx
+++ b/islands/ClearCheckedButton.tsx
@@ -1,8 +1,8 @@
 // islands/ClearCheckedButton.// islands/ClearCheckedButton.tsx
 
 interface ClearCheckedButtonProps {
-  clearSig: any;
-  setCanStudy: any;
+  clearSig: { value: number };
+  setCanStudy: { value: number };
 }
 
 export default function ClearCheckedButton(
diff --git a/modules/KvCacheStore.ts b/modules/KvCacheStore.ts
old mode 100755
new mode 100644
index fb3f4c8..9c841a8
--- a/modules/KvCacheStore.ts
+++ b/modules/KvCacheStore.ts
@@ -836,7 +836,7 @@ export class KvCacheStore {
 
       case "roles": {
         const roles = await sqlGetAllRoles();
-        const role = roles.find((r: any) => r.id === id);
+        const role = roles.find((r: { id: string; description: string }) => r.id === id);
         if (!role) return null;
         return {
           id: role.id,
@@ -847,15 +847,15 @@ export class KvCacheStore {
       case "user_roles": {
         const roles = await sqlGetUserRoles(id as string);
         if (!roles || roles.length === 0) return null;
-        return roles.map((r: any) => r.roleId).filter((r: any) =>
-          r !== ""
+        return roles.map((r: { roleId: string }) => r.roleId).filter((r: { roleId: string }) =>
+          r.roleId !== ""
         ) as T;
       }
 
       case "state_keys": {
         const stateKeys = await sqlGetStateKeys(id as string);
         if (!stateKeys || stateKeys.length === 0) return null;
-        const sortedKeys = stateKeys.sort((a: any, b: any) =>
+        const sortedKeys = stateKeys.sort((a: { created_on: number }, b: { created_on: number }) =>
           b.created_on - a.created_on
         );
         return {
diff --git a/types/graph/ServicePrincipal.ts b/types/graph/ServicePrincipal.ts
old mode 100755
new mode 100644
index 66ce5dc..ec27989
--- a/types/graph/ServicePrincipal.ts
+++ b/types/graph/ServicePrincipal.ts
@@ -31,7 +31,11 @@ export interface ServicePrincipal {
   tags: string[];
   tokenEncryptionKeyId: string | null;
   samlSingleSignOnSettings: unknown | null;
-  addIns: any[];
+  addIns: Array<{
+    id: string;
+    type: string;
+    properties: Record<string, unknown>[];
+}>[];
   appRoleIds: string[];
   info: {
     logoUrl: string | null;
@@ -40,10 +44,36 @@ export interface ServicePrincipal {
     supportUrl: string | null;
     termsOfServiceUrl: string | null;
   };
-  keyCredentials: any[];
+  keyCredentials: Array<{
+    customKeyIdentifier?: string;
+    displayName?: string;
+    endDateTime?: string;
+    keyId: string;
+    keyType: string;
+    keyUsage: string;
+    startDateTime?: string;
+    value?: string;
+  }>[];
   oauth2PermissionScopeIds: string[];
-  passwordCredentials: any[];
-  resourceSpecificApplicationPermissions: any[];
+  passwordCredentials: Array<{
+    customKeyIdentifier?: string;
+    displayName?: string;
+    endDateTime?: string;
+    keyId: string;
+    secretText?: string;
+    startDateTime?: string;
+    type: string;
+  }>[];
+  resourceSpecificApplicationPermissions: Array<{
+    adminConsentDescription: string;
+    adminConsentDisplayName: string;
+    id: string;
+    isEnabled: boolean;
+    type: string;
+    userConsentDescription: string;
+    userConsentDisplayName: string;
+    value: string;
+  }>[];
   verifiedPublisher: {
     displayName: string | null;
     verifiedPublisherId: string | null;