diff --git a/integration-libs/opf/base/core/services/opf-endpoints.service.spec.ts b/integration-libs/opf/base/core/services/opf-endpoints.service.spec.ts
index aa4a350f936..c5471702ab1 100644
--- a/integration-libs/opf/base/core/services/opf-endpoints.service.spec.ts
+++ b/integration-libs/opf/base/core/services/opf-endpoints.service.spec.ts
@@ -19,7 +19,7 @@ describe('OpfEndpointsService', () => {
   beforeEach(() => {
     opfConfigMock = {
       opf: {
-        baseUrl: 'https://elec-spa.com/opf',
+        opfBaseUrl: 'https://elec-spa.com/opf',
       },
     };
     opfApiConfigMock = {
@@ -70,7 +70,7 @@ describe('OpfEndpointsService', () => {
     });
 
     it('should return an empty string when baseUrl is empty', () => {
-      service['opfConfig'] = { opf: { baseUrl: '' } };
+      service['opfConfig'] = { opf: { opfBaseUrl: '' } };
       const result = service['getBaseEndpoint']();
       expect(result).toEqual('');
     });
diff --git a/integration-libs/opf/base/core/services/opf-endpoints.service.ts b/integration-libs/opf/base/core/services/opf-endpoints.service.ts
index 7a516abe1fe..e4b34bd70ac 100644
--- a/integration-libs/opf/base/core/services/opf-endpoints.service.ts
+++ b/integration-libs/opf/base/core/services/opf-endpoints.service.ts
@@ -59,8 +59,8 @@ export class OpfEndpointsService {
   }
 
   private getBaseEndpoint(): string {
-    if (this.opfConfig && this.opfConfig.opf && this.opfConfig.opf.baseUrl) {
-      return this.opfConfig.opf.baseUrl;
+    if (this.opfConfig && this.opfConfig.opf && this.opfConfig.opf.opfBaseUrl) {
+      return this.opfConfig.opf.opfBaseUrl;
     }
 
     return '';
diff --git a/integration-libs/opf/base/root/config/default-opf-config.ts b/integration-libs/opf/base/root/config/default-opf-config.ts
index 1603702be26..892fa7fc041 100644
--- a/integration-libs/opf/base/root/config/default-opf-config.ts
+++ b/integration-libs/opf/base/root/config/default-opf-config.ts
@@ -8,6 +8,6 @@ import { OpfConfig } from './opf-config';
 
 export const defaultOpfConfig: OpfConfig = {
   opf: {
-    baseUrl: '',
+    opfBaseUrl: '',
   },
 };
diff --git a/integration-libs/opf/base/root/config/opf-config.ts b/integration-libs/opf/base/root/config/opf-config.ts
index 69239ad68f0..5fcde7c4cc4 100644
--- a/integration-libs/opf/base/root/config/opf-config.ts
+++ b/integration-libs/opf/base/root/config/opf-config.ts
@@ -13,7 +13,7 @@ import { Config } from '@spartacus/core';
 })
 export abstract class OpfConfig {
   opf?: {
-    baseUrl?: string;
+    opfBaseUrl?: string;
     commerceCloudPublicKey?: string;
   };
 }
diff --git a/integration-libs/opf/schematics/add-opf/schema.json b/integration-libs/opf/schematics/add-opf/schema.json
index 20cb03abef8..c106443db2c 100644
--- a/integration-libs/opf/schematics/add-opf/schema.json
+++ b/integration-libs/opf/schematics/add-opf/schema.json
@@ -44,7 +44,7 @@
         "OPF-Quick-Buy"
       ]
     },
-    "baseUrl": {
+    "opfBaseUrl": {
       "type": "string",
       "description": "The base url of Cloud Commerce Adapter for Open Payment Framework integration",
       "x-prompt": "[OPF] What is the base URL (origin) of your OPF Cloud Commerce Adapter?"
diff --git a/projects/schematics/src/shared/lib-configs/integration-libs/opf-schematics-config.ts b/projects/schematics/src/shared/lib-configs/integration-libs/opf-schematics-config.ts
index 255db7158a2..d755feb2729 100644
--- a/projects/schematics/src/shared/lib-configs/integration-libs/opf-schematics-config.ts
+++ b/projects/schematics/src/shared/lib-configs/integration-libs/opf-schematics-config.ts
@@ -31,8 +31,7 @@ import { AdditionalFeatureConfiguration } from '../../utils/feature-utils';
 import { LibraryOptions, SchematicConfig } from '../../utils/lib-utils';
 
 export interface SpartacusOpfOptions extends LibraryOptions {
-  baseUrl?: string;
-  commerceCloudApiUrl?: string;
+  opfBaseUrl?: string;
   commerceCloudPublicKey?: string;
 }
 
@@ -261,7 +260,7 @@ function buildOpfConfig(
       ],
       content: `<${OPF_CONFIG}>{
           opf: {
-            baseUrl: "${options.commerceCloudApiUrl || options.baseUrl || 'PLACEHOLDER_OPF_BASE_URL'}",
+            opfBaseUrl: "${options.opfBaseUrl || 'PLACEHOLDER_OPF_BASE_URL'}",
             commerceCloudPublicKey: "${
               options.commerceCloudPublicKey ||
               'PLACEHOLDER_COMMERCE_CLOUD_PUBLIC_KEY'
diff --git a/projects/storefrontapp/src/app/spartacus/features/opf/opf-feature.module.ts b/projects/storefrontapp/src/app/spartacus/features/opf/opf-feature.module.ts
index 0a044785627..13ed200b19e 100644
--- a/projects/storefrontapp/src/app/spartacus/features/opf/opf-feature.module.ts
+++ b/projects/storefrontapp/src/app/spartacus/features/opf/opf-feature.module.ts
@@ -117,7 +117,7 @@ if (environment.b2b) {
     }),
     provideConfig(<OpfConfig>{
       opf: {
-        baseUrl:
+        opfBaseUrl:
           'https://cp96avkh5f-integrati2-d2.opf.commerce.stage.context.cloud.sap/commerce-cloud-adapter-stage/storefront',
         commerceCloudPublicKey: 'k2N3m3TJPLragwia5ZUvS/qkIPVQoy5qjUkOAB6Db+U=',
       },
diff --git a/scripts/install/functions.sh b/scripts/install/functions.sh
index 7b28acfe870..c8ad7e646e1 100644
--- a/scripts/install/functions.sh
+++ b/scripts/install/functions.sh
@@ -136,7 +136,7 @@ function add_epd_visualization {
 
 function add_opf {
     if [ "$ADD_OPF" = true ] ; then
-        ng add @spartacus/opf@${SPARTACUS_VERSION} --base-url ${OPF_BASE_URL} --commerce-cloud-public-key ${OPF_CLIENT_PUBLIC_KEY} --skip-confirmation --no-interactive
+        ng add @spartacus/opf@${SPARTACUS_VERSION} --opf-base-url ${OPF_BASE_URL} --commerce-cloud-public-key ${OPF_CLIENT_PUBLIC_KEY} --skip-confirmation --no-interactive
     fi
 }