diff --git a/blocks/commerce-order-header/commerce-order-header.js b/blocks/commerce-order-header/commerce-order-header.js
index 43365f85aa..843eb6e0fe 100644
--- a/blocks/commerce-order-header/commerce-order-header.js
+++ b/blocks/commerce-order-header/commerce-order-header.js
@@ -16,7 +16,7 @@ export default async function decorate(block) {
 
     const link = document.createElement('a');
 
-    link.innerText = placeholders.orderOrderDetailsBack;
+    link.innerText = placeholders?.Custom?.CommerceOrderHeader?.backToAllOrders;
     link.href = CUSTOMER_ORDERS_PATH;
     link.classList.add('orders-list-link');
 
diff --git a/blocks/commerce-order-status/commerce-order-status.js b/blocks/commerce-order-status/commerce-order-status.js
index 137ce655f4..d47b0061a6 100644
--- a/blocks/commerce-order-status/commerce-order-status.js
+++ b/blocks/commerce-order-status/commerce-order-status.js
@@ -10,5 +10,6 @@ import '../../scripts/initializers/order.js';
 export default async function decorate(block) {
   await orderRenderer.render(OrderStatus, {
     routeCreateReturn: (orderData) => (checkIsAuthenticated() ? `/customer/create-return?orderId=${orderData.id}` : `/create-return?orderId=${orderData.id}`),
+    routeOnSuccess: () => '/cart',
   })(block);
 }
diff --git a/blocks/commerce-return-header/commerce-return-header.js b/blocks/commerce-return-header/commerce-return-header.js
index 82f77ae521..47bf19ea4f 100644
--- a/blocks/commerce-return-header/commerce-return-header.js
+++ b/blocks/commerce-return-header/commerce-return-header.js
@@ -16,7 +16,7 @@ export default async function decorate(block) {
 
     const link = document.createElement('a');
 
-    link.innerText = placeholders.orderReturnDetailsBack;
+    link.innerText = placeholders?.Custom?.CommerceReturnHeader?.backToAllReturns;
     link.href = CUSTOMER_RETURNS_PATH;
     link.classList.add('returns-list-header');
 
diff --git a/scripts/configs.js b/scripts/configs.js
index 6aa73b619c..6f3869f83b 100644
--- a/scripts/configs.js
+++ b/scripts/configs.js
@@ -77,9 +77,6 @@ export const getConfigValue = async (configParam, environment) => {
   const env = environment || calcEnvironment();
   const config = await getConfigForEnvironment(env);
   const configElements = config.data;
-
-  if (configParam === 'commerce-core-endpoint') return 'https://mcstaging.aemshop.net/graphql';
-
   return configElements.find((c) => c.key === configParam)?.value;
 };