diff --git a/debian/jitsi-meet-web.install b/debian/jitsi-meet-web.install
index e755d9b54..91df2dd03 100644
--- a/debian/jitsi-meet-web.install
+++ b/debian/jitsi-meet-web.install
@@ -13,4 +13,5 @@ lang					/usr/share/jitsi-meet/
 connection_optimization	/usr/share/jitsi-meet/
 resources/robots.txt	/usr/share/jitsi-meet/
 resources/*.sh			/usr/share/jitsi-meet/scripts/
-pwa-worker.js /usr/share/jitsi-meet/
+pwa-worker.js			/usr/share/jitsi-meet/
+manifest.json			/usr/share/jitsi-meet/
diff --git a/index.html b/index.html
index 0f4f57913..60a6e9c06 100644
--- a/index.html
+++ b/index.html
@@ -9,8 +9,13 @@
 
     <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
     <link rel="stylesheet" href="css/all.css">
-    <link rel="manifest" href="static/pwa/manifest.json">
+    <link rel="manifest" id="manifest-placeholder">
+
     <script>
+        // Dynamically generate the manifest location URL. It must be served from the document origin, and we may have
+        // the base pointing to the CDN. This way we can generate a full URL which will bypass the base.
+        document.querySelector('#manifest-placeholder').setAttribute('href', window.location.origin + '/manifest.json');
+
         document.addEventListener('DOMContentLoaded', () => {
             if (!JitsiMeetJS.app) {
                 return;
diff --git a/static/pwa/manifest.json b/manifest.json
similarity index 81%
rename from static/pwa/manifest.json
rename to manifest.json
index a45fea1b0..da2cecff3 100644
--- a/static/pwa/manifest.json
+++ b/manifest.json
@@ -11,17 +11,17 @@
   "name": "Jitsi Meet",
   "icons": [
     {
-      "src": "icons/icon192.png",
+      "src": "static/pwa/icons/icon192.png",
       "type": "image/png",
       "sizes": "192x192"
     },
     {
-      "src": "icons/icon512.png",
+      "src": "static/pwa/icons/icon512.png",
       "type": "image/png",
       "sizes": "512x512"
     },
     {
-      "src": "icons/iconMask.png",
+      "src": "static/pwa/icons/iconMask.png",
       "sizes": "512x512",
       "type": "image/png",
       "purpose": "maskable"