diff --git a/packages/esm-care-panel-app/src/program-enrollment/program-enrollment-hiv.component.tsx b/packages/esm-care-panel-app/src/program-enrollment/program-enrollment-hiv.component.tsx
index a326826e..ad74929a 100644
--- a/packages/esm-care-panel-app/src/program-enrollment/program-enrollment-hiv.component.tsx
+++ b/packages/esm-care-panel-app/src/program-enrollment/program-enrollment-hiv.component.tsx
@@ -8,6 +8,7 @@ import { ProgramData } from '../types/index';
 import { usePatient } from '@openmrs/esm-framework';
 import { configSchema } from '../config-schema';
 import { ProgramEnrollmentProps } from '../hooks/useCarePrograms';
+import RegimenButton from '../regimen-editor/regimen-button.component';
 
 const ProgramEnrollment: React.FC<ProgramEnrollmentProps> = ({ enrollments = [], patientUuid }) => {
   const { t } = useTranslation();
@@ -134,6 +135,9 @@ const ProgramEnrollment: React.FC<ProgramEnrollmentProps> = ({ enrollments = [],
             <p className={styles.label}>{t('currentRegimen', 'Current Regimen')}</p>
 
             <span className={styles.value}>{programData.currentRegimen}</span>
+            <span>
+              <RegimenButton />
+            </span>
           </div>
           <div className={styles.content}>
             <p className={styles.label}>{t('whoStage', 'WHO Stage')}</p>
diff --git a/packages/esm-care-panel-app/src/program-summary/program-summary.component.tsx b/packages/esm-care-panel-app/src/program-summary/program-summary.component.tsx
index 169da1bd..d9467327 100644
--- a/packages/esm-care-panel-app/src/program-summary/program-summary.component.tsx
+++ b/packages/esm-care-panel-app/src/program-summary/program-summary.component.tsx
@@ -79,7 +79,7 @@ const ProgramSummary: React.FC<ProgramSummaryProps> = ({ patientUuid, programNam
                         ? data?.HIV?.lastEncDetails?.regimenShortDisplay
                         : t('neverOnArvRegimen', 'Never on ARVs')}
                       <span>
-                        <RegimenButton
+                        {/* <RegimenButton
                           patientUuid={patientUuid}
                           category={programName}
                           onRegimen={
@@ -88,7 +88,7 @@ const ProgramSummary: React.FC<ProgramSummaryProps> = ({ patientUuid, programNam
                               : ''
                           }
                           lastRegimenEncounter={regimenEncounter}
-                        />
+                        /> */}
                       </span>
                     </p>
                   </div>
@@ -147,12 +147,6 @@ const ProgramSummary: React.FC<ProgramSummaryProps> = ({ patientUuid, programNam
                           ? data?.TB?.lastTbEncounter?.regimenShortDisplay
                           : t('neverOnTbRegimen', 'Never on TB regimen')}
                       </span>
-                      <RegimenButton
-                        patientUuid={patientUuid}
-                        category={programName}
-                        onRegimen={data?.TB?.lastTbEncounter ? data?.TB?.lastTbEncounter?.regimenShortDisplay : ''}
-                        lastRegimenEncounter={regimenEncounter}
-                      />
                     </p>
                   </div>
                   <div className={styles.content}>
diff --git a/packages/esm-care-panel-app/src/regimen-editor/regimen-button.component.tsx b/packages/esm-care-panel-app/src/regimen-editor/regimen-button.component.tsx
index b1a81c58..da93616a 100644
--- a/packages/esm-care-panel-app/src/regimen-editor/regimen-button.component.tsx
+++ b/packages/esm-care-panel-app/src/regimen-editor/regimen-button.component.tsx
@@ -1,39 +1,33 @@
 import React from 'react';
-import { Link } from '@carbon/react';
-
 import { useTranslation } from 'react-i18next';
-import { RegimenType } from '../types';
-import { launchPatientWorkspace } from '@openmrs/esm-patient-common-lib';
+import { launchPatientWorkspace, useLaunchWorkspaceRequiringVisit } from '@openmrs/esm-patient-common-lib';
+import { Link } from '@carbon/react';
 import styles from './standard-regimen.scss';
 
-interface RegimenButtonProps {
-  patientUuid: string;
-  category: string;
-  onRegimen: string;
-  lastRegimenEncounter: {
-    uuid: string;
-    startDate: string;
-    endDate: string;
-    event: string;
+const RegimenButton: React.FC = () => {
+  const { t } = useTranslation();
+  const launchFormsWorkspace = useLaunchWorkspaceRequiringVisit('patient-form-entry-workspace');
+
+  const launchPatientWorkspaceCb = () => {
+    launchFormsWorkspace();
   };
-}
 
-const RegimenButton: React.FC<RegimenButtonProps> = ({ category, patientUuid, onRegimen, lastRegimenEncounter }) => {
-  const { t } = useTranslation();
   return (
-    <Link
-      className={styles.linkName}
-      onClick={() =>
-        launchPatientWorkspace('patient-regimen-workspace', {
-          category: RegimenType[category],
-          patientUuid: patientUuid,
-          onRegimen: onRegimen,
-          lastRegimenEncounter: lastRegimenEncounter,
-        })
-      }
-    >
-      {t('editRegimen', 'Edit')}
-    </Link>
+    <>
+      <Link
+        className={styles.linkName}
+        onClick={() =>
+          launchPatientWorkspace('patient-form-entry-workspace', {
+            formInfo: {
+              formUuid: '53a3850c-855a-11eb-8dcd-0242ac130003',
+            },
+            workspaceTitle: 'Clinical Form',
+          })
+        }
+      >
+        {t('editRegimen', 'Change Regimen')}
+      </Link>
+    </>
   );
 };
 
diff --git a/packages/esm-ugandaemr-app/src/dashboard.meta.tsx b/packages/esm-ugandaemr-app/src/dashboard.meta.tsx
index 8126f9f0..4342f86d 100644
--- a/packages/esm-ugandaemr-app/src/dashboard.meta.tsx
+++ b/packages/esm-ugandaemr-app/src/dashboard.meta.tsx
@@ -1,4 +1,3 @@
-
 // Patient Chart
 export const clinicalViewsDividerMeta = {
   name: 'clinical-views-divider',