diff --git a/BTCPayServer/Views/Invoice/Checkout.cshtml b/BTCPayServer/Views/Invoice/Checkout.cshtml
index a96a6175f..5ad74970b 100644
--- a/BTCPayServer/Views/Invoice/Checkout.cshtml
+++ b/BTCPayServer/Views/Invoice/Checkout.cshtml
@@ -1,4 +1,5 @@
-﻿@model PaymentModel
+﻿@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@model PaymentModel
 @{
     Layout = null;
     ViewData["Title"] = "Payment";
@@ -12,18 +13,13 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <title>BTCPay Invoice</title>
 
-    <link href="~/vendor/font-awesome/css/font-awesome.css" rel="stylesheet" />
-    <link href="~/css/css.css" rel="stylesheet" type="text/css">
-    <link href="~/css/normalizer.css" rel="stylesheet" type="text/css">
+    <bundle name="wwwroot/bundles/checkout-bundle.min.css" />
 
     <script type="text/javascript">
 		@Model.ToJSVariableModel("srvModel")
     </script>
-    <script src="~/vendor/clipboard.js/clipboard.js"></script>
-    <script src="~/vendor/jquery/jquery.js"></script>
-    <script src="~/js/vue.min.js" type="text/javascript"></script>
-    <script src="~/js/vue-qrcode.js" type="text/javascript"></script>
-    <script src="~/js/core.js" type="text/javascript"></script>
+
+    <bundle name="wwwroot/bundles/checkout-bundle.min.js" />
 </head>
 <body style="background: #E4E4E4">
     <noscript>
diff --git a/BTCPayServer/bundleconfig.json b/BTCPayServer/bundleconfig.json
index 04bfaca25..632689c2f 100644
--- a/BTCPayServer/bundleconfig.json
+++ b/BTCPayServer/bundleconfig.json
@@ -27,5 +27,23 @@
             "wwwroot/vendor/jquery-validate/jquery.validate.js",
             "wwwroot/vendor/jquery-validate-unobtrusive/jquery.validate.unobtrusive.js"
         ]
+    },
+    {
+        "outputFileName": "wwwroot/bundles/checkout-bundle.min.css",
+        "inputFiles": [
+            "wwwroot/vendor/font-awesome/css/font-awesome.css",
+            "wwwroot/css/css.css",
+            "wwwroot/css/normalizer.css"
+        ]
+    },
+    {
+        "outputFileName": "wwwroot/bundles/checkout-bundle.min.js",
+        "inputFiles": [
+            "wwwroot/vendor/clipboard.js/clipboard.js",
+            "wwwroot/vendor/jquery/jquery.js",
+            "wwwroot/js/vue.min.js",
+            "wwwroot/js/vue-qrcode.js",
+            "wwwroot/js/core.js"
+        ]
     }
 ]
