diff --git a/src/cli.ts b/src/cli.ts
index 16cf153..f049edf 100644
--- a/src/cli.ts
+++ b/src/cli.ts
@@ -6,7 +6,13 @@ import { z } from 'zod';
 import { Jira } from './jira';
 import { getLegend } from './legend';
 import { Logger } from './logger';
-import { getDefaultValue, getOptions, raise, tokenUnavailable } from './util';
+import {
+  getDefaultValue,
+  getOptions,
+  raise,
+  tokenUnavailable,
+  getUserFromLogin,
+} from './util';
 
 import {
   colorPrioritySchema,
@@ -23,7 +29,7 @@ import {
   SizeWithControls,
 } from './schema/jira';
 
-import { Issue } from 'jira.js/dist/esm/types/version2/models/issue';
+import { Issue } from 'jira.js/dist/esm/types/version3/models/issue';
 
 export function cli(): Command {
   const program = new Command();
@@ -83,7 +89,11 @@ const runProgram = async () => {
   }
 
   const token = process.env.JIRA_API_TOKEN ?? tokenUnavailable();
-  const jira = new Jira('https://issues.redhat.com', token);
+  const jira = new Jira(
+    'https://redhat.atlassian.net/jira',
+    token,
+    getUserFromLogin()
+  );
 
   const version = await jira.getVersion();
   console.debug(`JIRA Version: ${version}`);
diff --git a/src/jira.ts b/src/jira.ts
index 46fcbbe..b2cbe51 100644
--- a/src/jira.ts
+++ b/src/jira.ts
@@ -1,15 +1,15 @@
-import { Version2Client } from 'jira.js';
-import { Issue } from 'jira.js/dist/esm/types/version2/models';
+import { Version3Client } from 'jira.js';
+import { Issue } from 'jira.js/dist/esm/types/version3/models/issue';
 
 import { raise } from './util';
 import { Priority, Severity, Size } from './schema/jira';
 
 export class Jira {
-  readonly api: Version2Client;
+  readonly api: Version3Client;
   readonly fields = {
-    storyPoints: 'customfield_12310243',
+    storyPoints: 'customfield_10194',
     priority: 'priority',
-    severity: 'customfield_12316142',
+    severity: 'customfield_10442',
   };
   readonly baseJQL =
     'Project in (RHEL, "RHEL Miscellaneous", Fedora) AND (type in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY) OR type not in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY)) AND status != Closed';
@@ -17,13 +17,15 @@ export class Jira {
 
   constructor(
     readonly instance: string,
-    apiToken: string
+    apiToken: string,
+    email: string
   ) {
-    this.api = new Version2Client({
+    this.api = new Version3Client({
       host: instance,
       authentication: {
-        oauth2: {
-          accessToken: apiToken,
+        basic: {
+          email,
+          apiToken,
         },
       },
     });
diff --git a/test/unit/jira.test.ts b/test/unit/jira.test.ts
index 932c4e3..e9c727e 100644
--- a/test/unit/jira.test.ts
+++ b/test/unit/jira.test.ts
@@ -11,7 +11,7 @@ const mocks = vi.hoisted(() => {
 });
 
 vi.mock('jira.js', () => {
-  const Version2Client = vi.fn(function () {
+  const Version3Client = vi.fn(function () {
     return {
       serverInfo: {
         getServerInfo: mocks.getServerInfo,
@@ -26,7 +26,7 @@ vi.mock('jira.js', () => {
     };
   });
   return {
-    Version2Client,
+    Version3Client,
   };
 });
 
@@ -34,7 +34,7 @@ describe('Jira functions', () => {
   let jira: Jira;
 
   beforeEach(() => {
-    jira = new Jira('https://issues.redhat.com', 'token');
+    jira = new Jira('https://issues.redhat.com', 'token', 'email');
 
     mocks.getServerInfo.mockReturnValue({
       version: '8.0.0',
@@ -118,7 +118,7 @@ describe('Jira functions', () => {
         'components',
         'summary',
         'assignee',
-        'customfield_12310243',
+        'customfield_10194',
         'priority',
       ],
       jql: 'issue in (RHEL-1234,RHEL-1235) ORDER BY id DESC',
@@ -130,7 +130,7 @@ describe('Jira functions', () => {
             "assignee": {
               "displayName": "assignee",
             },
-            "customfield_12310243": 3,
+            "customfield_10194": 3,
             "issuetype": {
               "name": "Story",
             },
@@ -149,7 +149,7 @@ describe('Jira functions', () => {
             "assignee": {
               "displayName": "assignee",
             },
-            "customfield_12310243": 5,
+            "customfield_10194": 5,
             "issuetype": {
               "name": "Story",
             },
@@ -188,7 +188,7 @@ describe('Jira functions', () => {
         'components',
         'summary',
         'assignee',
-        'customfield_12310243',
+        'customfield_10194',
         'priority',
       ],
       jql: 'Project in (RHEL, "RHEL Miscellaneous", Fedora) AND (type in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY) OR type not in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY)) AND status != Closed ORDER BY id DESC',
@@ -200,7 +200,7 @@ describe('Jira functions', () => {
             "assignee": {
               "displayName": "assignee",
             },
-            "customfield_12310243": 3,
+            "customfield_10194": 3,
             "issuetype": {
               "name": "Story",
             },
@@ -219,7 +219,7 @@ describe('Jira functions', () => {
             "assignee": {
               "displayName": "assignee",
             },
-            "customfield_12310243": 5,
+            "customfield_10194": 5,
             "issuetype": {
               "name": "Story",
             },
@@ -310,7 +310,7 @@ describe('Jira functions', () => {
     expect(mocks.editIssue).toHaveBeenCalledWith({
       issueIdOrKey: 'RHEL-1234',
       fields: {
-        customfield_12310243: 5,
+        customfield_10194: 5,
         priority: {
           name: 'Minor',
         },