diff --git a/build_config/entry/chart_formats_count.entry.js b/build_config/entry/chart_formats_count.entry.js
index c6cb5e47..944a1d24 100644
--- a/build_config/entry/chart_formats_count.entry.js
+++ b/build_config/entry/chart_formats_count.entry.js
@@ -5,8 +5,12 @@ import $ from "jquery";
 window.$ = $;
 window.jQuery = $;
 
-import bootstrap from "bootstrap";
-window.bootstrap = bootstrap;
+import { Tooltip, Toast, Popover } from 'bootstrap';
+window.bootstrap = {
+  Tooltip: Tooltip,
+  Toast: Toast,
+  Popover: Popover
+}
 
 import Chart from "chart.js/auto";
 window.Chart = Chart;
diff --git a/build_config/entry/shared/base_shared.js b/build_config/entry/shared/base_shared.js
index a53c2a07..3eab08fa 100644
--- a/build_config/entry/shared/base_shared.js
+++ b/build_config/entry/shared/base_shared.js
@@ -7,7 +7,11 @@ import "jquery-ui-dist/jquery-ui.min.js";
 
 window.$ = window.jQuery = $;
 
-import bootstrap from "bootstrap";
-window.bootstrap = bootstrap;
+import { Tooltip, Toast, Popover } from 'bootstrap';
+window.bootstrap = {
+  Tooltip: Tooltip,
+  Toast: Toast,
+  Popover: Popover
+}
 
 import "/AIPscan/static/css/custom.css";
diff --git a/package-lock.json b/package-lock.json
index 36f7b921..1026025d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "devDependencies": {
         "@fortawesome/fontawesome-free": "^5.15.4",
         "@rollup/plugin-inject": "^5.0.5",
-        "bootstrap": "^4.6.2",
+        "bootstrap": "^5.3.3",
         "chart.js": "^4.4.1",
         "jquery": "^3.7.1",
         "jquery-ui-dist": "^1.13.2",
@@ -470,6 +470,17 @@
       "integrity": "sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==",
       "dev": true
     },
+    "node_modules/@popperjs/core": {
+      "version": "2.11.8",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
+      "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
+      "dev": true,
+      "peer": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
     "node_modules/@rollup/plugin-inject": {
       "version": "5.0.5",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-inject/-/plugin-inject-5.0.5.tgz",
@@ -754,9 +765,9 @@
       }
     },
     "node_modules/bootstrap": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
-      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz",
+      "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==",
       "dev": true,
       "funding": [
         {
@@ -769,8 +780,7 @@
         }
       ],
       "peerDependencies": {
-        "jquery": "1.9.1 - 3",
-        "popper.js": "^1.16.1"
+        "@popperjs/core": "^2.11.8"
       }
     },
     "node_modules/buffer-from": {
@@ -928,18 +938,6 @@
       "integrity": "sha512-0ANRbzVXbi4H01njmpOSPSUoo6NVTZC/gJJhn4J2lUx6Woc5j1Fye3A0+VwXYV2+UxCEU7WTkyaI2y8l4bCu4A==",
       "dev": true
     },
-    "node_modules/popper.js": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
-      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
-      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
-      "dev": true,
-      "peer": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/popperjs"
-      }
-    },
     "node_modules/postcss": {
       "version": "8.4.47",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
diff --git a/package.json b/package.json
index 4bacad81..0bc5b09c 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   "devDependencies": {
     "@fortawesome/fontawesome-free": "^5.15.4",
     "@rollup/plugin-inject": "^5.0.5",
-    "bootstrap": "^4.6.2",
+    "bootstrap": "^5.3.3",
     "chart.js": "^4.4.1",
     "jquery": "^3.7.1",
     "jquery-ui-dist": "^1.13.2",