diff --git a/js-storefront/bootstrap.sh b/js-storefront/bootstrap.sh
index 90ae2ba..35e214e 100755
--- a/js-storefront/bootstrap.sh
+++ b/js-storefront/bootstrap.sh
@@ -80,16 +80,6 @@ EOF
     progress "Applying optimizations"
     cp -r "../bootstrap/.vscode" .
     angular="$(grep -i '@angular/animations' package.json | awk '{ print $2 }')"
-    mkdir -p "patches"
-    for template in ../bootstrap/patches/*.patch; do
-        output="patches/$(basename "$template")"
-        sed "s/@NAME@/$NAME/g" "$template" > "$output.1"
-        sed "s/@ANGULAR@/$angular/g" "$output.1" > "$output"
-        rm "$output.1"
-    done
-    for patch in patches/*.patch; do
-        patch -p0 < "$patch" || true
-    done
     yarn install
 )
 progress "Generating Manifest"
diff --git a/js-storefront/bootstrap/patches/environments.patch b/js-storefront/bootstrap/patches/environments.patch
deleted file mode 100644
index 4041402..0000000
--- a/js-storefront/bootstrap/patches/environments.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/environments/environment.prod.ts	2021-04-23 11:57:19.000000000 +0200
-+++ src/environments/environment.prod.ts	2021-04-23 12:17:50.000000000 +0200
-@@ -1,3 +1,4 @@
- export const environment = {
--  production: true
-+  production: true,
-+  occBaseUrl: undefined
- };
---- src/environments/environment.ts	2021-04-23 11:57:19.000000000 +0200
-+++ src/environments/environment.ts	2021-04-23 12:17:59.000000000 +0200
-@@ -3,7 +3,8 @@
- // The list of file replacements can be found in `angular.json`.
- 
- export const environment = {
--  production: false
-+  production: false,
-+  occBaseUrl: 'https://localhost:9002'
- };
- 
- /*
diff --git a/js-storefront/bootstrap/patches/index.html.patch b/js-storefront/bootstrap/patches/index.html.patch
deleted file mode 100644
index 84fcffa..0000000
--- a/js-storefront/bootstrap/patches/index.html.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/index.html	2021-04-23 12:00:23.000000000 +0200
-+++ src/index.html	2021-04-23 12:27:23.000000000 +0200
-@@ -6,7 +6,7 @@
-   <base href="/">
-   <meta name="viewport" content="width=device-width, initial-scale=1">
-   <link rel="icon" type="image/x-icon" href="favicon.ico">
--  <meta name="occ-backend-base-url" content="https://localhost:9002"/>
-+  <meta name="occ-backend-base-url" content="OCC_BACKEND_BASE_URL_VALUE"/>
-   <meta name="media-backend-base-url" content="MEDIA_BACKEND_BASE_URL_VALUE"/>
-   <link rel="manifest" href="manifest.webmanifest">
-   <meta name="theme-color" content="#1976d2">
diff --git a/js-storefront/bootstrap/patches/package.json.patch b/js-storefront/bootstrap/patches/package.json.patch
deleted file mode 100644
index 2cef759..0000000
--- a/js-storefront/bootstrap/patches/package.json.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- package.json	2021-04-23 12:00:23.000000000 +0200
-+++ package.json	2021-04-23 13:03:20.000000000 +0200
-@@ -3,17 +3,18 @@
-   "version": "0.0.0",
-   "scripts": {
-     "ng": "ng",
--    "start": "ng serve",
--    "build": "ng build",
-+    "start": "ng serve --ssl",
-+    "build": "yarn run build:ssr",
-     "watch": "ng build --watch --configuration development",
-     "test": "ng test",
--    "dev:ssr": "ng run @NAME@:serve-ssr",
-+    "dev:ssr": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 ng run @NAME@:serve-ssr",
-     "serve:ssr": "node dist/@NAME@/server/main.js",
-     "build:ssr": "ng build && ng run @NAME@:server",
-     "prerender": "ng run @NAME@:prerender"
-   },
-   "private": true,
-   "dependencies": {
-+    "cross-env": "^7.0.3",
-     "@angular/animations": @ANGULAR@
-     "@angular/common": @ANGULAR@
-     "@angular/compiler": @ANGULAR@
diff --git a/js-storefront/bootstrap/patches/smart-edit-feature.module.ts.patch b/js-storefront/bootstrap/patches/smart-edit-feature.module.ts.patch
deleted file mode 100644
index 0d4187c..0000000
--- a/js-storefront/bootstrap/patches/smart-edit-feature.module.ts.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/app/spartacus/features/smartedit/smart-edit-feature.module.ts	2021-07-16 09:53:45.000000000 +0200
-+++ src/app/spartacus/features/smartedit/smart-edit-feature.module.ts	2021-07-16 09:52:35.000000000 +0200
-@@ -1,6 +1,6 @@
- import { NgModule } from '@angular/core';
- import { CmsConfig, provideConfig } from "@spartacus/core";
--import { SmartEditRootModule, SMART_EDIT_FEATURE } from "@spartacus/smartedit/root";
-+import { SmartEditConfig, SmartEditRootModule, SMART_EDIT_FEATURE } from "@spartacus/smartedit/root";
- 
- @NgModule({
-   declarations: [],
-@@ -14,6 +14,12 @@
-           import('@spartacus/smartedit').then((m) => m.SmartEditModule),
-       },
-     }
--  })]
-+  }),
-+  provideConfig(<SmartEditConfig>{
-+    smartEdit: {
-+      allowOrigin: 'localhost:9002, *.*.model-t.cc.commerce.ondemand.com:443',
-+    },
-+  })
-+  ]
- })
- export class SmartEditFeatureModule { }
diff --git a/js-storefront/bootstrap/patches/spartacus-configuration.module.ts.patch b/js-storefront/bootstrap/patches/spartacus-configuration.module.ts.patch
deleted file mode 100644
index ce719a8..0000000
--- a/js-storefront/bootstrap/patches/spartacus-configuration.module.ts.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/app/spartacus/spartacus-configuration.module.ts	2021-09-11 07:58:00.000000000 +0200
-+++ src/app/spartacus/spartacus-configuration.module.ts	2021-09-11 08:03:48.000000000 +0200
-@@ -2,6 +2,7 @@
- import { translationChunksConfig, translations } from "@spartacus/assets";
- import { FeaturesConfig, I18nConfig, OccConfig, provideConfig, SiteContextConfig } from "@spartacus/core";
- import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacus/storefront";
-+import { environment } from 'src/environments/environment';
- 
- @NgModule({
-   declarations: [],
-@@ -10,10 +11,14 @@
-   providers: [provideConfig(layoutConfig), provideConfig(mediaConfig), ...defaultCmsContentProviders, provideConfig(<OccConfig>{
-     backend: {
-       occ: {
-+        baseUrl: environment.occBaseUrl
-       }
-     },
-   }), provideConfig(<SiteContextConfig>{
-     context: {
-+      // TODO: adjust parameters and site
-+      // urlParameters: ['baseSite', 'language', 'currency'],
-+      // baseSite: ['electronics-spa'],
-       currency: ['USD'],
-       language: ['en'],
-     },