diff --git a/.env.cec-euprd b/.env.cec-euprd
index ae12566..5eac964 100644
--- a/.env.cec-euprd
+++ b/.env.cec-euprd
@@ -15,7 +15,8 @@ REACT_APP_ROLE_GENERATE_CERTIFICATE=9af2d8c0-c26d-4d6d-bbd1-ac53cbd37ebc
 REACT_APP_ROLE_MANUFACTURE=3412e11a-a2d1-4355-be3e-ef9aa5065b69
 REACT_APP_ROLE_SUPPLIER_APPROVER=a6c9805e-80b2-42b2-bfbb-9df52e5504d8
 REACT_APP_ROLE_MANIFEST_MIGRATION=42798c8a-9fa7-4fb4-82c0-9582cabe364f
+REACT_APP_ROLE_CAR_DIAGNOSTIC=2914e67f-fb85-4b78-b79d-656f4f37faa1
 REACT_APP_ROLE_UPDATE_DEPLOY=e4af2c4c-6c5e-4784-9097-7c18e776d7b6
 REACT_APP_ECCKEY_ENV=
 REACT_APP_HOME_MAP_DEFAULT_LOCATION={"lat":49.8327,"lng":9.8816,"zoom":4.5}
-REACT_APP_ENABLE_DEBUGMASK=1
\ No newline at end of file
+REACT_APP_ENABLE_DEBUGMASK=1
diff --git a/.env.cec-prd b/.env.cec-prd
index 2f6cb8b..101dd7f 100644
--- a/.env.cec-prd
+++ b/.env.cec-prd
@@ -15,7 +15,8 @@ REACT_APP_ROLE_GENERATE_CERTIFICATE=9af2d8c0-c26d-4d6d-bbd1-ac53cbd37ebc
 REACT_APP_ROLE_MANUFACTURE=3412e11a-a2d1-4355-be3e-ef9aa5065b69
 REACT_APP_ROLE_SUPPLIER_APPROVER=a6c9805e-80b2-42b2-bfbb-9df52e5504d8
 REACT_APP_ROLE_MANIFEST_MIGRATION=42798c8a-9fa7-4fb4-82c0-9582cabe364f
+REACT_APP_ROLE_CAR_DIAGNOSTIC=2914e67f-fb85-4b78-b79d-656f4f37faa1
 REACT_APP_ROLE_UPDATE_DEPLOY=e4af2c4c-6c5e-4784-9097-7c18e776d7b6
 REACT_APP_ECCKEY_ENV=
 REACT_APP_HOME_MAP_DEFAULT_LOCATION={"lat":37.0902,"lng":-95.7129,"zoom":4.5}
-REACT_APP_ENABLE_DEBUGMASK=1
\ No newline at end of file
+REACT_APP_ENABLE_DEBUGMASK=1
diff --git a/.env.dev b/.env.dev
index 4c0d651..92dd8fc 100644
--- a/.env.dev
+++ b/.env.dev
@@ -15,7 +15,8 @@ REACT_APP_ROLE_GENERATE_CERTIFICATE=746f34b0-9ba0-4b5d-8d84-0256a9c8e390
 REACT_APP_ROLE_MANUFACTURE=3412e11a-a2d1-4355-be3e-ef9aa5065b69
 REACT_APP_ROLE_SUPPLIER_APPROVER=a6c9805e-80b2-42b2-bfbb-9df52e5504d8
 REACT_APP_ROLE_MANIFEST_MIGRATION=42798c8a-9fa7-4fb4-82c0-9582cabe364f
+REACT_APP_ROLE_CAR_DIAGNOSTIC=2914e67f-fb85-4b78-b79d-656f4f37faa1
 REACT_APP_ROLE_UPDATE_DEPLOY=3590ec3f-1c05-428b-81a4-40b00baf83de
 REACT_APP_ECCKEY_ENV=stage,prod
 REACT_APP_HOME_MAP_DEFAULT_LOCATION={"lat":37.0902,"lng":-95.7129,"zoom":4.5}
-REACT_APP_ENABLE_DEBUGMASK=1
\ No newline at end of file
+REACT_APP_ENABLE_DEBUGMASK=1
diff --git a/.env.local b/.env.local
index 74b818d..19ba31b 100644
--- a/.env.local
+++ b/.env.local
@@ -16,6 +16,7 @@ REACT_APP_ROLE_MANUFACTURE=3412e11a-a2d1-4355-be3e-ef9aa5065b69
 REACT_APP_ROLE_SUPPLIER_APPROVER=a6c9805e-80b2-42b2-bfbb-9df52e5504d8
 REACT_APP_ROLE_MANIFEST_MIGRATION=42798c8a-9fa7-4fb4-82c0-9582cabe364f
 REACT_APP_ROLE_UPDATE_DEPLOY=3590ec3f-1c05-428b-81a4-40b00baf83de
+REACT_APP_ROLE_CAR_DIAGNOSTIC=2914e67f-fb85-4b78-b79d-656f4f37faa1
 REACT_APP_ECCKEY_ENV=dev,stage,prod
 REACT_APP_HOME_MAP_DEFAULT_LOCATION={"lat":37.0902,"lng":-95.7129,"zoom":4.5}
-REACT_APP_ENABLE_DEBUGMASK=1
\ No newline at end of file
+REACT_APP_ENABLE_DEBUGMASK=1
diff --git a/.env.prd b/.env.prd
index 634e327..d84d254 100644
--- a/.env.prd
+++ b/.env.prd
@@ -15,7 +15,8 @@ REACT_APP_ROLE_GENERATE_CERTIFICATE=746f34b0-9ba0-4b5d-8d84-0256a9c8e390
 REACT_APP_ROLE_MANUFACTURE=3412e11a-a2d1-4355-be3e-ef9aa5065b69
 REACT_APP_ROLE_SUPPLIER_APPROVER=a6c9805e-80b2-42b2-bfbb-9df52e5504d8
 REACT_APP_ROLE_MANIFEST_MIGRATION=42798c8a-9fa7-4fb4-82c0-9582cabe364f
+REACT_APP_ROLE_CAR_DIAGNOSTIC=2914e67f-fb85-4b78-b79d-656f4f37faa1
 REACT_APP_ROLE_UPDATE_DEPLOY=e4af2c4c-6c5e-4784-9097-7c18e776d7b6
 REACT_APP_ECCKEY_ENV=stage
 REACT_APP_HOME_MAP_DEFAULT_LOCATION={"lat":37.0902,"lng":-95.7129,"zoom":4.5}
-REACT_APP_ENABLE_DEBUGMASK=1
\ No newline at end of file
+REACT_APP_ENABLE_DEBUGMASK=1
diff --git a/.env.stg b/.env.stg
index 10457a5..e6c8a39 100644
--- a/.env.stg
+++ b/.env.stg
@@ -15,7 +15,8 @@ REACT_APP_ROLE_GENERATE_CERTIFICATE=746f34b0-9ba0-4b5d-8d84-0256a9c8e390
 REACT_APP_ROLE_MANUFACTURE=3412e11a-a2d1-4355-be3e-ef9aa5065b69
 REACT_APP_ROLE_SUPPLIER_APPROVER=a6c9805e-80b2-42b2-bfbb-9df52e5504d8
 REACT_APP_ROLE_MANIFEST_MIGRATION=42798c8a-9fa7-4fb4-82c0-9582cabe364f
+REACT_APP_ROLE_CAR_DIAGNOSTIC=2914e67f-fb85-4b78-b79d-656f4f37faa1
 REACT_APP_ROLE_UPDATE_DEPLOY=3590ec3f-1c05-428b-81a4-40b00baf83de
 REACT_APP_ECCKEY_ENV=prod
 REACT_APP_HOME_MAP_DEFAULT_LOCATION={"lat":37.0902,"lng":-95.7129,"zoom":4.5}
-REACT_APP_ENABLE_DEBUGMASK=1
\ No newline at end of file
+REACT_APP_ENABLE_DEBUGMASK=1
diff --git a/.env.template b/.env.template
index 291a90c..6f453b7 100644
--- a/.env.template
+++ b/.env.template
@@ -15,6 +15,7 @@ REACT_APP_ROLE_GENERATE_CERTIFICATE=746f34b0-9ba0-4b5d-8d84-0256a9c8e390
 REACT_APP_ROLE_MANUFACTURE=3412e11a-a2d1-4355-be3e-ef9aa5065b69
 REACT_APP_ROLE_SUPPLIER_APPROVER=a6c9805e-80b2-42b2-bfbb-9df52e5504d8
 REACT_APP_ROLE_MANIFEST_MIGRATION=42798c8a-9fa7-4fb4-82c0-9582cabe364f
+REACT_APP_ROLE_CAR_DIAGNOSTIC=2914e67f-fb85-4b78-b79d-656f4f37faa1
 REACT_APP_ROLE_UPDATE_DEPLOY=3590ec3f-1c05-428b-81a4-40b00baf83de
 REACT_APP_ECCKEY_ENV=dev,stage,prod
 REACT_APP_HOME_MAP_DEFAULT_LOCATION={"lat":37.0902,"lng":-95.7129,"zoom":4.5}
diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap
index 01e543d..c691a1a 100644
--- a/src/components/App/__snapshots__/App.test.js.snap
+++ b/src/components/App/__snapshots__/App.test.js.snap
@@ -11365,7 +11365,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                       <span
                         class="MuiTab-wrapper"
                       >
-                        Remote Diagnostic Commands
+                        Fleets
                       </span>
                       <span
                         class="MuiTouchRipple-root"
@@ -11379,24 +11379,6 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                       role="tab"
                       tabindex="-1"
                       type="button"
-                    >
-                      <span
-                        class="MuiTab-wrapper"
-                      >
-                        Fleets
-                      </span>
-                      <span
-                        class="MuiTouchRipple-root"
-                      />
-                    </button>
-                    <button
-                      aria-controls="tabpanel-10"
-                      aria-selected="false"
-                      class="MuiButtonBase-root MuiTab-root MuiTab-textColorInherit"
-                      id="tab-10"
-                      role="tab"
-                      tabindex="-1"
-                      type="button"
                     >
                       <span
                         class="MuiTab-wrapper"
@@ -11682,13 +11664,6 @@ exports[`App Route /vehicle-status authenticated 1`] = `
               id="tabpanel-9"
               role="tabpanel"
             />
-            <div
-              aria-labelledby="tab-10"
-              class="makeStyles-tabContainer-0"
-              hidden=""
-              id="tabpanel-10"
-              role="tabpanel"
-            />
           </div>
         </main>
       </main>
diff --git a/src/components/Cars/Status/__snapshots__/index.test.jsx.snap b/src/components/Cars/Status/__snapshots__/index.test.jsx.snap
index cae321f..097c3b2 100644
--- a/src/components/Cars/Status/__snapshots__/index.test.jsx.snap
+++ b/src/components/Cars/Status/__snapshots__/index.test.jsx.snap
@@ -189,7 +189,7 @@ exports[`CarStatus Render 1`] = `
                     <span
                       class="MuiTab-wrapper"
                     >
-                      Remote Diagnostic Commands
+                      Fleets
                     </span>
                     <span
                       class="MuiTouchRipple-root"
@@ -203,24 +203,6 @@ exports[`CarStatus Render 1`] = `
                     role="tab"
                     tabindex="-1"
                     type="button"
-                  >
-                    <span
-                      class="MuiTab-wrapper"
-                    >
-                      Fleets
-                    </span>
-                    <span
-                      class="MuiTouchRipple-root"
-                    />
-                  </button>
-                  <button
-                    aria-controls="tabpanel-10"
-                    aria-selected="false"
-                    class="MuiButtonBase-root MuiTab-root MuiTab-textColorInherit"
-                    id="tab-10"
-                    role="tab"
-                    tabindex="-1"
-                    type="button"
                   >
                     <span
                       class="MuiTab-wrapper"
@@ -442,13 +424,6 @@ exports[`CarStatus Render 1`] = `
             id="tabpanel-9"
             role="tabpanel"
           />
-          <div
-            aria-labelledby="tab-10"
-            class="makeStyles-tabContainer-0"
-            hidden=""
-            id="tabpanel-10"
-            role="tabpanel"
-          />
         </div>
       </div>
     </div>
diff --git a/src/components/Cars/Status/index.jsx b/src/components/Cars/Status/index.jsx
index 11cd094..de180d4 100644
--- a/src/components/Cars/Status/index.jsx
+++ b/src/components/Cars/Status/index.jsx
@@ -67,7 +67,7 @@ const TabViews = [
   {
     label: "Remote Diagnostic Commands",
     component: RemoteDiagnosticCommandsTab,
-    rolesPerProvider: Permissions.FiskerMagnaCreate,
+    rolesPerProvider: Permissions.CarDiagnostic,
   },
   {
     label: "Fleets",
diff --git a/src/utils/roles.js b/src/utils/roles.js
index e428a59..fb8b43c 100644
--- a/src/utils/roles.js
+++ b/src/utils/roles.js
@@ -9,7 +9,8 @@ export const Roles = {
   UPDATEDEPLOY: process.env.REACT_APP_ROLE_UPDATE_DEPLOY,
   MANUFACTURE: process.env.REACT_APP_ROLE_MANUFACTURE,
   MAGNAGROUP: process.env.REACT_APP_MAGNA_GROUP_ID,
-  MANIFEST_MIGRATION: process.env.REACT_APP_ROLE_MANIFEST_MIGRATION
+  MANIFEST_MIGRATION: process.env.REACT_APP_ROLE_MANIFEST_MIGRATION,
+  CAR_DIAGNOSTIC: process.env.REACT_APP_ROLE_CAR_DIAGNOSTIC
 };
 
 export const Providers = {
@@ -101,5 +102,9 @@ export const Permissions = {
   },
   ManifestMigration: {
     [Providers.FISKER]: [Roles.MANIFEST_MIGRATION]
+  },
+  CarDiagnostic: {
+    [Providers.FISKER]: [Roles.CAR_DIAGNOSTIC],
+    [Providers.FISKER_QA]: [Roles.CAR_DIAGNOSTIC],
   }
 };