diff --git a/apps/sim/blocks/blocks/jira_service_management.ts b/apps/sim/blocks/blocks/jira_service_management.ts
index 0bb4d60a0..2de765731 100644
--- a/apps/sim/blocks/blocks/jira_service_management.ts
+++ b/apps/sim/blocks/blocks/jira_service_management.ts
@@ -52,10 +52,10 @@ export const JiraServiceManagementBlock: BlockConfig<JsmResponse> = {
     },
     {
       id: 'credential',
-      title: 'Jira Service Management Account',
+      title: 'Jira Account',
       type: 'oauth-input',
       required: true,
-      serviceId: 'jira-service-management',
+      serviceId: 'jira',
       requiredScopes: [
         'read:jira-user',
         'read:jira-work',
@@ -92,7 +92,7 @@ export const JiraServiceManagementBlock: BlockConfig<JsmResponse> = {
         'read:request.approval:jira-service-management',
         'write:request.approval:jira-service-management',
       ],
-      placeholder: 'Select Jira Service Management account',
+      placeholder: 'Select Jira account',
     },
     {
       id: 'serviceDeskId',
diff --git a/apps/sim/lib/auth/auth.ts b/apps/sim/lib/auth/auth.ts
index 3a44b1e47..2708aa52a 100644
--- a/apps/sim/lib/auth/auth.ts
+++ b/apps/sim/lib/auth/auth.ts
@@ -1184,6 +1184,35 @@ export const auth = betterAuth({
             'delete:issue-worklog:jira',
             'write:issue-link:jira',
             'delete:issue-link:jira',
+            // Jira Service Management scopes
+            'read:servicedesk:jira-service-management',
+            'read:requesttype:jira-service-management',
+            'read:request:jira-service-management',
+            'write:request:jira-service-management',
+            'read:request.comment:jira-service-management',
+            'write:request.comment:jira-service-management',
+            'read:customer:jira-service-management',
+            'write:customer:jira-service-management',
+            'read:servicedesk.customer:jira-service-management',
+            'write:servicedesk.customer:jira-service-management',
+            'read:organization:jira-service-management',
+            'write:organization:jira-service-management',
+            'read:servicedesk.organization:jira-service-management',
+            'write:servicedesk.organization:jira-service-management',
+            'read:organization.user:jira-service-management',
+            'write:organization.user:jira-service-management',
+            'read:organization.property:jira-service-management',
+            'write:organization.property:jira-service-management',
+            'read:organization.profile:jira-service-management',
+            'write:organization.profile:jira-service-management',
+            'read:queue:jira-service-management',
+            'read:request.sla:jira-service-management',
+            'read:request.status:jira-service-management',
+            'write:request.status:jira-service-management',
+            'read:request.participant:jira-service-management',
+            'write:request.participant:jira-service-management',
+            'read:request.approval:jira-service-management',
+            'write:request.approval:jira-service-management',
           ],
           responseType: 'code',
           pkce: true,
@@ -1227,98 +1256,6 @@ export const auth = betterAuth({
           },
         },
 
-        // Jira Service Management provider
-        {
-          providerId: 'jira-service-management',
-          clientId: env.JIRA_CLIENT_ID as string,
-          clientSecret: env.JIRA_CLIENT_SECRET as string,
-          authorizationUrl: 'https://auth.atlassian.com/authorize',
-          tokenUrl: 'https://auth.atlassian.com/oauth/token',
-          userInfoUrl: 'https://api.atlassian.com/me',
-          scopes: [
-            'read:jira-user',
-            'read:jira-work',
-            'write:jira-work',
-            'read:project:jira',
-            'read:me',
-            'offline_access',
-            'read:issue:jira',
-            'read:status:jira',
-            'read:user:jira',
-            'read:issue-details:jira',
-            'write:comment:jira',
-            'read:comment:jira',
-            'read:servicedesk:jira-service-management',
-            'read:requesttype:jira-service-management',
-            'read:request:jira-service-management',
-            'write:request:jira-service-management',
-            'read:request.comment:jira-service-management',
-            'write:request.comment:jira-service-management',
-            'read:customer:jira-service-management',
-            'write:customer:jira-service-management',
-            'read:servicedesk.customer:jira-service-management',
-            'write:servicedesk.customer:jira-service-management',
-            'read:organization:jira-service-management',
-            'write:organization:jira-service-management',
-            'read:servicedesk.organization:jira-service-management',
-            'write:servicedesk.organization:jira-service-management',
-            'read:organization.user:jira-service-management',
-            'write:organization.user:jira-service-management',
-            'read:organization.property:jira-service-management',
-            'write:organization.property:jira-service-management',
-            'read:organization.profile:jira-service-management',
-            'write:organization.profile:jira-service-management',
-            'read:queue:jira-service-management',
-            'read:request.sla:jira-service-management',
-            'read:request.status:jira-service-management',
-            'write:request.status:jira-service-management',
-            'read:request.participant:jira-service-management',
-            'write:request.participant:jira-service-management',
-            'read:request.approval:jira-service-management',
-            'write:request.approval:jira-service-management',
-          ],
-          responseType: 'code',
-          pkce: true,
-          accessType: 'offline',
-          authentication: 'basic',
-          prompt: 'consent',
-          redirectURI: `${getBaseUrl()}/api/auth/oauth2/callback/jira-service-management`,
-          getUserInfo: async (tokens) => {
-            try {
-              const response = await fetch('https://api.atlassian.com/me', {
-                headers: {
-                  Authorization: `Bearer ${tokens.accessToken}`,
-                },
-              })
-
-              if (!response.ok) {
-                logger.error('Error fetching Jira Service Management user info:', {
-                  status: response.status,
-                  statusText: response.statusText,
-                })
-                return null
-              }
-
-              const profile = await response.json()
-
-              const now = new Date()
-
-              return {
-                id: profile.account_id,
-                name: profile.name || profile.display_name || 'JSM User',
-                email: profile.email || `${profile.account_id}@atlassian.com`,
-                image: profile.picture || undefined,
-                emailVerified: true,
-                createdAt: now,
-                updatedAt: now,
-              }
-            } catch (error) {
-              logger.error('Error in Jira Service Management getUserInfo:', { error })
-              return null
-            }
-          },
-        },
-
         // Airtable provider
         {
           providerId: 'airtable',
diff --git a/apps/sim/lib/oauth/oauth.ts b/apps/sim/lib/oauth/oauth.ts
index c3d96acaa..94496a24b 100644
--- a/apps/sim/lib/oauth/oauth.ts
+++ b/apps/sim/lib/oauth/oauth.ts
@@ -322,7 +322,7 @@ export const OAUTH_PROVIDERS: Record<string, OAuthProviderConfig> = {
     services: {
       jira: {
         name: 'Jira',
-        description: 'Access Jira projects and issues.',
+        description: 'Access Jira projects, issues, and Service Management.',
         providerId: 'jira',
         icon: JiraIcon,
         baseProviderIcon: JiraIcon,
@@ -365,27 +365,7 @@ export const OAUTH_PROVIDERS: Record<string, OAuthProviderConfig> = {
           'read:comment.property:jira',
           'read:jql:jira',
           'read:field:jira',
-        ],
-      },
-      'jira-service-management': {
-        name: 'Jira Service Management',
-        description: 'Access Jira Service Management service desks, requests, and customers.',
-        providerId: 'jira-service-management',
-        icon: JiraIcon,
-        baseProviderIcon: JiraIcon,
-        scopes: [
-          'read:jira-user',
-          'read:jira-work',
-          'write:jira-work',
-          'read:project:jira',
-          'read:me',
-          'offline_access',
-          'read:issue:jira',
-          'read:status:jira',
-          'read:user:jira',
-          'read:issue-details:jira',
-          'write:comment:jira',
-          'read:comment:jira',
+          // Jira Service Management scopes
           'read:servicedesk:jira-service-management',
           'read:requesttype:jira-service-management',
           'read:request:jira-service-management',
diff --git a/apps/sim/lib/oauth/types.ts b/apps/sim/lib/oauth/types.ts
index cb78d38e3..055568881 100644
--- a/apps/sim/lib/oauth/types.ts
+++ b/apps/sim/lib/oauth/types.ts
@@ -18,7 +18,6 @@ export type OAuthProvider =
   | 'airtable'
   | 'notion'
   | 'jira'
-  | 'jira-service-management'
   | 'dropbox'
   | 'microsoft'
   | 'microsoft-excel'
@@ -60,7 +59,6 @@ export type OAuthService =
   | 'airtable'
   | 'notion'
   | 'jira'
-  | 'jira-service-management'
   | 'dropbox'
   | 'microsoft-excel'
   | 'microsoft-teams'
diff --git a/apps/sim/tools/jsm/add_comment.ts b/apps/sim/tools/jsm/add_comment.ts
index d6b32e338..daba0098a 100644
--- a/apps/sim/tools/jsm/add_comment.ts
+++ b/apps/sim/tools/jsm/add_comment.ts
@@ -9,7 +9,7 @@ export const jsmAddCommentTool: ToolConfig<JsmAddCommentParams, JsmAddCommentRes
 
   oauth: {
     required: true,
-    provider: 'jira-service-management',
+    provider: 'jira',
   },
 
   params: {
diff --git a/apps/sim/tools/jsm/add_customer.ts b/apps/sim/tools/jsm/add_customer.ts
index dfa03e0af..f7440860f 100644
--- a/apps/sim/tools/jsm/add_customer.ts
+++ b/apps/sim/tools/jsm/add_customer.ts
@@ -9,7 +9,7 @@ export const jsmAddCustomerTool: ToolConfig<JsmAddCustomerParams, JsmAddCustomer
 
   oauth: {
     required: true,
-    provider: 'jira-service-management',
+    provider: 'jira',
   },
 
   params: {
diff --git a/apps/sim/tools/jsm/add_organization_to_service_desk.ts b/apps/sim/tools/jsm/add_organization_to_service_desk.ts
index 38b2828e0..b4004da7d 100644
--- a/apps/sim/tools/jsm/add_organization_to_service_desk.ts
+++ b/apps/sim/tools/jsm/add_organization_to_service_desk.ts
@@ -15,7 +15,7 @@ export const jsmAddOrganizationToServiceDeskTool: ToolConfig<
 
   oauth: {
     required: true,
-    provider: 'jira-service-management',
+    provider: 'jira',
   },
 
   params: {
diff --git a/apps/sim/tools/jsm/add_participants.ts b/apps/sim/tools/jsm/add_participants.ts
index dbbec929d..ea32b399f 100644
--- a/apps/sim/tools/jsm/add_participants.ts
+++ b/apps/sim/tools/jsm/add_participants.ts
@@ -12,7 +12,7 @@ export const jsmAddParticipantsTool: ToolConfig<
 
   oauth: {
     required: true,
-    provider: 'jira-service-management',
+    provider: 'jira',
   },
 
   params: {
diff --git a/apps/sim/tools/jsm/answer_approval.ts b/apps/sim/tools/jsm/answer_approval.ts
index f5c128c5b..5a9b780b0 100644
--- a/apps/sim/tools/jsm/answer_approval.ts
+++ b/apps/sim/tools/jsm/answer_approval.ts
@@ -10,7 +10,7 @@ export const jsmAnswerApprovalTool: ToolConfig<JsmAnswerApprovalParams, JsmAnswe
 
     oauth: {
       required: true,
-      provider: 'jira-service-management',
+      provider: 'jira',
     },
 
     params: {
diff --git a/apps/sim/tools/jsm/create_organization.ts b/apps/sim/tools/jsm/create_organization.ts
index b5bae44af..8b3b4617f 100644
--- a/apps/sim/tools/jsm/create_organization.ts
+++ b/apps/sim/tools/jsm/create_organization.ts
@@ -12,7 +12,7 @@ export const jsmCreateOrganizationTool: ToolConfig<
 
   oauth: {
     required: true,
-    provider: 'jira-service-management',
+    provider: 'jira',
   },
 
   params: {
diff --git a/apps/sim/tools/jsm/create_request.ts b/apps/sim/tools/jsm/create_request.ts
index 4c86928e5..9be85017e 100644
--- a/apps/sim/tools/jsm/create_request.ts
+++ b/apps/sim/tools/jsm/create_request.ts
@@ -9,7 +9,7 @@ export const jsmCreateRequestTool: ToolConfig<JsmCreateRequestParams, JsmCreateR
 
   oauth: {
     required: true,
-    provider: 'jira-service-management',
+    provider: 'jira',
   },
 
   params: {
diff --git a/apps/sim/tools/jsm/get_approvals.ts b/apps/sim/tools/jsm/get_approvals.ts
index 0becc403b..d73ab4cd5 100644
--- a/apps/sim/tools/jsm/get_approvals.ts
+++ b/apps/sim/tools/jsm/get_approvals.ts
@@ -9,7 +9,7 @@ export const jsmGetApprovalsTool: ToolConfig<JsmGetApprovalsParams, JsmGetApprov
 
   oauth: {
     required: true,
-    provider: 'jira-service-management',
+    provider: 'jira',
   },
 
   params: {
diff --git a/apps/sim/tools/jsm/get_comments.ts b/apps/sim/tools/jsm/get_comments.ts
index bcd2ab1f8..b5322b6c1 100644
--- a/apps/sim/tools/jsm/get_comments.ts
+++ b/apps/sim/tools/jsm/get_comments.ts
@@ -9,7 +9,7 @@ export const jsmGetCommentsTool: ToolConfig<JsmGetCommentsParams, JsmGetComments
 
   oauth: {
     required: true,
-    provider: 'jira-service-management',
+    provider: 'jira',
   },
 
   params: {
diff --git a/apps/sim/tools/jsm/get_customers.ts b/apps/sim/tools/jsm/get_customers.ts
index 69a095551..3557fd497 100644
--- a/apps/sim/tools/jsm/get_customers.ts
+++ b/apps/sim/tools/jsm/get_customers.ts
@@ -9,7 +9,7 @@ export const jsmGetCustomersTool: ToolConfig<JsmGetCustomersParams, JsmGetCustom
 
   oauth: {
     required: true,
-    provider: 'jira-service-management',
+    provider: 'jira',
   },
 
   params: {
diff --git a/apps/sim/tools/jsm/get_organizations.ts b/apps/sim/tools/jsm/get_organizations.ts
index cf34e646b..d99b80074 100644
--- a/apps/sim/tools/jsm/get_organizations.ts
+++ b/apps/sim/tools/jsm/get_organizations.ts
@@ -12,7 +12,7 @@ export const jsmGetOrganizationsTool: ToolConfig<
 
   oauth: {
     required: true,
-    provider: 'jira-service-management',
+    provider: 'jira',
   },
 
   params: {
diff --git a/apps/sim/tools/jsm/get_participants.ts b/apps/sim/tools/jsm/get_participants.ts
index 36b708188..665264f67 100644
--- a/apps/sim/tools/jsm/get_participants.ts
+++ b/apps/sim/tools/jsm/get_participants.ts
@@ -12,7 +12,7 @@ export const jsmGetParticipantsTool: ToolConfig<
 
   oauth: {
     required: true,
-    provider: 'jira-service-management',
+    provider: 'jira',
   },
 
   params: {
diff --git a/apps/sim/tools/jsm/get_queues.ts b/apps/sim/tools/jsm/get_queues.ts
index 134dedbcd..37b26bb76 100644
--- a/apps/sim/tools/jsm/get_queues.ts
+++ b/apps/sim/tools/jsm/get_queues.ts
@@ -9,7 +9,7 @@ export const jsmGetQueuesTool: ToolConfig<JsmGetQueuesParams, JsmGetQueuesRespon
 
   oauth: {
     required: true,
-    provider: 'jira-service-management',
+    provider: 'jira',
   },
 
   params: {
diff --git a/apps/sim/tools/jsm/get_request.ts b/apps/sim/tools/jsm/get_request.ts
index 5e04b0511..adc328b07 100644
--- a/apps/sim/tools/jsm/get_request.ts
+++ b/apps/sim/tools/jsm/get_request.ts
@@ -9,7 +9,7 @@ export const jsmGetRequestTool: ToolConfig<JsmGetRequestParams, JsmGetRequestRes
 
   oauth: {
     required: true,
-    provider: 'jira-service-management',
+    provider: 'jira',
   },
 
   params: {
diff --git a/apps/sim/tools/jsm/get_request_types.ts b/apps/sim/tools/jsm/get_request_types.ts
index 7539118e8..eff6465c5 100644
--- a/apps/sim/tools/jsm/get_request_types.ts
+++ b/apps/sim/tools/jsm/get_request_types.ts
@@ -12,7 +12,7 @@ export const jsmGetRequestTypesTool: ToolConfig<
 
   oauth: {
     required: true,
-    provider: 'jira-service-management',
+    provider: 'jira',
   },
 
   params: {
diff --git a/apps/sim/tools/jsm/get_requests.ts b/apps/sim/tools/jsm/get_requests.ts
index e3f9b6cd9..381467379 100644
--- a/apps/sim/tools/jsm/get_requests.ts
+++ b/apps/sim/tools/jsm/get_requests.ts
@@ -9,7 +9,7 @@ export const jsmGetRequestsTool: ToolConfig<JsmGetRequestsParams, JsmGetRequests
 
   oauth: {
     required: true,
-    provider: 'jira-service-management',
+    provider: 'jira',
   },
 
   params: {
diff --git a/apps/sim/tools/jsm/get_service_desks.ts b/apps/sim/tools/jsm/get_service_desks.ts
index 3248822f0..4e4d3a801 100644
--- a/apps/sim/tools/jsm/get_service_desks.ts
+++ b/apps/sim/tools/jsm/get_service_desks.ts
@@ -12,7 +12,7 @@ export const jsmGetServiceDesksTool: ToolConfig<
 
   oauth: {
     required: true,
-    provider: 'jira-service-management',
+    provider: 'jira',
   },
 
   params: {
diff --git a/apps/sim/tools/jsm/get_sla.ts b/apps/sim/tools/jsm/get_sla.ts
index b0e3d9d68..e34559847 100644
--- a/apps/sim/tools/jsm/get_sla.ts
+++ b/apps/sim/tools/jsm/get_sla.ts
@@ -9,7 +9,7 @@ export const jsmGetSlaTool: ToolConfig<JsmGetSlaParams, JsmGetSlaResponse> = {
 
   oauth: {
     required: true,
-    provider: 'jira-service-management',
+    provider: 'jira',
   },
 
   params: {
diff --git a/apps/sim/tools/jsm/get_transitions.ts b/apps/sim/tools/jsm/get_transitions.ts
index d1f5171ca..41a61f482 100644
--- a/apps/sim/tools/jsm/get_transitions.ts
+++ b/apps/sim/tools/jsm/get_transitions.ts
@@ -10,7 +10,7 @@ export const jsmGetTransitionsTool: ToolConfig<JsmGetTransitionsParams, JsmGetTr
 
     oauth: {
       required: true,
-      provider: 'jira-service-management',
+      provider: 'jira',
     },
 
     params: {
diff --git a/apps/sim/tools/jsm/transition_request.ts b/apps/sim/tools/jsm/transition_request.ts
index c3ff67ec2..fb2232f6c 100644
--- a/apps/sim/tools/jsm/transition_request.ts
+++ b/apps/sim/tools/jsm/transition_request.ts
@@ -12,7 +12,7 @@ export const jsmTransitionRequestTool: ToolConfig<
 
   oauth: {
     required: true,
-    provider: 'jira-service-management',
+    provider: 'jira',
   },
 
   params: {