diff --git a/01-main/manifest b/01-main/manifest
index d4f7b0bc4..943ebf35c 100644
--- a/01-main/manifest
+++ b/01-main/manifest
@@ -71,7 +71,10 @@ fd
 ferdium
 figma-linux
 firefox
+firefox-beta
+firefox-devedition
 firefox-esr
+firefox-nightly
 flameshot
 foliate
 franz
diff --git a/01-main/packages/firefox b/01-main/packages/firefox
index 61542e5af..d863f2901 100644
--- a/01-main/packages/firefox
+++ b/01-main/packages/firefox
@@ -1,6 +1,7 @@
 DEFVER=1
+ARCHS_SUPPORTED="amd64 arm64 armhf i386 ppc64el riscv64 s390x"
 CODENAMES_SUPPORTED="mantic lunar jammy focal bionic xenial"
 PPA="ppa:mozillateam/ppa"
 PRETTY_NAME="firefox"
-WEBSITE="https://www.mozilla.org/firefox/enterprise/"
-SUMMARY="Firefox Stable Release."
+WEBSITE="https://www.mozilla.org/firefox/"
+SUMMARY="Firefox web browser (stable release)."
diff --git a/01-main/packages/firefox-beta b/01-main/packages/firefox-beta
new file mode 100644
index 000000000..b3a2be199
--- /dev/null
+++ b/01-main/packages/firefox-beta
@@ -0,0 +1,12 @@
+DEFVER=1
+# Per https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/dists/noble/main/ :
+ARCHS_SUPPORTED="amd64 arm64 armhf i386 ppc64el riscv64 s390x"
+# Per https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/dists/ :
+# focal groovy gutsy hardy hirsute impish intrepid jammy jaunty kinetic lunar mantic noble trusty xenial zesty
+CODENAMES_SUPPORTED="focal jammy lunar mantic"
+GPG_KEY_ID="C0BA5CE6DC6315A3"
+APT_LIST_NAME="firefox-beta"
+APT_REPO_URL="https://packages.mozilla.org/apt mozilla main"
+PRETTY_NAME="Firefox Beta"
+WEBSITE="https://www.mozilla.org/en-US/firefox/channel/desktop/#beta"
+SUMMARY="Firefox web browser (beta release)"
diff --git a/01-main/packages/firefox-devedition b/01-main/packages/firefox-devedition
new file mode 100644
index 000000000..f541029df
--- /dev/null
+++ b/01-main/packages/firefox-devedition
@@ -0,0 +1,12 @@
+DEFVER=1
+# Per https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/dists/noble/main/ :
+ARCHS_SUPPORTED="amd64 arm64 armhf i386 ppc64el riscv64 s390x"
+# Per https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/dists/ :
+# focal groovy gutsy hardy hirsute impish intrepid jammy jaunty kinetic lunar mantic noble trusty xenial zesty
+CODENAMES_SUPPORTED="focal jammy lunar mantic"
+GPG_KEY_ID="C0BA5CE6DC6315A3"
+APT_LIST_NAME="firefox-devedition"
+APT_REPO_URL="https://packages.mozilla.org/apt mozilla main"
+PRETTY_NAME="Firefox Developer Edition"
+WEBSITE="https://www.mozilla.org/en-US/firefox/channel/desktop/#developer"
+SUMMARY="Firefox web browser (developer edition)"
diff --git a/01-main/packages/firefox-esr b/01-main/packages/firefox-esr
index 98d3e1ebd..742a316bd 100644
--- a/01-main/packages/firefox-esr
+++ b/01-main/packages/firefox-esr
@@ -1,5 +1,10 @@
 DEFVER=1
+# Per https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/dists/noble/main/ :
+ARCHS_SUPPORTED="amd64 arm64 armhf i386 ppc64el riscv64 s390x"
+# Per https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/dists/ :
+# focal groovy gutsy hardy hirsute impish intrepid jammy jaunty kinetic lunar mantic noble trusty xenial zesty
+CODENAMES_SUPPORTED="focal jammy lunar mantic"
 PPA="ppa:mozillateam/ppa"
 PRETTY_NAME="Firefox ESR"
 WEBSITE="https://www.mozilla.org/firefox/enterprise/"
-SUMMARY=" Firefox Extended Support Release."
+SUMMARY=" Firefox web browser (extended support release)."
diff --git a/01-main/packages/firefox-nightly b/01-main/packages/firefox-nightly
new file mode 100644
index 000000000..315f98698
--- /dev/null
+++ b/01-main/packages/firefox-nightly
@@ -0,0 +1,12 @@
+DEFVER=1
+# Per https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/dists/noble/main/ :
+ARCHS_SUPPORTED="amd64 arm64 armhf i386 ppc64el riscv64 s390x"
+# Per https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/dists/ :
+# focal groovy gutsy hardy hirsute impish intrepid jammy jaunty kinetic lunar mantic noble trusty xenial zesty
+CODENAMES_SUPPORTED="focal jammy lunar mantic"
+GPG_KEY_ID="C0BA5CE6DC6315A3"
+APT_LIST_NAME="firefox-nightly"
+APT_REPO_URL="https://packages.mozilla.org/apt mozilla main"
+PRETTY_NAME="Firefox Nightly"
+WEBSITE="https://www.mozilla.org/en-US/firefox/channel/desktop/#nightly"
+SUMMARY="Firefox web browser (nightly release)"