diff --git a/.azure/templates/build-test.yml b/.azure/templates/build-test.yml
index 9c2452c6..2baa85bb 100644
--- a/.azure/templates/build-test.yml
+++ b/.azure/templates/build-test.yml
@@ -88,7 +88,7 @@ steps:
       set -e -x
       sudo apt-get install libacl1-dev libncurses5-dev pkg-config
       git clone --depth 1 \
-                --branch "${ICEORYX_BRANCH:-v1.0.1}" \
+                --branch "${ICEORYX_BRANCH:-release_2.0}" \
                 "${ICEORYX_REPOSITORY:-https://github.com/eclipse-iceoryx/iceoryx.git}" \
                 iceoryx
       mkdir iceoryx/build
diff --git a/src/ddscxx/tests/CMakeLists.txt b/src/ddscxx/tests/CMakeLists.txt
index d7293ae2..9865c072 100644
--- a/src/ddscxx/tests/CMakeLists.txt
+++ b/src/ddscxx/tests/CMakeLists.txt
@@ -31,7 +31,7 @@ configure_file(
 if(ENABLE_SHM)
   # Packages required packages for SHM tests
   find_package(iceoryx_posh REQUIRED)
-  find_package(iceoryx_posh_roudi_environment REQUIRED)
+  find_package(iceoryx_posh_testing REQUIRED)
 endif()
 
 set(sources
diff --git a/src/ddscxx/tests/SharedMemory.cpp b/src/ddscxx/tests/SharedMemory.cpp
index 14df7291..d1a6f915 100644
--- a/src/ddscxx/tests/SharedMemory.cpp
+++ b/src/ddscxx/tests/SharedMemory.cpp
@@ -20,7 +20,7 @@
 #include "Serialization.hpp"
 #include "iceoryx_posh/popo/subscriber.hpp"
 #include "iceoryx_posh/popo/sample.hpp"
-#include "iceoryx_utils/cxx/optional.hpp"
+#include "iceoryx_hoofs/cxx/optional.hpp"
 
 #include <random>