diff --git a/packages/apps/esm-login-app/src/login.resource.ts b/packages/apps/esm-login-app/src/login.resource.ts
index be2a3f442..5a1a9c034 100644
--- a/packages/apps/esm-login-app/src/login.resource.ts
+++ b/packages/apps/esm-login-app/src/login.resource.ts
@@ -6,6 +6,7 @@ import {
   fhirBaseUrl,
   openmrsFetch,
   refetchCurrentUser,
+  restBaseUrl,
   type FetchResponse,
   type Session,
   useDebounce,
@@ -108,7 +109,7 @@ export function useLoginLocations(
 export async function performLogin(username: string, password: string): Promise<{ data: Session }> {
   const abortController = new AbortController();
   const token = window.btoa(`${username}:${password}`);
-  const url = `/ws/rest/v1/session`;
+  const url = `${restBaseUrl}/session`;
 
   return openmrsFetch(url, {
     headers: {
diff --git a/packages/apps/esm-primary-navigation-app/src/components/change-language/change-language.resource.ts b/packages/apps/esm-primary-navigation-app/src/components/change-language/change-language.resource.ts
index c0bbb9460..7cd7ac6a5 100644
--- a/packages/apps/esm-primary-navigation-app/src/components/change-language/change-language.resource.ts
+++ b/packages/apps/esm-primary-navigation-app/src/components/change-language/change-language.resource.ts
@@ -1,4 +1,4 @@
-import { openmrsFetch, queueSynchronizationItemFor } from '@openmrs/esm-framework/src/internal';
+import { openmrsFetch, restBaseUrl, queueSynchronizationItemFor } from '@openmrs/esm-framework/src/internal';
 import { userPropertyChange } from '../../constants';
 
 export type PostUserProperties = (
@@ -12,7 +12,7 @@ export async function postUserPropertiesOnline(
   userProperties: Record<string, string>,
   abortController: AbortController,
 ): Promise<void> {
-  await openmrsFetch(`/ws/rest/v1/user/${userUuid}`, {
+  await openmrsFetch(`${restBaseUrl}/user/${userUuid}`, {
     method: 'POST',
     body: { userProperties },
     headers: { 'Content-Type': 'application/json' },
diff --git a/packages/framework/esm-styleguide/src/patient-banner/contact-details/usePatientListsForPatient.ts b/packages/framework/esm-styleguide/src/patient-banner/contact-details/usePatientListsForPatient.ts
index f63194e9b..7fdee5f2d 100644
--- a/packages/framework/esm-styleguide/src/patient-banner/contact-details/usePatientListsForPatient.ts
+++ b/packages/framework/esm-styleguide/src/patient-banner/contact-details/usePatientListsForPatient.ts
@@ -1,11 +1,13 @@
 import { useMemo } from 'react';
 import useSWR from 'swr';
-import { type FetchResponse, openmrsFetch } from '@openmrs/esm-api';
+import { type FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-api';
 import { type CohortMemberResponse } from './types';
 
 export function usePatientListsForPatient(patientUuid: string) {
   const customRepresentation = 'custom:(uuid,patient:ref,cohort:(uuid,name,startDate,endDate))';
-  const url = patientUuid ? `ws/rest/v1/cohortm/cohortmember?patient=${patientUuid}&v=${customRepresentation}` : null;
+  const url = patientUuid
+    ? `${restBaseUrl}/cohortm/cohortmember?patient=${patientUuid}&v=${customRepresentation}`
+    : null;
   const { data, isLoading } = useSWR<FetchResponse<CohortMemberResponse>, Error>(url, openmrsFetch);
 
   const cohorts = data?.data?.results.map((ref) => ({
diff --git a/packages/framework/esm-styleguide/src/patient-banner/patient-info/patient-banner-patient-identifiers.component.tsx b/packages/framework/esm-styleguide/src/patient-banner/patient-info/patient-banner-patient-identifiers.component.tsx
index 0d1be34d5..f9a21c9ec 100644
--- a/packages/framework/esm-styleguide/src/patient-banner/patient-info/patient-banner-patient-identifiers.component.tsx
+++ b/packages/framework/esm-styleguide/src/patient-banner/patient-info/patient-banner-patient-identifiers.component.tsx
@@ -1,9 +1,9 @@
 /** @module @category UI */
+import React from 'react';
 import { Tag } from '@carbon/react';
 import { useConfig, usePrimaryIdentifierCode } from '@openmrs/esm-react-utils';
-import React from 'react';
-import styles from './patient-banner-patient-info.module.scss';
 import { type StyleguideConfigObject } from '../../config-schema';
+import styles from './patient-banner-patient-info.module.scss';
 
 interface PatientBannerPatientIdentifierProps {
   identifier: fhir.Identifier[] | undefined;