diff --git a/lerna.json b/lerna.json
index 5a98d70e04..1dd077bd00 100644
--- a/lerna.json
+++ b/lerna.json
@@ -4,7 +4,7 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "3.0.3",
+  "version": "3.1.0",
   "command": {
     "publish": {
       "verifyAccess": false
diff --git a/package.json b/package.json
index 171f0e4f11..a184399eab 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,7 @@
     "start-all": "openmrs develop --sources 'packages/esm-*-app/'",
     "ci:publish": "lerna publish from-package --yes",
     "ci:prepublish": "lerna publish from-package --no-git-reset --yes --dist-tag next",
-    "ci:release": "lerna version --no-git-tag-version",
-    "ci:prerelease": "lerna version prerelease --no-git-tag-version --yes",
+    "release": "lerna version --no-git-tag-version",
     "verify": "lerna run lint && lerna run test && lerna run typescript",
     "prettier": "prettier --config prettier.config.js --write \"packages/**/*.{ts,tsx}\"",
     "prepare": "husky install",
diff --git a/packages/esm-form-entry-app/package.json b/packages/esm-form-entry-app/package.json
index 19566b6974..9050c8defb 100644
--- a/packages/esm-form-entry-app/package.json
+++ b/packages/esm-form-entry-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-entry-app",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "license": "MPL-2.0",
   "description": "Form engine entry capabilities for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-form-entry-app.js",
diff --git a/packages/esm-generic-patient-widgets-app/package.json b/packages/esm-generic-patient-widgets-app/package.json
index acab0c8d02..edf616148c 100644
--- a/packages/esm-generic-patient-widgets-app/package.json
+++ b/packages/esm-generic-patient-widgets-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-generic-patient-widgets-app",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "license": "MPL-2.0",
   "description": "Generic widgets for the patient chart",
   "browser": "dist/openmrs-esm-generic-patient-widgets-app.js",
@@ -36,7 +36,7 @@
   "dependencies": {
     "@carbon/charts-react": "^0.49.4",
     "@carbon/icons-react": "^10.18.0",
-    "@openmrs/esm-patient-common-lib": "^3.0.3",
+    "@openmrs/esm-patient-common-lib": "^3.1.0",
     "carbon-components-react": "^7.25.0",
     "d3": "^7.0.3",
     "lodash-es": "^4.17.15"
diff --git a/packages/esm-patient-allergies-app/package.json b/packages/esm-patient-allergies-app/package.json
index 3bd5315246..9b2a27e6e9 100644
--- a/packages/esm-patient-allergies-app/package.json
+++ b/packages/esm-patient-allergies-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-allergies-app",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "license": "MPL-2.0",
   "description": "Patient allergies microfrontend for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-patient-allergies-app.js",
@@ -36,7 +36,7 @@
   "dependencies": {
     "@carbon/charts-react": "^0.49.4",
     "@carbon/icons-react": "^10.18.0",
-    "@openmrs/esm-patient-common-lib": "^3.0.3",
+    "@openmrs/esm-patient-common-lib": "^3.1.0",
     "carbon-components-react": "^7.25.0",
     "d3": "^7.0.3",
     "lodash-es": "^4.17.15"
diff --git a/packages/esm-patient-appointments-app/package.json b/packages/esm-patient-appointments-app/package.json
index 974f728c1d..d51bf34a70 100644
--- a/packages/esm-patient-appointments-app/package.json
+++ b/packages/esm-patient-appointments-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-appointments-app",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "license": "MPL-2.0",
   "description": "Patient appointments microfrontend for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-patient-appointments-app.js",
@@ -36,7 +36,7 @@
   "dependencies": {
     "@carbon/charts-react": "^0.49.4",
     "@carbon/icons-react": "^10.18.0",
-    "@openmrs/esm-patient-common-lib": "^3.0.3",
+    "@openmrs/esm-patient-common-lib": "^3.1.0",
     "carbon-components-react": "^7.25.0",
     "d3": "^7.0.3",
     "lodash-es": "^4.17.15"
diff --git a/packages/esm-patient-attachments-app/package.json b/packages/esm-patient-attachments-app/package.json
index 1ee7c05e22..955dff0704 100644
--- a/packages/esm-patient-attachments-app/package.json
+++ b/packages/esm-patient-attachments-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-attachments-app",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "license": "MPL-2.0",
   "description": "Patient attachments microfrontend for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-patient-attachments-app.js",
@@ -36,7 +36,7 @@
   "dependencies": {
     "@carbon/charts-react": "^0.49.4",
     "@carbon/icons-react": "^10.18.0",
-    "@openmrs/esm-patient-common-lib": "^3.0.3",
+    "@openmrs/esm-patient-common-lib": "^3.1.0",
     "carbon-components-react": "^7.25.0",
     "d3": "^7.0.3",
     "lodash-es": "^4.17.15",
diff --git a/packages/esm-patient-banner-app/package.json b/packages/esm-patient-banner-app/package.json
index 510d1b6f5b..e2e95e9d11 100644
--- a/packages/esm-patient-banner-app/package.json
+++ b/packages/esm-patient-banner-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-banner-app",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "license": "MPL-2.0",
   "description": "Patient banner microfrontend for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-patient-banner-app.js",
@@ -36,7 +36,7 @@
   "dependencies": {
     "@carbon/charts-react": "^0.49.4",
     "@carbon/icons-react": "^10.18.0",
-    "@openmrs/esm-patient-common-lib": "^3.0.3",
+    "@openmrs/esm-patient-common-lib": "^3.1.0",
     "carbon-components-react": "^7.25.0",
     "d3": "^7.0.3",
     "lodash-es": "^4.17.15"
diff --git a/packages/esm-patient-biometrics-app/package.json b/packages/esm-patient-biometrics-app/package.json
index 1dc7d93ec0..cc9b165f4c 100644
--- a/packages/esm-patient-biometrics-app/package.json
+++ b/packages/esm-patient-biometrics-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-biometrics-app",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "license": "MPL-2.0",
   "description": "Patient biometrics microfrontend for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-patient-biometrics-app.js",
@@ -35,7 +35,7 @@
   "dependencies": {
     "@carbon/charts-react": "^0.49.4",
     "@carbon/icons-react": "^10.18.0",
-    "@openmrs/esm-patient-common-lib": "^3.0.3",
+    "@openmrs/esm-patient-common-lib": "^3.1.0",
     "carbon-components-react": "^7.25.0",
     "d3": "^7.0.3",
     "lodash-es": "^4.17.15"
diff --git a/packages/esm-patient-chart-app/package.json b/packages/esm-patient-chart-app/package.json
index 76f2fad1c9..e0b7241682 100644
--- a/packages/esm-patient-chart-app/package.json
+++ b/packages/esm-patient-chart-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-chart-app",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "license": "MPL-2.0",
   "description": "Patient dashboard microfrontend for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-patient-chart-app.js",
@@ -51,7 +51,7 @@
     "rxjs": "6.x"
   },
   "devDependencies": {
-    "@types/uuid": "^8.3.0",
-    "@openmrs/esm-patient-common-lib": "^3.0.3"
+    "@openmrs/esm-patient-common-lib": "^3.1.0",
+    "@types/uuid": "^8.3.0"
   }
 }
diff --git a/packages/esm-patient-clinical-view-app/package.json b/packages/esm-patient-clinical-view-app/package.json
index e9205ab52a..583a0eace8 100644
--- a/packages/esm-patient-clinical-view-app/package.json
+++ b/packages/esm-patient-clinical-view-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-clinical-view-app",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "license": "MPL-2.0",
   "description": "Patient clinical view microfrontend for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-patient-clinical-view-app.js",
@@ -36,7 +36,7 @@
   "dependencies": {
     "@carbon/charts-react": "^0.49.4",
     "@carbon/icons-react": "^10.18.0",
-    "@openmrs/esm-patient-common-lib": "^3.0.3",
+    "@openmrs/esm-patient-common-lib": "^3.1.0",
     "carbon-components-react": "^7.25.0",
     "d3": "^7.0.3",
     "lodash-es": "^4.17.15"
diff --git a/packages/esm-patient-common-lib/package.json b/packages/esm-patient-common-lib/package.json
index cf544c61a0..597a66ad95 100644
--- a/packages/esm-patient-common-lib/package.json
+++ b/packages/esm-patient-common-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-common-lib",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "license": "MPL-2.0",
   "description": "Library for common patient chart components",
   "browser": "dist/openmrs-esm-patient-common-lib.js",
diff --git a/packages/esm-patient-conditions-app/package.json b/packages/esm-patient-conditions-app/package.json
index 2397a730ff..3397d033b3 100644
--- a/packages/esm-patient-conditions-app/package.json
+++ b/packages/esm-patient-conditions-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-conditions-app",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "license": "MPL-2.0",
   "description": "Patient conditions microfrontend for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-patient-conditions-app.js",
@@ -36,7 +36,7 @@
   "dependencies": {
     "@carbon/charts-react": "^0.49.4",
     "@carbon/icons-react": "^10.18.0",
-    "@openmrs/esm-patient-common-lib": "^3.0.3",
+    "@openmrs/esm-patient-common-lib": "^3.1.0",
     "carbon-components-react": "^7.25.0",
     "d3": "^7.0.3",
     "lodash-es": "^4.17.15"
diff --git a/packages/esm-patient-forms-app/package.json b/packages/esm-patient-forms-app/package.json
index df0ddd756e..dd4804abc8 100644
--- a/packages/esm-patient-forms-app/package.json
+++ b/packages/esm-patient-forms-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-forms-app",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "license": "MPL-2.0",
   "description": "Patient forms microfrontend for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-patient-forms-app.js",
@@ -36,7 +36,7 @@
   "dependencies": {
     "@carbon/charts-react": "^0.49.4",
     "@carbon/icons-react": "^10.18.0",
-    "@openmrs/esm-patient-common-lib": "^3.0.3",
+    "@openmrs/esm-patient-common-lib": "^3.1.0",
     "carbon-components-react": "^7.25.0",
     "d3": "^7.0.3",
     "lodash-es": "^4.17.15"
diff --git a/packages/esm-patient-immunizations-app/package.json b/packages/esm-patient-immunizations-app/package.json
index db24247236..4333477abe 100644
--- a/packages/esm-patient-immunizations-app/package.json
+++ b/packages/esm-patient-immunizations-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-immunizations-app",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "license": "MPL-2.0",
   "description": "Patient immunizations microfrontend for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-patient-immunizations-app.js",
@@ -35,7 +35,7 @@
   "dependencies": {
     "@carbon/charts-react": "^0.49.4",
     "@carbon/icons-react": "^10.18.0",
-    "@openmrs/esm-patient-common-lib": "^3.0.3",
+    "@openmrs/esm-patient-common-lib": "^3.1.0",
     "carbon-components-react": "^7.25.0",
     "d3": "^7.0.3",
     "lodash-es": "^4.17.15"
diff --git a/packages/esm-patient-medications-app/package.json b/packages/esm-patient-medications-app/package.json
index b0823d900f..43eb054c6f 100644
--- a/packages/esm-patient-medications-app/package.json
+++ b/packages/esm-patient-medications-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-medications-app",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "license": "MPL-2.0",
   "description": "Patient medications microfrontend for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-patient-medications-app.js",
@@ -36,7 +36,7 @@
   "dependencies": {
     "@carbon/charts-react": "^0.49.4",
     "@carbon/icons-react": "^10.18.0",
-    "@openmrs/esm-patient-common-lib": "^3.0.3",
+    "@openmrs/esm-patient-common-lib": "^3.1.0",
     "carbon-components-react": "^7.25.0",
     "d3": "^7.0.3",
     "lodash-es": "^4.17.15"
diff --git a/packages/esm-patient-notes-app/package.json b/packages/esm-patient-notes-app/package.json
index 7d0362f0d0..312768747b 100644
--- a/packages/esm-patient-notes-app/package.json
+++ b/packages/esm-patient-notes-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-notes-app",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "license": "MPL-2.0",
   "description": "Patient notes microfrontend for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-patient-notes-app.js",
@@ -36,7 +36,7 @@
   "dependencies": {
     "@carbon/charts-react": "^0.49.4",
     "@carbon/icons-react": "^10.18.0",
-    "@openmrs/esm-patient-common-lib": "^3.0.3",
+    "@openmrs/esm-patient-common-lib": "^3.1.0",
     "carbon-components-react": "^7.25.0",
     "d3": "^7.0.3",
     "lodash-es": "^4.17.15"
diff --git a/packages/esm-patient-programs-app/package.json b/packages/esm-patient-programs-app/package.json
index 7ca90d0bf2..07dd7985f2 100644
--- a/packages/esm-patient-programs-app/package.json
+++ b/packages/esm-patient-programs-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-programs-app",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "license": "MPL-2.0",
   "description": "Patient programs microfrontend for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-patient-programs-app.js",
@@ -36,7 +36,7 @@
   "dependencies": {
     "@carbon/charts-react": "^0.49.4",
     "@carbon/icons-react": "^10.18.0",
-    "@openmrs/esm-patient-common-lib": "^3.0.3",
+    "@openmrs/esm-patient-common-lib": "^3.1.0",
     "carbon-components-react": "^7.25.0",
     "d3": "^7.0.3",
     "lodash-es": "^4.17.15"
diff --git a/packages/esm-patient-test-results-app/package.json b/packages/esm-patient-test-results-app/package.json
index 72fc51c402..a459bc1829 100644
--- a/packages/esm-patient-test-results-app/package.json
+++ b/packages/esm-patient-test-results-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-test-results-app",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "license": "MPL-2.0",
   "description": "Patient notes microfrontend for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-patient-test-results-app.js",
@@ -36,7 +36,7 @@
   "dependencies": {
     "@carbon/charts-react": "^0.49.4",
     "@carbon/icons-react": "^10.18.0",
-    "@openmrs/esm-patient-common-lib": "^3.0.3",
+    "@openmrs/esm-patient-common-lib": "^3.1.0",
     "carbon-components-react": "^7.25.0",
     "d3": "^7.0.3",
     "lodash-es": "^4.17.15"
diff --git a/packages/esm-patient-vitals-app/package.json b/packages/esm-patient-vitals-app/package.json
index 8d273e6629..0f6365b60b 100644
--- a/packages/esm-patient-vitals-app/package.json
+++ b/packages/esm-patient-vitals-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-vitals-app",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "license": "MPL-2.0",
   "description": "Patient vitals microfrontend for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-patient-vitals-app.js",
@@ -36,7 +36,7 @@
   "dependencies": {
     "@carbon/charts-react": "^0.49.4",
     "@carbon/icons-react": "^10.18.0",
-    "@openmrs/esm-patient-common-lib": "^3.0.3",
+    "@openmrs/esm-patient-common-lib": "^3.1.0",
     "carbon-components-react": "^7.25.0",
     "d3": "^7.0.3",
     "lodash-es": "^4.17.15"