diff --git a/src/modules/airspeed_selector/Kconfig b/src/modules/airspeed_selector/Kconfig
deleted file mode 100644
index 27ce2601f8..0000000000
--- a/src/modules/airspeed_selector/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-menuconfig MODULES_AIRSPEED_SELECTOR
-	bool "airspeed_selector"
-	default n
-	---help---
-		Enable support for airspeed_selector
-
-menuconfig USER_AIRSPEED_SELECTOR
-	bool "airspeed_selector running as userspace module"
-	default y
-	depends on BOARD_PROTECTED && MODULES_AIRSPEED_SELECTOR
-	---help---
-		Put airspeed_selector in userspace memory
diff --git a/src/modules/sensors/CMakeLists.txt b/src/modules/sensors/CMakeLists.txt
index 1f84dec4db..1a7ee94a01 100644
--- a/src/modules/sensors/CMakeLists.txt
+++ b/src/modules/sensors/CMakeLists.txt
@@ -91,6 +91,8 @@ endif()
 
 if(CONFIG_SENSORS_VEHICLE_AIRSPEED)
 	target_link_libraries(modules__sensors PRIVATE airspeed)
+	add_subdirectory(airspeed_selector)
+	target_link_libraries(modules__sensors PRIVATE airspeed_selector)
 endif()
 
 if(CONFIG_SENSORS_VEHICLE_ANGULAR_VELOCITY)
diff --git a/src/modules/airspeed_selector/AirspeedValidator.cpp b/src/modules/sensors/airspeed_selector/AirspeedValidator.cpp
similarity index 100%
rename from src/modules/airspeed_selector/AirspeedValidator.cpp
rename to src/modules/sensors/airspeed_selector/AirspeedValidator.cpp
diff --git a/src/modules/airspeed_selector/AirspeedValidator.hpp b/src/modules/sensors/airspeed_selector/AirspeedValidator.hpp
similarity index 100%
rename from src/modules/airspeed_selector/AirspeedValidator.hpp
rename to src/modules/sensors/airspeed_selector/AirspeedValidator.hpp
diff --git a/src/modules/airspeed_selector/CMakeLists.txt b/src/modules/sensors/airspeed_selector/CMakeLists.txt
similarity index 90%
rename from src/modules/airspeed_selector/CMakeLists.txt
rename to src/modules/sensors/airspeed_selector/CMakeLists.txt
index fb3d24f869..52641b765a 100644
--- a/src/modules/airspeed_selector/CMakeLists.txt
+++ b/src/modules/sensors/airspeed_selector/CMakeLists.txt
@@ -30,13 +30,11 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE modules__airspeed_selector
-	MAIN airspeed_selector
-	SRCS
-		airspeed_selector_main.cpp
-		AirspeedValidator.cpp
-		AirspeedValidator.hpp
-	DEPENDS
-		wind_estimator
+
+px4_add_library(airspeed_selector
+	airspeed_selector_main.cpp
+	AirspeedValidator.cpp
+	AirspeedValidator.hpp
 )
+
+target_link_libraries(airspeed_selector PRIVATE wind_estimator)
diff --git a/src/modules/airspeed_selector/airspeed_selector_main.cpp b/src/modules/sensors/airspeed_selector/airspeed_selector_main.cpp
similarity index 100%
rename from src/modules/airspeed_selector/airspeed_selector_main.cpp
rename to src/modules/sensors/airspeed_selector/airspeed_selector_main.cpp
diff --git a/src/modules/airspeed_selector/airspeed_selector_params.c b/src/modules/sensors/airspeed_selector/airspeed_selector_params.c
similarity index 100%
rename from src/modules/airspeed_selector/airspeed_selector_params.c
rename to src/modules/sensors/airspeed_selector/airspeed_selector_params.c