diff --git a/gulpfile.js b/gulpfile.js
index d91e70fc7..0a9ecdc55 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -76,6 +76,12 @@ gulp.task('copy-bootswatch5', function() {
     return pipeline(gulp.src('./node_modules/bootswatch5/dist/yeti/*.min.css'),gulp.dest('public/resources/bootswatch5/yeti'));
 });
 
+// Copy the bootstrap style into its own folder so OSPOS can select it from the collection
+gulp.task('copy-bootstrap', function() {
+    pipeline(gulp.src('./node_modules/bootstrap/dist/css/bootstrap.min.css*'),gulp.dest('public/resources/bootswatch/bootstrap'));
+    return pipeline(gulp.src('./node_modules/bootstrap5/dist/css/bootstrap.min.css*', {encoding:false}),gulp.dest('public/resources/bootswatch5/bootstrap'));
+});
+
 // /public/resources/ospos - contains the minimized files to be packed into opensourcepos.min.[css/js]
 // /public/resources/[css/js] - contains the unpacked versions to be used in development mode
 // /public/resources - contains the packed opensourcepos.min.[css/js] and the jquery.min.js
@@ -268,6 +274,7 @@ gulp.task('default',
     gulp.series('clean',
         'copy-bootswatch',
         'copy-bootswatch5',
+        'copy-bootstrap',
         'debug-js',
         'prod-js',
         'debug-css',
diff --git a/package-lock.json b/package-lock.json
index ab523eccc..b1f90251f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,9 +18,9 @@
                 "bootstrap-tagsinput-2021": "^0.8.6",
                 "bootstrap-toggle": "^2.2.2",
                 "bootstrap3-dialog": "github:nakupanda/bootstrap3-dialog#master",
-                "bootstrap5": "npm:bootstrap@^5.3.3",
+                "bootstrap5": "npm:bootstrap@^5.3.5",
                 "bootswatch": "^3.4.1",
-                "bootswatch5": "npm:bootswatch@^5.3.3",
+                "bootswatch5": "npm:bootswatch@^5.3.5",
                 "chartist": "^0.11.4",
                 "chartist-plugin-axistitle": "^0.0.7",
                 "chartist-plugin-barlabels": "^0.0.5",
@@ -690,9 +690,9 @@
         },
         "node_modules/bootstrap5": {
             "name": "bootstrap",
-            "version": "5.3.3",
-            "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz",
-            "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==",
+            "version": "5.3.5",
+            "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.5.tgz",
+            "integrity": "sha512-ct1CHKtiobRimyGzmsSldEtM03E8fcEX4Tb3dGXz1V8faRwM50+vfHwTzOxB3IlKO7m+9vTH3s/3C6T2EAPeTA==",
             "funding": [
                 {
                     "type": "github",
@@ -703,6 +703,7 @@
                     "url": "https://opencollective.com/bootstrap"
                 }
             ],
+            "license": "MIT",
             "peerDependencies": {
                 "@popperjs/core": "^2.11.8"
             }
@@ -717,9 +718,10 @@
         },
         "node_modules/bootswatch5": {
             "name": "bootswatch",
-            "version": "5.3.3",
-            "resolved": "https://registry.npmjs.org/bootswatch/-/bootswatch-5.3.3.tgz",
-            "integrity": "sha512-cJLhobnZsVCelU7zdH/L7wpcXAyUoTX4/5l2dWQ0JXgaVK80BdTQNU/ImWwoyIGBeyms4iQDAdNtOfPQZf0Atg=="
+            "version": "5.3.5",
+            "resolved": "https://registry.npmjs.org/bootswatch/-/bootswatch-5.3.5.tgz",
+            "integrity": "sha512-1z8LNoUL5NHmv/hNROALQ6qtjw9OJIjMgP8ovBlIft+oI15b/mvnzxGL896iO9LtoDZH0Vdm+D2YW+j03GduSg==",
+            "license": "MIT"
         },
         "node_modules/brace-expansion": {
             "version": "2.0.1",
diff --git a/package.json b/package.json
index 5f64c7c78..ff453df26 100644
--- a/package.json
+++ b/package.json
@@ -39,9 +39,9 @@
         "bootstrap-tagsinput-2021": "^0.8.6",
         "bootstrap-toggle": "^2.2.2",
         "bootstrap3-dialog": "github:nakupanda/bootstrap3-dialog#master",
-        "bootstrap5": "npm:bootstrap@^5.3.3",
+        "bootstrap5": "npm:bootstrap@^5.3.5",
         "bootswatch": "^3.4.1",
-        "bootswatch5": "npm:bootswatch@^5.3.3",
+        "bootswatch5": "npm:bootswatch@^5.3.5",
         "chartist": "^0.11.4",
         "chartist-plugin-axistitle": "^0.0.7",
         "chartist-plugin-barlabels": "^0.0.5",