diff --git a/apps/firefox/firefox-nightly.sh b/apps/firefox/firefox-nightly.sh
index 3142f42..b735953 100755
--- a/apps/firefox/firefox-nightly.sh
+++ b/apps/firefox/firefox-nightly.sh
@@ -46,8 +46,10 @@ echo -ne "\nYou want to install Firefox Nightly ($PKG_FIREFOX)? "
 if choice 2>/dev/null; then
     echo -ne "\nAdd repository for Firefox Nightly\n"
     $APT_INST apt-transport-https wget
-    wget -q https://packages.mozilla.org/apt/repo-signing-key.gpg -O- | gpg --dearmor | tee /etc/apt/trusted.gpg.d/packages.mozilla.org.gpg > /dev/null
-    echo "deb [signed-by=/etc/apt/trusted.gpg.d/packages.mozilla.org.gpg] https://packages.mozilla.org/apt mozilla main" | tee /etc/apt/sources.list.d/mozilla.list
+    sudo install -d -m 0755 /etc/apt/keyrings
+    wget -q https://packages.mozilla.org/apt/repo-signing-key.gpg -O- | tee /etc/apt/keyrings/packages.mozilla.org.asc > /dev/null
+    gpg -n -q --import --import-options import-show /etc/apt/keyrings/packages.mozilla.org.asc | awk '/pub/{getline; gsub(/^ +| +$/,""); print "\n"$0"\n"}'
+    echo "deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main" | sudo tee -a /etc/apt/sources.list.d/mozilla.list > /dev/null
     $APT_UPDATE
     echo -ne "\n$APT_INST $PKG_FIREFOX\n"
     $APT_INST $PKG_FIREFOX