diff --git a/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml b/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml
index cc1fd47..a3cc1c1 100644
--- a/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml
+++ b/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml
@@ -30,9 +30,6 @@ blueprint:
       selector:
         device:
           filter:
-            - integration: zha
-              manufacturer: IKEA of Sweden
-              model: TRADFRI on/off switch
             - integration: zha
               manufacturer: IKEA of Sweden
               model: RODRET Dimmer
@@ -42,8 +39,8 @@ blueprint:
             - integration: zha
               manufacturer: IKEA of Sweden
               model: SOMRIG shortcut button
-            - integration: mqtt
-              manufacturer: IKEA
+            - integration: zha
+              manufacturer: IKEA of Sweden
               model: TRADFRI on/off switch
             - integration: mqtt
               manufacturer: IKEA
@@ -51,10 +48,9 @@ blueprint:
             - integration: mqtt
               manufacturer: IKEA
               model: SOMRIG shortcut button
-            # DEPRECATED - for removal, keeping for z2m v1 backward compatibility
             - integration: mqtt
               manufacturer: IKEA
-              model: TRADFRI on/off switch (E1743)
+              model: TRADFRI on/off switch
             # DEPRECATED - for removal, keeping for z2m v1 backward compatibility
             - integration: mqtt
               manufacturer: IKEA
@@ -63,6 +59,10 @@ blueprint:
             - integration: mqtt
               manufacturer: IKEA
               model: SOMRIG shortcut button (E2213)
+            # DEPRECATED - for removal, keeping for z2m v1 backward compatibility
+            - integration: mqtt
+              manufacturer: IKEA
+              model: TRADFRI on/off switch (E1743)
           multiple: true
     on_press_action:
       name: Press "on / 1 dot" action
diff --git a/ikea_E1743-E2201-E2213_ZHA-Z2M_control-light.yaml b/ikea_E1743-E2201-E2213_ZHA-Z2M_control-light.yaml
index 447439f..9d24b29 100644
--- a/ikea_E1743-E2201-E2213_ZHA-Z2M_control-light.yaml
+++ b/ikea_E1743-E2201-E2213_ZHA-Z2M_control-light.yaml
@@ -32,17 +32,17 @@ blueprint:
       selector:
         device:
           filter:
-            - integration: zha
-              manufacturer: IKEA of Sweden
-              model: TRADFRI on/off switch
             - integration: zha
               manufacturer: IKEA of Sweden
               model: RODRET Dimmer
+            - integration: zha
+              manufacturer: IKEA of Sweden
+              model: RODRET wireless dimmer
             - integration: zha
               manufacturer: IKEA of Sweden
               model: SOMRIG shortcut button
-            - integration: mqtt
-              manufacturer: IKEA
+            - integration: zha
+              manufacturer: IKEA of Sweden
               model: TRADFRI on/off switch
             - integration: mqtt
               manufacturer: IKEA
@@ -50,10 +50,9 @@ blueprint:
             - integration: mqtt
               manufacturer: IKEA
               model: SOMRIG shortcut button
-            # DEPRECATED - for removal, keeping for z2m v1 backward compatibility
             - integration: mqtt
               manufacturer: IKEA
-              model: TRADFRI on/off switch (E1743)
+              model: TRADFRI on/off switch
             # DEPRECATED - for removal, keeping for z2m v1 backward compatibility
             - integration: mqtt
               manufacturer: IKEA
@@ -62,6 +61,10 @@ blueprint:
             - integration: mqtt
               manufacturer: IKEA
               model: SOMRIG shortcut button (E2213)
+            # DEPRECATED - for removal, keeping for z2m v1 backward compatibility
+            - integration: mqtt
+              manufacturer: IKEA
+              model: TRADFRI on/off switch (E1743)
           multiple: true
     light:
       name: Light