diff --git a/ros2-dashing-desktop-main.sh b/ros2-dashing-desktop-main.sh
index 64ff21b..3ad5cfb 100755
--- a/ros2-dashing-desktop-main.sh
+++ b/ros2-dashing-desktop-main.sh
@@ -13,8 +13,8 @@ sudo apt-get install -y curl gnupg2 lsb-release build-essential
 
 [[ "$(lsb_release -sc)" == "bionic" ]] || exit 1
 
-curl -Ls https://raw.githubusercontent.com/ros/rosdistro/master/ros.key | sudo apt-key add -
-sudo sh -c 'echo "deb [arch=$(dpkg --print-architecture)] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" > /etc/apt/sources.list.d/ros2-latest.list'
+sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg
+echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/ros2.list > /dev/null
 sudo apt-get update
 sudo apt-get install -y ros-$CHOOSE_ROS_DISTRO-$INSTALL_PACKAGE
 sudo apt-get install -y python3-argcomplete
diff --git a/ros2-dashing-ros-base-main.sh b/ros2-dashing-ros-base-main.sh
index b9375c4..18f19af 100755
--- a/ros2-dashing-ros-base-main.sh
+++ b/ros2-dashing-ros-base-main.sh
@@ -13,8 +13,8 @@ sudo apt-get install -y curl gnupg2 lsb-release build-essential
 
 [[ "$(lsb_release -sc)" == "bionic" ]] || exit 1
 
-curl -Ls https://raw.githubusercontent.com/ros/rosdistro/master/ros.key | sudo apt-key add -
-sudo sh -c 'echo "deb [arch=$(dpkg --print-architecture)] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" > /etc/apt/sources.list.d/ros2-latest.list'
+sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg
+echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/ros2.list > /dev/null
 sudo apt-get update
 sudo apt-get install -y ros-$CHOOSE_ROS_DISTRO-$INSTALL_PACKAGE
 sudo apt-get install -y python3-argcomplete
diff --git a/ros2-foxy-desktop-main.sh b/ros2-foxy-desktop-main.sh
index 21f18b6..dcbb195 100755
--- a/ros2-foxy-desktop-main.sh
+++ b/ros2-foxy-desktop-main.sh
@@ -13,8 +13,8 @@ sudo apt-get install -y curl gnupg2 lsb-release build-essential
 
 [[ "$(lsb_release -sc)" == "focal" ]] || exit 1
 
-curl -Ls https://raw.githubusercontent.com/ros/rosdistro/master/ros.key | sudo apt-key add -
-sudo sh -c 'echo "deb [arch=$(dpkg --print-architecture)] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" > /etc/apt/sources.list.d/ros2-latest.list'
+sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg
+echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/ros2.list > /dev/null
 sudo apt-get update
 sudo apt-get install -y ros-$CHOOSE_ROS_DISTRO-$INSTALL_PACKAGE
 sudo apt-get install -y python3-argcomplete
diff --git a/ros2-foxy-ros-base-main.sh b/ros2-foxy-ros-base-main.sh
index 845e86f..f4d9cd9 100755
--- a/ros2-foxy-ros-base-main.sh
+++ b/ros2-foxy-ros-base-main.sh
@@ -13,8 +13,8 @@ sudo apt-get install -y curl gnupg2 lsb-release build-essential
 
 [[ "$(lsb_release -sc)" == "focal" ]] || exit 1
 
-curl -Ls https://raw.githubusercontent.com/ros/rosdistro/master/ros.key | sudo apt-key add -
-sudo sh -c 'echo "deb [arch=$(dpkg --print-architecture)] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" > /etc/apt/sources.list.d/ros2-latest.list'
+sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg
+echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/ros2.list > /dev/null
 sudo apt-get update
 sudo apt-get install -y ros-$CHOOSE_ROS_DISTRO-$INSTALL_PACKAGE
 sudo apt-get install -y python3-argcomplete
diff --git a/ros2-galactic-desktop-main.sh b/ros2-galactic-desktop-main.sh
index de57093..83eb23f 100755
--- a/ros2-galactic-desktop-main.sh
+++ b/ros2-galactic-desktop-main.sh
@@ -15,8 +15,8 @@ sudo apt-get install -y curl gnupg2 lsb-release build-essential
 
 [[ "$(lsb_release -sc)" == "focal" ]] || exit 1
 
-curl -Ls https://raw.githubusercontent.com/ros/rosdistro/master/ros.key | sudo apt-key add -
-sudo sh -c 'echo "deb [arch=$(dpkg --print-architecture)] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" > /etc/apt/sources.list.d/ros2-latest.list'
+sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg
+echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/ros2.list > /dev/null
 sudo apt-get update
 sudo apt-get install -y ros-$CHOOSE_ROS_DISTRO-$INSTALL_PACKAGE
 sudo apt-get install -y python3-argcomplete
diff --git a/ros2-galactic-ros-base-main.sh b/ros2-galactic-ros-base-main.sh
index 7d5401c..8924844 100755
--- a/ros2-galactic-ros-base-main.sh
+++ b/ros2-galactic-ros-base-main.sh
@@ -15,8 +15,8 @@ sudo apt-get install -y curl gnupg2 lsb-release build-essential
 
 [[ "$(lsb_release -sc)" == "focal" ]] || exit 1
 
-curl -Ls https://raw.githubusercontent.com/ros/rosdistro/master/ros.key | sudo apt-key add -
-sudo sh -c 'echo "deb [arch=$(dpkg --print-architecture)] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" > /etc/apt/sources.list.d/ros2-latest.list'
+sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg
+echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/ros2.list > /dev/null
 sudo apt-get update
 sudo apt-get install -y ros-$CHOOSE_ROS_DISTRO-$INSTALL_PACKAGE
 sudo apt-get install -y python3-argcomplete