diff --git a/manifests/manifest-chrome.json b/manifests/manifest-chrome.json
index 1001dcf8..02f54ce9 100644
--- a/manifests/manifest-chrome.json
+++ b/manifests/manifest-chrome.json
@@ -60,15 +60,15 @@
         "contextMenus"
     ],
     "optional_host_permissions": [
-      "https://www.google.com/",
-      "https://*.dropboxapi.com/*",
-      "https://www.googleapis.com/*",
-      "https://accounts.google.com/o/oauth2/revoke",
-      "https://graph.microsoft.com/me/*",
-      "https://login.microsoftonline.com/common/oauth2/v2.0/token"
+        "https://www.google.com/",
+        "https://*.dropboxapi.com/*",
+        "https://www.googleapis.com/*",
+        "https://accounts.google.com/o/oauth2/revoke",
+        "https://graph.microsoft.com/me/*",
+        "https://login.microsoftonline.com/common/oauth2/v2.0/token"
     ],
     "content_security_policy": {
-      "extension_pages": "script-src 'self'; font-src 'self'; img-src 'self' data:; style-src 'self' 'unsafe-inline'; connect-src https://www.google.com/ https://*.dropboxapi.com https://www.googleapis.com/ https://accounts.google.com/o/oauth2/revoke https://login.microsoftonline.com/common/oauth2/v2.0/token https://graph.microsoft.com/; default-src 'none'",
-      "sandbox": "sandbox allow-scripts; script-src 'self' 'unsafe-eval';"
+        "extension_pages": "script-src 'self'; font-src 'self'; img-src 'self' data:; style-src 'self' 'unsafe-inline'; connect-src https://www.google.com/ https://*.dropboxapi.com https://www.googleapis.com/ https://accounts.google.com/o/oauth2/revoke https://login.microsoftonline.com/common/oauth2/v2.0/token https://graph.microsoft.com/; default-src 'none'",
+        "sandbox": "sandbox allow-scripts; script-src 'self' 'unsafe-eval';"
     }
   }
diff --git a/manifests/manifest-edge.json b/manifests/manifest-edge.json
index 0febe6e6..10398805 100644
--- a/manifests/manifest-edge.json
+++ b/manifests/manifest-edge.json
@@ -1,5 +1,5 @@
 {
-    "manifest_version": 2,
+    "manifest_version": 3,
     "name": "Authenticator: 2FA Client",
     "short_name": "__MSG_extShortName__",
     "version": "7.0.0",
@@ -10,7 +10,7 @@
         "48": "images/icon48.png",
         "128": "images/icon128.png"
     },
-    "browser_action": {
+    "action": {
         "default_icon": {
             "19": "images/icon19.png",
             "38": "images/icon38.png"
@@ -29,7 +29,7 @@
     },
     "options_ui": {
         "page": "view/options.html",
-        "chrome_style": true
+        "open_in_tab": false
     },
     "storage": {
         "managed_schema": "schema.json"
@@ -55,7 +55,9 @@
     "permissions": [
         "activeTab",
         "storage",
-        "identity"
+        "identity",
+        "alarms",
+        "scripting"
     ],
     "optional_permissions": [
         "clipboardWrite",
@@ -67,6 +69,8 @@
         "https://graph.microsoft.com/me/*",
         "https://login.microsoftonline.com/common/oauth2/v2.0/token"
     ],
-    "offline_enabled": true,
-    "content_security_policy": "script-src 'self'; font-src 'self'; img-src 'self' data:; style-src 'self' 'unsafe-inline'; connect-src https://www.google.com/ https://*.dropboxapi.com https://www.googleapis.com/ https://accounts.google.com/o/oauth2/revoke https://login.microsoftonline.com/common/oauth2/v2.0/token https://graph.microsoft.com/; default-src 'none'"
+    "content_security_policy": {
+        "extension_pages": "script-src 'self'; font-src 'self'; img-src 'self' data:; style-src 'self' 'unsafe-inline'; connect-src https://www.google.com/ https://*.dropboxapi.com https://www.googleapis.com/ https://accounts.google.com/o/oauth2/revoke https://login.microsoftonline.com/common/oauth2/v2.0/token https://graph.microsoft.com/; default-src 'none'",
+        "sandbox": "sandbox allow-scripts; script-src 'self' 'unsafe-eval';"
+    }
 }
diff --git a/manifests/manifest-firefox.json b/manifests/manifest-firefox.json
index 8f8bc338..d78fd556 100644
--- a/manifests/manifest-firefox.json
+++ b/manifests/manifest-firefox.json
@@ -1,14 +1,14 @@
 {
-    "manifest_version": 2,
+    "manifest_version": 3,
     "name": "__MSG_extName__",
     "short_name": "__MSG_extShortName__",
     "version": "7.0.0",
     "default_locale": "en",
     "description": "__MSG_extDesc__",
-    "applications": {
+    "browser_specific_settings": {
         "gecko": {
             "id": "authenticator@mymindstorm",
-            "strict_min_version": "57.0"
+            "strict_min_version": "109.0"
         }
     },
     "icons": {
@@ -16,8 +16,7 @@
         "48": "images/icon48.png",
         "128": "images/icon128.png"
     },
-    "browser_action": {
-        "browser_style": false,
+    "action": {
         "default_icon": {
             "19": "images/icon19.png",
             "38": "images/icon38.png"
@@ -41,11 +40,13 @@
     },
     "options_ui": {
         "page": "view/options.html",
-        "browser_style": true
+        "open_in_tab": false
     },
     "permissions": [
         "storage",
-        "identity"
+        "identity",
+        "alarms",
+        "scripting"
     ],
     "optional_permissions": [
         "<all_urls>",
@@ -57,5 +58,7 @@
         "https://graph.microsoft.com/me/*",
         "https://login.microsoftonline.com/common/oauth2/v2.0/token"
     ],
-    "content_security_policy": "script-src 'self' 'wasm-unsafe-eval'; font-src 'self'; img-src 'self' data:; style-src 'self' 'unsafe-inline'; connect-src https://www.google.com/ https://*.dropboxapi.com https://www.googleapis.com/ https://accounts.google.com/o/oauth2/revoke https://login.microsoftonline.com/common/oauth2/v2.0/token https://graph.microsoft.com/; default-src 'none'"
+    "content_security_policy": {
+        "extension_pages": "script-src 'self'; font-src 'self'; img-src 'self' data:; style-src 'self' 'unsafe-inline'; connect-src https://www.google.com/ https://*.dropboxapi.com https://www.googleapis.com/ https://accounts.google.com/o/oauth2/revoke https://login.microsoftonline.com/common/oauth2/v2.0/token https://graph.microsoft.com/; default-src 'none'"
+    }
 }