diff --git a/Fedora-Workstation-39.sh b/Fedora-Workstation-39.sh
index 8c97c65..f47a5ef 100644
--- a/Fedora-Workstation-39.sh
+++ b/Fedora-Workstation-39.sh
@@ -148,10 +148,12 @@ flatpak update -y
 MACHINE_TYPE=$(uname -m)
 if [ "${MACHINE_TYPE}" == 'x86_64' ]; then
     output 'x86_64 machine, installing Microsoft Edge.'
-    curl -O https://packages.microsoft.com/keys/microsoft.asc
-    sudo rpm --import microsoft.asc
-    rm microsoft.asc
-    sudo dnf config-manager --add-repo https://packages.microsoft.com/yumrepos/edge
+    echo '[microsoft-edge]
+name=microsoft-edge
+baseurl=https://packages.microsoft.com/yumrepos/edge/
+enabled=1
+gpgcheck=1
+gpgkey=https://packages.microsoft.com/keys/microsoft.asc' | sudo tee /etc/yum.repos.d/microsoft-edge.repo
     sudo dnf install -y microsoft-edge-stable
     sudo mkdir -p /etc/opt/edge/policies/managed/ /etc/opt/edge/policies/recommended/
     sudo chmod -R 755 /etc/opt/edge
diff --git a/Ubuntu-22.04-Desktop.sh b/Ubuntu-22.04-Desktop.sh
index 7715a50..d6778c1 100644
--- a/Ubuntu-22.04-Desktop.sh
+++ b/Ubuntu-22.04-Desktop.sh
@@ -138,13 +138,18 @@ fi
 
 sudo dpkg --add-architecture amd64
 sudo apt update
+sudo apt full-upgrade -y
 
 # Install Microsoft Edge if x86_64
 MACHINE_TYPE=$(uname -m)
 if [ "${MACHINE_TYPE}" == 'x86_64' ] || [ -f /media/psf/RosettaLinux/rosetta ]; then
     output 'x86_64 machine, installing Microsoft Edge.'
-    unpriv curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
-    sudo add-apt-repository "deb [arch=amd64] https://packages.microsoft.com/repos/edge stable main"
+    unpriv curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | sudo tee /usr/share/keyrings/microsoft.gpg
+    sudo chmod 644 /usr/share/keyrings/microsoft.gpg
+    unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/apt/sources.list.d/microsoft-edge.list | sudo tee /etc/apt/sources.list.d/microsoft-edge.list
+    sudo chmod 644 /etc/apt/sources.list.d/microsoft-edge.list
+    sudo apt update
+    sudo apt full-upgrade -y
     sudo apt install -y microsoft-edge-stable
     sudo mkdir -p /etc/opt/edge/policies/managed/ /etc/opt/edge/policies/recommended/
     sudo chmod -R 755 /etc/opt/edge
diff --git a/etc/apt/sources.list.d/microsoft-edge.list b/etc/apt/sources.list.d/microsoft-edge.list
new file mode 100644
index 0000000..798b6df
--- /dev/null
+++ b/etc/apt/sources.list.d/microsoft-edge.list
@@ -0,0 +1 @@
+deb [signed-by=/usr/share/keyrings/microsoft.gpg arch=amd64] https://packages.microsoft.com/repos/edge stable main
\ No newline at end of file