diff --git a/distro-build/ubuntu.sh b/distro-build/ubuntu.sh
index 159597d57..44c88697a 100644
--- a/distro-build/ubuntu.sh
+++ b/distro-build/ubuntu.sh
@@ -44,7 +44,8 @@ write_plugin() {
 	${TAB}run_proot_cmd DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales
 
 	${TAB}# Configure Firefox PPA.
-	${TAB}add-apt-repository ppa:mozillateam/firefox-next
+	${TAB}echo "Configuring PPA repository for Firefox..."
+	${TAB}run_proot_cmd add-apt-repository --yes ppa:mozillateam/firefox-next || true
 	${TAB}cat <<- CONFIG_EOF > ./etc/apt/preferences.d/pin-mozilla-ppa
 	${TAB}Package: *
 	${TAB}Pin: release o=LP-PPA-mozillateam-firefox-next
@@ -52,7 +53,8 @@ write_plugin() {
 	${TAB}CONFIG_EOF
 
 	${TAB}# Configure Thunderbird PPA.
-	${TAB}add-apt-repository ppa:mozillateam/thunderbird-next
+	${TAB}echo "Configuring PPA repository for Thunderbird..."
+	${TAB}run_proot_cmd add-apt-repository --yes ppa:mozillateam/thunderbird-next || true
 	${TAB}cat <<- CONFIG_EOF > ./etc/apt/preferences.d/pin-thunderbird-ppa
 	${TAB}Package: *
 	${TAB}Pin: release o=LP-PPA-mozillateam-thunderbird-next
diff --git a/distro-plugins/ubuntu.sh b/distro-plugins/ubuntu.sh
index f58de038f..79ab622d8 100644
--- a/distro-plugins/ubuntu.sh
+++ b/distro-plugins/ubuntu.sh
@@ -17,7 +17,8 @@ distro_setup() {
 	run_proot_cmd DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales
 
 	# Configure Firefox PPA.
-	add-apt-repository ppa:mozillateam/firefox-next
+	echo "Configuring PPA repository for Firefox..."
+	run_proot_cmd add-apt-repository --yes ppa:mozillateam/firefox-next || true
 	cat <<- CONFIG_EOF > ./etc/apt/preferences.d/pin-mozilla-ppa
 	Package: *
 	Pin: release o=LP-PPA-mozillateam-firefox-next
@@ -25,7 +26,8 @@ distro_setup() {
 	CONFIG_EOF
 
 	# Configure Thunderbird PPA.
-	add-apt-repository ppa:mozillateam/thunderbird-next
+	echo "Configuring PPA repository for Thunderbird..."
+	run_proot_cmd add-apt-repository --yes ppa:mozillateam/thunderbird-next || true
 	cat <<- CONFIG_EOF > ./etc/apt/preferences.d/pin-thunderbird-ppa
 	Package: *
 	Pin: release o=LP-PPA-mozillateam-thunderbird-next