diff --git a/.ci/build.sh b/.ci/build.sh
index a89c08c34c..6755663c24 100755
--- a/.ci/build.sh
+++ b/.ci/build.sh
@@ -13,11 +13,7 @@ ARTIFACTS_FOLDER=/tmp/artifacts
 
 ./.ci_scripts/package_build/add_ros_ppa.sh
 
-if [[ "$VARIANT" == "stable" ]]; then
-  ./.ci_scripts/package_build/add_ctu_mrs_stable_ppa.sh
-else
-  ./.ci_scripts/package_build/add_ctu_mrs_unstable_ppa.sh
-fi
+curl https://ctu-mrs.github.io/ppa-$VARIANT/add_ppa.sh | bash
 
 # dependencies need for build the deb package
 sudo apt-get -y install ros-noetic-catkin python3-catkin-tools
@@ -62,7 +58,7 @@ echo "$0: catking reported following topological build order:"
 echo "$BUILD_ORDER"
 echo ""
 
-ROSDEP_FILE=$ARTIFACTS_FOLDER/test.yaml
+ROSDEP_FILE=$ARTIFACTS_FOLDER/generated_$ARCH.yaml
 
 echo "yaml file://$ROSDEP_FILE" | sudo tee /etc/ros/rosdep/sources.list.d/temp.list
 
diff --git a/.ci/get_build_matrix.sh b/.ci/get_build_matrix.sh
index c0099bd1f7..6ff748d5d3 100755
--- a/.ci/get_build_matrix.sh
+++ b/.ci/get_build_matrix.sh
@@ -14,11 +14,7 @@ ARTIFACTS_FOLDER=/tmp/artifacts
 
 ./.ci_scripts/package_build/install_ros.sh >/tmp/log.txt 2>&1
 
-if [[ "$VARIANT" == "stable" ]]; then
-  ./.ci_scripts/package_build/add_ctu_mrs_stable_ppa.sh >/tmp/log.txt 2>&1
-else
-  ./.ci_scripts/package_build/add_ctu_mrs_unstable_ppa.sh >/tmp/log.txt 2>&1
-fi
+curl https://ctu-mrs.github.io/ppa-$VARIANT/add_ppa.sh | bash
 
 # dependencies need for build the deb package
 sudo apt-get -y install ros-noetic-catkin python3-catkin-tools >/tmp/log.txt 2>&1
diff --git a/.github/workflows/unstable_amd64.yml b/.github/workflows/unstable_amd64.yml
index c96ce5f0f2..ff06d17efa 100644
--- a/.github/workflows/unstable_amd64.yml
+++ b/.github/workflows/unstable_amd64.yml
@@ -18,7 +18,7 @@ jobs:
       - id: execute
         run: |
           mkdir -p /tmp/artifacts
-          touch /tmp/artifacts/test.yaml
+          touch /tmp/artifacts/generated_amd64.yaml
       - name: Save artifacts
         uses: actions/upload-artifact@v3
         with:
diff --git a/.github/workflows/unstable_arm64.yml b/.github/workflows/unstable_arm64.yml
index b750e390a1..4e49e40447 100644
--- a/.github/workflows/unstable_arm64.yml
+++ b/.github/workflows/unstable_arm64.yml
@@ -18,7 +18,7 @@ jobs:
       - id: execute
         run: |
           mkdir -p /tmp/artifacts
-          touch /tmp/artifacts/test.yaml
+          touch /tmp/artifacts/generated_arm64.yaml
       - name: Save artifacts
         uses: actions/upload-artifact@v3
         with:
diff --git a/test.yaml b/test.yaml
index 3a2a102a0d..d8f9eb4552 100644
--- a/test.yaml
+++ b/test.yaml
@@ -9,9 +9,3 @@ mrs_lib:
   source: https://github.com/ctu-mrs/mrs_lib
   unstable_ref: hw_api
   stable_ref: release
-
-mrs_uav_hw_api:
-  architecture: [amd64, arm64]
-  source: https://github.com/ctu-mrs/mrs_uav_hw_api
-  unstable_ref: master
-  stable_ref: release