diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 65f19193..128a5f03 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -98,7 +98,7 @@ jobs:
         if: always()
 
   ubuntu-build-test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v2
diff --git a/fastdds_python/CMakeLists.txt b/fastdds_python/CMakeLists.txt
index 54fa90bc..21c64500 100644
--- a/fastdds_python/CMakeLists.txt
+++ b/fastdds_python/CMakeLists.txt
@@ -36,6 +36,7 @@ set(CMAKE_SWIG_FLAGS "")
 
 find_package (Python3 COMPONENTS Interpreter Development REQUIRED)
 
+find_package(fastcdr 2 REQUIRED)
 find_package(fastrtps 2.12 REQUIRED)
 
 ###############################################################################
diff --git a/fastdds_python/colcon.pkg b/fastdds_python/colcon.pkg
index da84e899..e0346091 100644
--- a/fastdds_python/colcon.pkg
+++ b/fastdds_python/colcon.pkg
@@ -1,5 +1,5 @@
 {
     "name": "fastdds_python",
     "type": "cmake",
-    "build-dependencies": ["fastcdr", "fastrtps"]
+    "build-dependencies": ["fastrtps"]
 }
diff --git a/fastdds_python/src/swig/CMakeLists.txt b/fastdds_python/src/swig/CMakeLists.txt
index 078d07c5..74017542 100644
--- a/fastdds_python/src/swig/CMakeLists.txt
+++ b/fastdds_python/src/swig/CMakeLists.txt
@@ -51,6 +51,7 @@ endif()
 
 SWIG_LINK_LIBRARIES(${PROJECT_NAME}
     Python3::Module
+    fastcdr
     fastrtps
     )