diff --git a/configure_priv.sh b/configure_priv.sh
index 9431ee3..342547d 100755
--- a/configure_priv.sh
+++ b/configure_priv.sh
@@ -305,7 +305,8 @@ configure_yarn() {
     return
 
     curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | sudo tee /usr/share/keyrings/yarn.gpg >/dev/null
-    echo "deb [signed-by=/usr/share/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list >/dev/null
+    sudo rm -f /etc/apt/sources.list.d/yarn.list
+    cat "$scriptdir/files/sources.list/yarn.sources" | sudo tee /etc/apt/sources.list.d/yarn.sources >/dev/null
 }
 
 configure_mongodb() {
@@ -314,7 +315,8 @@ configure_mongodb() {
 
     version=7.0
     curl -fsSL https://pgp.mongodb.com/server-$version.asc | gpg --dearmor | sudo tee /usr/share/keyrings/mongodb-server-$version.gpg >/dev/null
-    echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-server-$version.gpg] https://repo.mongodb.org/apt/ubuntu $(lsb_release -cs)/mongodb-org/$version multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-$version.list >/dev/null
+    sudo rm -f /etc/apt/sources.list.d/mongodb-org-$version.list
+    sed -e "s|__CODENAME__|$(lsb_release -cs)|g" -e "s|__VERSION__|$version|g" -e "s|__ARCH__|$(dpkg --print-architecture)|g" "$scriptdir/files/sources.list/mongodb.sources" | sudo tee /etc/apt/sources.list.d/mongodb-org-$version.sources >/dev/null
 }
 
 configure_nginx() {
diff --git a/files/sources.list/mongodb.sources b/files/sources.list/mongodb.sources
new file mode 100644
index 0000000..2ab4480
--- /dev/null
+++ b/files/sources.list/mongodb.sources
@@ -0,0 +1,6 @@
+Types: deb
+URIs: https://repo.mongodb.org/apt/ubuntu
+Suites: __CODENAME__/mongodb-org/__VERSION__
+Components: multiverse
+Architectures: __ARCH__
+Signed-By: /usr/share/keyrings/mongodb-server-__VERSION__.gpg
diff --git a/files/sources.list/yarn.sources b/files/sources.list/yarn.sources
new file mode 100644
index 0000000..4733f62
--- /dev/null
+++ b/files/sources.list/yarn.sources
@@ -0,0 +1,5 @@
+Types: deb
+URIs: https://dl.yarnpkg.com/debian/
+Suites: stable
+Components: main
+Signed-By: /usr/share/keyrings/yarn.gpg