diff --git a/integration-libs/opf/base/core/services/opf-payment-error-handler.service.ts b/integration-libs/opf/base/core/services/opf-payment-error-handler.service.ts
index 334ba93d5bd..117e10d0f55 100644
--- a/integration-libs/opf/base/core/services/opf-payment-error-handler.service.ts
+++ b/integration-libs/opf/base/core/services/opf-payment-error-handler.service.ts
@@ -15,7 +15,7 @@ import {
   OpfPaymentError,
   PaymentErrorType,
   defaultError,
-} from '../../root/model/opf-payment-error.model';
+} from '@spartacus/opf/base/root';
 
 @Injectable({ providedIn: 'root' })
 export class OpfPaymentErrorHandlerService {
diff --git a/package.json b/package.json
index c9ea234df22..717e5c137f9 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "build:schematics": "npm --prefix projects/schematics run build",
     "build:setup": "nx build setup --configuration production",
     "build:ssr": "env-cmd --no-override -e dev,b2c,$SPA_ENV nx run storefrontapp:server:production",
+    "build:ssr:opf": "env-cmd --no-override -e opf,b2c,$SPA_ENV nx run storefrontapp:server:production",
     "build:ssr:ci": "env-cmd -e ci,b2c,$SPA_ENV nx run storefrontapp:server:production",
     "build:storefinder": "npm --prefix feature-libs/storefinder run build:schematics && nx build storefinder --configuration production",
     "build:smartedit": "npm --prefix feature-libs/smartedit run build:schematics && nx build smartedit --configuration production",
@@ -85,7 +86,7 @@
     "test:storefront:lib": "nx test storefrontlib --source-map --code-coverage",
     "test:opf:lib": "nx test opf --source-map --code-coverage",
     "dev:ssr": "env-cmd --no-override -e dev,b2c,$SPA_ENV cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 nx run storefrontapp:serve-ssr",
-    "dev:opf:ssr": "env-cmd --no-override -e opf,b2c,$SPA_ENV cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 nx run storefrontapp:serve-ssr",
+    "dev:ssr:opf": "env-cmd --no-override -e opf,b2c,$SPA_ENV cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 nx run storefrontapp:serve-ssr",
     "serve:ssr": "node dist/storefrontapp-server/main.js",
     "serve:ssr:ci": "NODE_TLS_REJECT_UNAUTHORIZED=0 SSR_TIMEOUT=0 node dist/storefrontapp-server/main.js",
     "serve:ssr:dev": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 node dist/storefrontapp-server/main.js",