diff --git a/.github/workflows/ros2.yaml b/.github/workflows/ros2.yaml
index 4c76dde2d..145b2c847 100644
--- a/.github/workflows/ros2.yaml
+++ b/.github/workflows/ros2.yaml
@@ -9,6 +9,7 @@ jobs:
         env:
           - {ROS_DISTRO: foxy, ROS_REPO: main}
           - {ROS_DISTRO: galactic, ROS_REPO: main}
+          - {ROS_DISTRO: rolling, ROS_REPO: main}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8f9e2b10..0c5e1d03a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,8 +54,8 @@ message(${catkin_INCLUDE_DIRS})
 elseif( DEFINED ENV{AMENT_PREFIX_PATH})
     set(COMPILING_WITH_AMENT 1)
 
+    find_package(ament_cmake REQUIRED)
     find_package(ament_index_cpp REQUIRED)
-    include_directories(${ament_index_cpp_INCLUDE_DIRS})
 
     message(STATUS "--------------------------------------------------")
     message(STATUS "PlotJuggler is being built using AMENT.")
@@ -182,7 +182,6 @@ if(COMPILING_WITH_CATKIN)
 
 elseif(COMPILING_WITH_AMENT)
 
-    find_package(ament_cmake REQUIRED)
     set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
     set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
     set(PJ_PLUGIN_INSTALL_DIRECTORY lib/${PROJECT_NAME} )
diff --git a/plotjuggler_app/CMakeLists.txt b/plotjuggler_app/CMakeLists.txt
index c751cd160..605159e8d 100644
--- a/plotjuggler_app/CMakeLists.txt
+++ b/plotjuggler_app/CMakeLists.txt
@@ -118,7 +118,7 @@ if(COMPILING_WITH_CATKIN)
 
 elseif(COMPILING_WITH_AMENT)
 
-    target_link_libraries(plotjuggler ${ament_index_cpp_LIBRARIES} )
+    ament_target_dependencies(plotjuggler ament_index_cpp)
 
     install(TARGETS plotjuggler
         DESTINATION lib/${PROJECT_NAME} )