diff --git a/turtlesim/CMakeLists.txt b/turtlesim/CMakeLists.txt
index 63f16464..ec05970d 100644
--- a/turtlesim/CMakeLists.txt
+++ b/turtlesim/CMakeLists.txt
@@ -14,13 +14,8 @@ find_package(ament_cmake REQUIRED)
 find_package(ament_index_cpp REQUIRED)
 find_package(geometry_msgs REQUIRED)
 
-if(USE_QT6)
-  find_package(Qt6 REQUIRED COMPONENTS Widgets)
-  set(QT_VERSION_MAJOR 6)
-else()
-  find_package(Qt5 REQUIRED COMPONENTS Widgets)
-  set(QT_VERSION_MAJOR 5)
-endif()
+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
 
 find_package(rclcpp REQUIRED)
 find_package(rclcpp_action REQUIRED)
diff --git a/turtlesim/package.xml b/turtlesim/package.xml
index 31a6c84c..803fab89 100644
--- a/turtlesim/package.xml
+++ b/turtlesim/package.xml
@@ -22,13 +22,12 @@
   <author email="michael.jeronimo@openrobotics.org">Michael Jeronimo</author>
   <author email="sloretz@openrobotics.org">Shane Loretz</author>
 
-  <build_depend>qt5-qmake</build_depend>
-  <build_depend>qtbase5-dev</build_depend>
+  <build_depend>qt6-base-dev</build_depend>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
 
-  <exec_depend>libqt5-core</exec_depend>
-  <exec_depend>libqt5-gui</exec_depend>
+  <exec_depend>libqt6-core</exec_depend>
+  <exec_depend>libqt6gui6t64</exec_depend>
 
   <depend>ament_index_cpp</depend>
   <depend>geometry_msgs</depend>