diff --git a/Dockerfile.m4 b/Dockerfile.m4
index ffe0ac2..261cda3 100644
--- a/Dockerfile.m4
+++ b/Dockerfile.m4
@@ -342,10 +342,10 @@ m4_ifelse(ENABLE_NVIDIA_SUPPORT, 1, [[m4_dnl
 	rm -f /etc/ssh/ssh_host_*_key
 EOF
 
-# Add Mozilla Team repository
+# Add Mozilla repository
 RUN <<-EOF
-	curl --proto '=https' --tlsv1.3 -sSf 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x0AB215679C571D1C8325275B9BDB3D89CE49EC21' | gpg --dearmor -o /etc/apt/trusted.gpg.d/mozillateam.gpg
-	printf '%s\n' "deb [signed-by=/etc/apt/trusted.gpg.d/mozillateam.gpg] https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/mozillateam.list
+	curl --proto '=https' --tlsv1.3 -sSf 'https://packages.mozilla.org/apt/repo-signing-key.gpg' | gpg --dearmor -o /etc/apt/trusted.gpg.d/mozilla.gpg
+	printf '%s\n' 'deb [signed-by=/etc/apt/trusted.gpg.d/mozilla.gpg] https://packages.mozilla.org/apt mozilla main' > /etc/apt/sources.list.d/mozilla.list
 EOF
 
 # Install extra packages
diff --git a/config/apt/preferences.d/firefox.pref b/config/apt/preferences.d/firefox.pref
index e3dc488..5a2971b 100644
--- a/config/apt/preferences.d/firefox.pref
+++ b/config/apt/preferences.d/firefox.pref
@@ -1,3 +1,3 @@
 Package: firefox
-Pin: release o=LP-PPA-mozillateam
+Pin: release n=mozilla
 Pin-Priority: 1000