diff --git a/README.md b/README.md
index 746af058..8a2ec619 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 
 Personal Package Archive (PPA) for stable MRS deb packages.
 
+## Adding the PPA
+
 ```bash
 curl https://ctu-mrs.github.io/ppa-stable/add_ppa.sh | bash
 ```
@@ -12,3 +14,9 @@ curl https://ctu-mrs.github.io/ppa-stable/add_ppa.sh | bash
 sudo apt-get -y install aptitude
 sudo apt remove $(aptitude search -F '%p' '~S ~i ?origin("ctu-mrs") ?label("stable")')
 ```
+
+## Removing the PPA
+
+```bash
+curl https://ctu-mrs.github.io/ppa-stable/remove_ppa.sh | bash
+```
diff --git a/resources/apt/ctu-mrs-ppa-preferences.txt b/resources/apt/ctu-mrs-ppa-preferences.txt
index 9f5d2bcc..ae35d010 100644
--- a/resources/apt/ctu-mrs-ppa-preferences.txt
+++ b/resources/apt/ctu-mrs-ppa-preferences.txt
@@ -1,3 +1,3 @@
 Package: *
-Pin: release o=ctu-mrs,l=unstable,c=
-Pin-Priority: 1110
+Pin: release o=ctu-mrs,l=stable,c=
+Pin-Priority: 1111
diff --git a/resources/rosdep/ctu-mrs-amd64.list b/resources/rosdep/ctu-mrs-amd64.list
index 19354029..9186a363 100644
--- a/resources/rosdep/ctu-mrs-amd64.list
+++ b/resources/rosdep/ctu-mrs-amd64.list
@@ -1,3 +1,4 @@
 yaml https://ctu-mrs.github.io/ppa-stable/generated_amd64.yaml
+yaml https://ctu-mrs.github.io/ppa-stable/generated_amd64_testing.yaml
 yaml https://ctu-mrs.github.io/ppa-stable/handcrafted_amd64.yaml
 yaml https://ctu-mrs.github.io/ppa-stable/handcrafted_common.yaml
diff --git a/resources/rosdep/handcrafted_common.yaml b/resources/rosdep/handcrafted_common.yaml
index 5b63f760..e1571058 100644
--- a/resources/rosdep/handcrafted_common.yaml
+++ b/resources/rosdep/handcrafted_common.yaml
@@ -9,32 +9,8 @@ nlopt:
   ubuntu: [ros-noetic-nlopt]
 px4:
   ubuntu: [ros-noetic-px4]
-mrs_uav_trajectory_loader:
-  ubuntu: [ros-noetic-mrs-uav-trajectory-loader]
-mrs_uav_path_loader:
-  ubuntu: [ros-noetic-mrs-uav-path-loader]
-mrs_uav_dji_tello_api:
-  ubuntu: [ros-noetic-mrs-uav-dji-tello-api]
-euler_counter_example:
-  ubuntu: [ros-noetic-euler-counter-example]
-multireconfigure:
-  ubuntu: [ros-noetic-multireconfigure]
-tf_connector:
-  ubuntu: [ros-noetic-tf-connector]
-tf_estimator:
-  ubuntu: [ros-noetic-tf-estimator]
-tf_reconfigure:
-  ubuntu: [ros-noetic-tf-reconfigure]
-mrs_utils:
-  ubuntu: [ros-noetic-mrs-utils]
-mrs_uav_modules:
-  ubuntu: [ros-noetic-mrs-uav-modules]
-mrs_serial:
-  ubuntu: [ros-noetic-mrs-serial]
 mavlink_sitl_gazebo:
   ubuntu: [ros-noetic-mavlink-sitl-gazebo]
-mrs_gazebo_common_resources:
-  ubuntu: [ros-noetic-mrs-gazebo-common-resources]
 ouster_ros:
   ubuntu: [ros-noetic-ouster-ros]
 
diff --git a/resources/scripts/add_ppa.sh b/resources/scripts/add_ppa.sh
index 7b0f54ea..71368bc6 100755
--- a/resources/scripts/add_ppa.sh
+++ b/resources/scripts/add_ppa.sh
@@ -5,18 +5,18 @@ set -e
 trap 'last_command=$current_command; current_command=$BASH_COMMAND' DEBUG
 trap 'echo "$0: \"${last_command}\" command failed with exit code $?"' ERR
 
-echo "$0: Adding MRS stable PPA repository"
+echo "$0: Adding MRS Stable PPA repository"
 
 sudo apt-get -y install curl gpg dpkg-dev
 
 ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
 
 curl -s --compressed "https://ctu-mrs.github.io/ppa-stable/ctu-mrs.gpg" | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/ctu-mrs.gpg >/dev/null
-sudo curl -s --compressed -o /etc/apt/sources.list.d/ctu-mrs.list "https://ctu-mrs.github.io/ppa-stable/ctu-mrs-apt.list"
-sudo curl -s --compressed -o /etc/apt/preferences.d/ctu-mrs-ppa-preferences "https://ctu-mrs.github.io/ppa-stable/ctu-mrs-ppa-preferences.txt"
-sudo curl -s --compressed -o /etc/ros/rosdep/sources.list.d/ctu-mrs.list "https://ctu-mrs.github.io/ppa-stable/ctu-mrs-$ARCH.list"
+sudo curl -s --compressed -o /etc/apt/sources.list.d/ctu-mrs-stable.list "https://ctu-mrs.github.io/ppa-stable/ctu-mrs-apt.list"
+sudo curl -s --compressed -o /etc/apt/preferences.d/ctu-mrs-stable-preferences "https://ctu-mrs.github.io/ppa-stable/ctu-mrs-ppa-preferences.txt"
+sudo curl -s --compressed -o /etc/ros/rosdep/sources.list.d/ctu-mrs-stable.list "https://ctu-mrs.github.io/ppa-stable/ctu-mrs-$ARCH.list"
 sudo apt-get -y update
 
 rosdep update
 
-echo "$0: Finished adding MRS stable PPA repository"
+echo "$0: Finished adding MRS Stable PPA repository"
diff --git a/resources/scripts/remove_ppa.sh b/resources/scripts/remove_ppa.sh
new file mode 100755
index 00000000..87650c93
--- /dev/null
+++ b/resources/scripts/remove_ppa.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+echo "$0: Removing MRS Stable PPA repository"
+
+sudo rm /etc/apt/sources.list.d/ctu-mrs-stable.list
+sudo rm /etc/apt/preferences.d/ctu-mrs-stable-preferences
+sudo rm /etc/ros/rosdep/sources.list.d/ctu-mrs-stable.list
+
+sudo apt-get -y update
+rosdep update
+
+echo "$0: Finished removing MRS Stable PPA repository"