diff --git a/README.md b/README.md
index e66b3b209..c0fce1b5b 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@ OpenMRS HIV Reference Implementation (OHRI) packages built on top of OpenMRS Fro
 - [esm-covid-app](https://github.com/UCSF-IGHS/openmrs-esm-ohri/tree/master/packages/esm-covid-app) (COVID-19 App)
 - [esm-cervical-cancer-app](https://github.com/UCSF-IGHS/openmrs-esm-ohri/tree/master/packages/esm-cervical-cancer-app) (Cervical Cancer App)
 - [esm-ohri-pmtct-app](https://github.com/UCSF-IGHS/openmrs-esm-ohri/tree/master/packages/esm-ohri-pmtct-app) (PMTCT App)
+- [esm-ohri-tb-app](https://github.com/UCSF-IGHS/openmrs-esm-ohri/tree/master/packages/esm-tb-app) (TB App)
 
 ## Installation
 
@@ -88,7 +89,7 @@ yarn test
 
 TBD
 
-## Configuration 
+## Configuration
 
 This module is designed to be driven by configuration files. These files define the look and functionality required to drive the OHRI module.
 
diff --git a/lerna.json b/lerna.json
index bacf3349a..8bcb8cc80 100644
--- a/lerna.json
+++ b/lerna.json
@@ -4,7 +4,7 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "2.0.2",
+  "version": "2.1.0",
   "command": {
     "publish": {
       "verifyAccess": false,
diff --git a/packages/esm-cervical-cancer-app/package.json b/packages/esm-cervical-cancer-app/package.json
index fe13a7b05..a65001435 100644
--- a/packages/esm-cervical-cancer-app/package.json
+++ b/packages/esm-cervical-cancer-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohri/openmrs-esm-ohri-cervical-cancer-app",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "Cervical cancer microfrontend for OpenMRS HIV Reference Implementation (OHRI)",
   "browser": "dist/openmrs-esm-ohri-cervical-cancer-app.js",
   "main": "src/index.ts",
@@ -38,7 +38,7 @@
   },
   "peerDependencies": {
     "@openmrs/esm-framework": "5.x",
-    "@openmrs/esm-patient-common-lib": "5.x",
+    "@openmrs/esm-patient-common-lib": "6.x",
     "dayjs": "^1.8.16",
     "react": "^18.2.0",
     "react-i18next": "^11.18.6"
diff --git a/packages/esm-commons-lib/package.json b/packages/esm-commons-lib/package.json
index 1e29342a5..2a4c0cc89 100644
--- a/packages/esm-commons-lib/package.json
+++ b/packages/esm-commons-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohri/openmrs-esm-ohri-commons-lib",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "Commons library microfrontend of shared assets for OpenMRS HIV Reference Implementation (OHRI)",
   "browser": "dist/ohri-commons-lib.js",
   "main": "src/index.ts",
@@ -42,7 +42,7 @@
   },
   "peerDependencies": {
     "@openmrs/esm-framework": "5.x",
-    "@openmrs/esm-patient-common-lib": "5.x",
+    "@openmrs/esm-patient-common-lib": "6.x",
     "dayjs": "^1.8.16",
     "react": "^18.2.0",
     "react-i18next": "^11.18.6"
diff --git a/packages/esm-covid-app/package.json b/packages/esm-covid-app/package.json
index fa337009f..9c04ecf04 100644
--- a/packages/esm-covid-app/package.json
+++ b/packages/esm-covid-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohri/openmrs-esm-ohri-covid-app",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "COVID Microfrontend for OpenMRS HIV Reference Implementation (OHRI)",
   "browser": "dist/openmrs-esm-ohri-covid-app.js",
   "main": "src/index.ts",
@@ -40,7 +40,7 @@
   },
   "peerDependencies": {
     "@openmrs/esm-framework": "5.x",
-    "@openmrs/esm-patient-common-lib": "5.x",
+    "@openmrs/esm-patient-common-lib": "6.x",
     "dayjs": "^1.8.16",
     "react": "^18.2.0",
     "react-i18next": "^11.7.0",
diff --git a/packages/esm-form-render-app/package.json b/packages/esm-form-render-app/package.json
index 2459edefc..5b2e580ea 100644
--- a/packages/esm-form-render-app/package.json
+++ b/packages/esm-form-render-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohri/openmrs-esm-ohri-form-render-app",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "A Forms Rendering microfrontend for OpenMRS HIV Reference Implementation (OHRI)",
   "browser": "dist/openmrs-esm-ohri-form-render-app.js",
   "main": "src/index.ts",
diff --git a/packages/esm-hiv-app/package.json b/packages/esm-hiv-app/package.json
index 2bbbd0fa0..56b75ddef 100644
--- a/packages/esm-hiv-app/package.json
+++ b/packages/esm-hiv-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohri/openmrs-esm-ohri-hiv-app",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "HIV microfrontend for OpenMRS HIV Reference Implementation (OHRI)",
   "browser": "dist/openmrs-esm-ohri-hiv-app.js",
   "main": "src/index.ts",
@@ -40,7 +40,7 @@
   },
   "peerDependencies": {
     "@openmrs/esm-framework": "5.x",
-    "@openmrs/esm-patient-common-lib": "5.x",
+    "@openmrs/esm-patient-common-lib": "6.x",
     "dayjs": "^1.8.16",
     "react": "^18.2.0",
     "react-i18next": "^11.7.0",
diff --git a/packages/esm-ohri-core-app/package.json b/packages/esm-ohri-core-app/package.json
index 667d76bc0..59ccd087d 100644
--- a/packages/esm-ohri-core-app/package.json
+++ b/packages/esm-ohri-core-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohri/openmrs-esm-ohri-core-app",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "A custom microfrontend for OpenMRS HIV Reference Implementation (OHRI)",
   "browser": "dist/ohri-core-app.js",
   "main": "src/index.ts",
@@ -40,7 +40,7 @@
   },
   "peerDependencies": {
     "@openmrs/esm-framework": "5.x",
-    "@openmrs/esm-patient-common-lib": "5.x",
+    "@openmrs/esm-patient-common-lib": "6.x",
     "dayjs": "^1.8.16",
     "react": "^18.2.0",
     "react-i18next": "^11.7.0",
diff --git a/packages/esm-ohri-pmtct-app/package.json b/packages/esm-ohri-pmtct-app/package.json
index 407a7108e..6c2b8d0a2 100644
--- a/packages/esm-ohri-pmtct-app/package.json
+++ b/packages/esm-ohri-pmtct-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohri/openmrs-esm-ohri-pmtct",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "PMTCT microfrontend for OpenMRS HIV Reference Implementation (OHRI)",
   "browser": "dist/ohri-pmtct-app.js",
   "main": "src/index.ts",
@@ -38,7 +38,7 @@
   },
   "peerDependencies": {
     "@openmrs/esm-framework": "5.x",
-    "@openmrs/esm-patient-common-lib": "5.x",
+    "@openmrs/esm-patient-common-lib": "6.x",
     "dayjs": "^1.8.16",
     "react": "^18.2.0",
     "react-i18next": "^11.7.0",
diff --git a/packages/esm-tb-app/package.json b/packages/esm-tb-app/package.json
index 00d930cfc..961bbdfca 100644
--- a/packages/esm-tb-app/package.json
+++ b/packages/esm-tb-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohri/openmrs-esm-ohri-tb-app",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "Tuberclosis microfrontend for OpenMRS HIV Reference Implementation (OHRI)",
   "browser": "dist/openmrs-esm-ohri-tb-app.js",
   "main": "src/index.ts",
@@ -38,7 +38,7 @@
   },
   "peerDependencies": {
     "@openmrs/esm-framework": "5.x",
-    "@openmrs/esm-patient-common-lib": "5.x",
+    "@openmrs/esm-patient-common-lib": "6.x",
     "dayjs": "^1.8.16",
     "react": "^18.2.0",
     "react-i18next": "^11.18.6"
diff --git a/packages/esm-tb-app/src/views/dashboard/patient-list-tabs/tb-patient-list-tabs.component.tsx b/packages/esm-tb-app/src/views/dashboard/patient-list-tabs/tb-patient-list-tabs.component.tsx
index 68b0a6e21..d445945d3 100644
--- a/packages/esm-tb-app/src/views/dashboard/patient-list-tabs/tb-patient-list-tabs.component.tsx
+++ b/packages/esm-tb-app/src/views/dashboard/patient-list-tabs/tb-patient-list-tabs.component.tsx
@@ -1,9 +1,6 @@
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import {
-  getObsFromEncounter,
-  OHRIPatientListTabs,
-} from '@ohri/openmrs-esm-ohri-commons-lib';
+import { getObsFromEncounter, OHRIPatientListTabs } from '@ohri/openmrs-esm-ohri-commons-lib';
 import { moduleName } from '../../../index';
 import { useConfig } from '@openmrs/esm-framework';
 
@@ -30,7 +27,7 @@ function TbHomePatientTabs() {
           {
             key: 'caseID',
             header: t('caseID', 'Case ID'),
-            getValue: ( { latestEncounter }) => {
+            getValue: ({ latestEncounter }) => {
               return getObsFromEncounter(latestEncounter, config.obsConcepts.caseID);
             },
             index: 1,
@@ -38,14 +35,14 @@ function TbHomePatientTabs() {
           {
             key: 'drugSensitivity',
             header: t('drugSensitivity', 'Drug Sensitivity'),
-            getValue: ({ latestEncounter }) => {              
+            getValue: ({ latestEncounter }) => {
               return getObsFromEncounter(latestEncounter, config.obsConcepts.drugSensitivity);
             },
           },
           {
             key: 'site',
             header: t('siteOfTb,', 'Site of TB'),
-            getValue: ( { latestEncounter } ) => {
+            getValue: ({ latestEncounter }) => {
               return getObsFromEncounter(latestEncounter, config.obsConcepts.site);
             },
           },
@@ -64,7 +61,7 @@ function TbHomePatientTabs() {
             },
           },
         ],
-        viewPatientProgramSummary:true
+        viewPatientProgramSummary: true,
       },
     ],
     [],
diff --git a/yarn.lock b/yarn.lock
index b81a84ec3..65fdb352c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3646,7 +3646,7 @@ __metadata:
     webpack: ^5.74.0
   peerDependencies:
     "@openmrs/esm-framework": 5.x
-    "@openmrs/esm-patient-common-lib": 5.x
+    "@openmrs/esm-patient-common-lib": 6.x
     dayjs: ^1.8.16
     react: ^18.2.0
     react-i18next: ^11.18.6
@@ -3671,7 +3671,7 @@ __metadata:
     yup: ^0.29.1
   peerDependencies:
     "@openmrs/esm-framework": 5.x
-    "@openmrs/esm-patient-common-lib": 5.x
+    "@openmrs/esm-patient-common-lib": 6.x
     dayjs: ^1.8.16
     react: ^18.2.0
     react-i18next: ^11.18.6
@@ -3688,7 +3688,7 @@ __metadata:
     webpack: ^5.74.0
   peerDependencies:
     "@openmrs/esm-framework": 5.x
-    "@openmrs/esm-patient-common-lib": 5.x
+    "@openmrs/esm-patient-common-lib": 6.x
     dayjs: ^1.8.16
     react: ^18.2.0
     react-i18next: ^11.7.0
@@ -3706,7 +3706,7 @@ __metadata:
     webpack: ^5.74.0
   peerDependencies:
     "@openmrs/esm-framework": 5.x
-    "@openmrs/esm-patient-common-lib": 5.x
+    "@openmrs/esm-patient-common-lib": 6.x
     dayjs: ^1.8.16
     react: ^18.2.0
     react-i18next: ^11.7.0
@@ -3746,7 +3746,7 @@ __metadata:
     webpack: ^5.74.0
   peerDependencies:
     "@openmrs/esm-framework": 5.x
-    "@openmrs/esm-patient-common-lib": 5.x
+    "@openmrs/esm-patient-common-lib": 6.x
     dayjs: ^1.8.16
     react: ^18.2.0
     react-i18next: ^11.7.0
@@ -3762,7 +3762,7 @@ __metadata:
     webpack: ^5.74.0
   peerDependencies:
     "@openmrs/esm-framework": 5.x
-    "@openmrs/esm-patient-common-lib": 5.x
+    "@openmrs/esm-patient-common-lib": 6.x
     dayjs: ^1.8.16
     react: ^18.2.0
     react-i18next: ^11.7.0
@@ -3778,7 +3778,7 @@ __metadata:
     webpack: ^5.74.0
   peerDependencies:
     "@openmrs/esm-framework": 5.x
-    "@openmrs/esm-patient-common-lib": 5.x
+    "@openmrs/esm-patient-common-lib": 6.x
     dayjs: ^1.8.16
     react: ^18.2.0
     react-i18next: ^11.18.6