diff --git a/src/assets/images/ninjaone.png b/src/assets/images/ninjaone.png
new file mode 100644
index 000000000000..ca84ac5e450c
Binary files /dev/null and b/src/assets/images/ninjaone.png differ
diff --git a/src/components/layout/AppFooter.jsx b/src/components/layout/AppFooter.jsx
index 0ed8a1a5f2a7..1830b0201999 100644
--- a/src/components/layout/AppFooter.jsx
+++ b/src/components/layout/AppFooter.jsx
@@ -5,6 +5,7 @@ import huntressLogo from 'src/assets/images/huntress_teal.png'
 import dattoLogo from 'src/assets/images/datto.png'
 import rewstLogo from 'src/assets/images/rewst.png'
 import netfriends from 'src/assets/images/netfriends.png'
+import ninjaLogo from 'src/assets/images/ninjaone.png'
 //todo: Add darkmode detection and change logos accordingly.
 const AppFooter = () => {
   return (
@@ -24,6 +25,9 @@ const AppFooter = () => {
           <CLink href="https://netfriends.com">
             <CImage src={netfriends} alt="Netfriends" />
           </CLink>
+          <CLink href="https://ninjaone.com">
+            <CImage src={ninjaLogo} alt="NinjaOne" />
+          </CLink>
         </p>
       </div>
       <nav className="footer-nav">
diff --git a/src/data/Extensions.json b/src/data/Extensions.json
index 7d7703f4d13a..4d31c1df3dbc 100644
--- a/src/data/Extensions.json
+++ b/src/data/Extensions.json
@@ -106,5 +106,55 @@
         "label": "Enable Integration"
       }
     ]
+  },
+  {
+    "name": "NinjaOne Integration",
+    "type": "NinjaOne",
+    "cat": "Documentation & Monitoring",
+    "forceSyncButton": true,
+    "helpText": "NOTE: This integration requires version 5.6 of NinjaOne, which rolls out regionally between the end of November and mid-December. This integration allows you to populate custom fields with Tenant information, monitor device compliance state, document other items and generate relationships inside NinjaOne.",
+    "SettingOptions": [
+      {
+        "type": "input",
+        "fieldtype": "input",
+        "name": "NinjaOne.Instance",
+        "label": "Please enter your NinjaOne Instance",
+        "placeholder": "app.ninjarmm.com, eu.ninjarmm.com, oc.ninjarmm.com, ca.ninjarmm.com, us2.ninjarmm.com"
+      },
+      {
+        "type": "input",
+        "fieldtype": "password",
+        "name": "NinjaOne.ClientID",
+        "label": "NinjaOne API Client ID",
+        "placeholder": "Enter your NinjaOne API Client ID"
+      },
+      {
+        "type": "input",
+        "fieldtype": "password",
+        "name": "NinjaOne.APIKey",
+        "label": "NinjaOne API Client Secret",
+        "placeholder": "Enter your NinjaOne API Client Secret"
+      },
+      {
+        "type": "checkbox",
+        "name": "NinjaOne.UserDocumentsEnabled",
+        "label": "Synchronize Detailed User Information (Requires NinjaOne Documentation)"
+      },
+      {
+        "type": "checkbox",
+        "name": "NinjaOne.LicenseDocumentsEnabled",
+        "label": "Synchronize Detailed License Information (Requires NinjaOne Documentation)"
+      },
+      {
+        "type": "checkbox",
+        "name": "NinjaOne.LicensedOnly",
+        "label": "Only Synchronize Licensed Users"
+      },
+      {
+        "type": "checkbox",
+        "name": "NinjaOne.Enabled",
+        "label": "Enable Integration"
+      }
+    ]
   }
 ]
diff --git a/src/views/cipp/CIPPSettings.jsx b/src/views/cipp/CIPPSettings.jsx
index daf8d6c507b8..1c1f82a32759 100644
--- a/src/views/cipp/CIPPSettings.jsx
+++ b/src/views/cipp/CIPPSettings.jsx
@@ -1766,7 +1766,15 @@ const ExtensionsTab = () => {
 
 const MappingsTab = () => {
   const [listHaloBackend, listBackendHaloResult = []] = useLazyGenericGetRequestQuery()
+  const [listNinjaOrgsBackend, listBackendNinjaOrgsResult] = useLazyGenericGetRequestQuery()
+  const [listNinjaFieldsBackend, listBackendNinjaFieldsResult] = useLazyGenericGetRequestQuery()
   const [setHaloExtensionconfig, extensionHaloConfigResult = []] = useLazyGenericPostRequestQuery()
+  const [setNinjaOrgsExtensionconfig, extensionNinjaOrgsConfigResult] =
+    useLazyGenericPostRequestQuery()
+  const [setNinjaOrgsExtensionAutomap, extensionNinjaOrgsAutomapResult] =
+    useLazyGenericPostRequestQuery()
+  const [setNinjaFieldsExtensionconfig, extensionNinjaFieldsConfigResult] =
+    useLazyGenericPostRequestQuery()
 
   const onHaloSubmit = (values) => {
     setHaloExtensionconfig({
@@ -1774,10 +1782,38 @@ const MappingsTab = () => {
       values: { mappings: values },
     })
   }
+  const onNinjaOrgsSubmit = (values) => {
+    setNinjaOrgsExtensionconfig({
+      path: 'api/ExecExtensionMapping?AddMapping=NinjaOrgs',
+      values: { mappings: values },
+    })
+  }
+
+  const onNinjaOrgsAutomap = async (values) => {
+    await setNinjaOrgsExtensionAutomap({
+      path: 'api/ExecExtensionMapping?AutoMapping=NinjaOrgs',
+      values: { mappings: values },
+    })
+    await listNinjaOrgsBackend({
+      path: 'api/ExecExtensionMapping?List=NinjaOrgs',
+    })
+  }
+
+  const onNinjaFieldsSubmit = (values) => {
+    setNinjaFieldsExtensionconfig({
+      path: 'api/ExecExtensionMapping?AddMapping=NinjaFields',
+
+      values: { mappings: values },
+    })
+  }
   return (
     <div>
       {listBackendHaloResult.isUninitialized &&
         listHaloBackend({ path: 'api/ExecExtensionMapping?List=Halo' })}
+      {listBackendNinjaOrgsResult.isUninitialized &&
+        listNinjaOrgsBackend({ path: 'api/ExecExtensionMapping?List=NinjaOrgs' })}
+      {listBackendNinjaFieldsResult.isUninitialized &&
+        listNinjaFieldsBackend({ path: 'api/ExecExtensionMapping?List=NinjaFields' })}
       <>
         <CCard className="mb-3">
           <CCardHeader>
@@ -1831,6 +1867,154 @@ const MappingsTab = () => {
             )}
           </CCardBody>
         </CCard>
+        <CCard className="mb-3">
+          <CCardHeader>
+            <CCardTitle>NinjaOne Field Mapping Table</CCardTitle>
+          </CCardHeader>
+          <CCardBody>
+            {listBackendNinjaFieldsResult.isFetching ? (
+              <CSpinner color="primary" />
+            ) : (
+              <Form
+                onSubmit={onNinjaFieldsSubmit}
+                initialValues={listBackendNinjaFieldsResult.data?.Mappings}
+                render={({ handleSubmit, submitting, values }) => {
+                  return (
+                    <CForm onSubmit={handleSubmit}>
+                      <CCardText>
+                        <h5>Organization Global Custom Field Mapping</h5>
+                        <p>
+                          Use the table below to map your Organization Field to the correct NinjaOne
+                          Field
+                        </p>
+                        {listBackendNinjaFieldsResult.isSuccess &&
+                          listBackendNinjaFieldsResult.data.CIPPOrgFields.map((CIPPOrgFields) => (
+                            <RFFSelectSearch
+                              key={CIPPOrgFields.InternalName}
+                              name={CIPPOrgFields.InternalName}
+                              label={CIPPOrgFields.Type + ' - ' + CIPPOrgFields.Description}
+                              values={listBackendNinjaFieldsResult.data.NinjaOrgFields.filter(
+                                (item) => item.type === CIPPOrgFields.Type || item.type === 'unset',
+                              )}
+                              placeholder="Select a Field"
+                            />
+                          ))}
+                      </CCardText>
+                      <CCardText>
+                        <h5>Device Custom Field Mapping</h5>
+                        <p>
+                          Use the table below to map your Device field to the correct NinjaOne
+                          WYSIWYG Field
+                        </p>
+                        {listBackendNinjaFieldsResult.isSuccess &&
+                          listBackendNinjaFieldsResult.data.CIPPNodeFields.map((CIPPNodeFields) => (
+                            <RFFSelectSearch
+                              key={CIPPNodeFields.InternalName}
+                              name={CIPPNodeFields.InternalName}
+                              label={CIPPNodeFields.Type + ' - ' + CIPPNodeFields.Description}
+                              values={listBackendNinjaFieldsResult.data.NinjaNodeFields.filter(
+                                (item) =>
+                                  item.type === CIPPNodeFields.Type || item.type === 'unset',
+                              )}
+                              placeholder="Select a Field"
+                            />
+                          ))}
+                      </CCardText>
+                      <CCol className="me-2">
+                        <CButton className="me-2" type="submit">
+                          {extensionNinjaFieldsConfigResult.isFetching && (
+                            <FontAwesomeIcon icon={faCircleNotch} spin className="me-2" size="1x" />
+                          )}
+                          Set Mappings
+                        </CButton>
+                        {(extensionNinjaFieldsConfigResult.isSuccess ||
+                          extensionNinjaFieldsConfigResult.isError) && (
+                          <CCallout
+                            color={
+                              extensionNinjaFieldsConfigResult.isSuccess ? 'success' : 'danger'
+                            }
+                          >
+                            {extensionNinjaFieldsConfigResult.isSuccess
+                              ? extensionNinjaFieldsConfigResult.data.Results
+                              : 'Error'}
+                          </CCallout>
+                        )}
+                      </CCol>
+                    </CForm>
+                  )
+                }}
+              />
+            )}
+          </CCardBody>
+        </CCard>
+        <CCard className="mb-3">
+          <CCardHeader>
+            <CCardTitle>NinjaOne Organization Mapping Table</CCardTitle>
+          </CCardHeader>
+          <CCardBody>
+            {listBackendNinjaOrgsResult.isFetching ? (
+              <CSpinner color="primary" />
+            ) : (
+              <Form
+                onSubmit={onNinjaOrgsSubmit}
+                initialValues={listBackendNinjaOrgsResult.data?.Mappings}
+                render={({ handleSubmit, submitting, values }) => {
+                  return (
+                    <CForm onSubmit={handleSubmit}>
+                      <CCardText>
+                        Use the table below to map your client to the correct NinjaOne Organization
+                        {listBackendNinjaOrgsResult.isSuccess &&
+                          listBackendNinjaOrgsResult.data.Tenants.map((tenant) => (
+                            <RFFSelectSearch
+                              key={tenant.customerId}
+                              name={tenant.customerId}
+                              label={tenant.displayName}
+                              values={listBackendNinjaOrgsResult.data.NinjaOrgs}
+                              placeholder="Select an Organization"
+                            />
+                          ))}
+                      </CCardText>
+                      <CCol className="me-2">
+                        <CButton className="me-2" type="submit">
+                          {extensionNinjaOrgsConfigResult.isFetching && (
+                            <FontAwesomeIcon icon={faCircleNotch} spin className="me-2" size="1x" />
+                          )}
+                          Set Mappings
+                        </CButton>
+                        <CButton onClick={() => onNinjaOrgsAutomap()} className="me-2">
+                          {extensionNinjaOrgsAutomapResult.isFetching && (
+                            <FontAwesomeIcon icon={faCircleNotch} spin className="me-2" size="1x" />
+                          )}
+                          Automap NinjaOne Organizations
+                        </CButton>
+                        {(extensionNinjaOrgsConfigResult.isSuccess ||
+                          extensionNinjaOrgsConfigResult.isError) && (
+                          <CCallout
+                            color={extensionNinjaOrgsConfigResult.isSuccess ? 'success' : 'danger'}
+                          >
+                            {extensionNinjaOrgsConfigResult.isSuccess
+                              ? extensionNinjaOrgsConfigResult.data.Results
+                              : 'Error'}
+                          </CCallout>
+                        )}
+                        {(extensionNinjaOrgsAutomapResult.isSuccess ||
+                          extensionNinjaOrgsAutomapResult.isError) && (
+                          <CCallout
+                            color={extensionNinjaOrgsAutomapResult.isSuccess ? 'success' : 'danger'}
+                          >
+                            {extensionNinjaOrgsAutomapResult.isSuccess
+                              ? extensionNinjaOrgsAutomapResult.data.Results
+                              : 'Error'}
+                          </CCallout>
+                        )}
+                      </CCol>
+                    </CForm>
+                  )
+                }}
+              />
+            )}
+          </CCardBody>
+        </CCard>
       </>
     </div>
   )