diff --git a/sentences/ro/cover_HassSetPosition.yaml b/sentences/ro/cover_HassSetPosition.yaml
new file mode 100644
index 0000000000..6dcd10b797
--- /dev/null
+++ b/sentences/ro/cover_HassSetPosition.yaml
@@ -0,0 +1,20 @@
+language: ro
+intents:
+  HassSetPosition:
+    data:
+      - sentences:
+          - "[<seteaza> ]<pozitia> [<din> ]<name> [<pana_la> ][valoarea[ de] ]<position>"
+          - "[<seteaza> ]<name> [<pana_la> ]<pozitia>[ de] <position>"
+          - "[<seteaza> ][<in>|<pana_la> ]<position> <pozitia> [<din> ]<name>"
+          - "(<deschide>|<inchide>) <name> [<pana_la> ][(valoarea|<pozitia>)[ de] ]<position>"
+        requires_context:
+          domain: cover
+        slots:
+          domain: cover
+
+      - sentences:
+          - "[<seteaza> ]({cover_classes_singular:device_class}|[toate ]{cover_classes_plural:device_class}) ([<din> ]<area>;[<pana_la> ](<pozitia>|valoare[a])[ de] <position>)"
+          - "[<seteaza> ]<pozitia> <din> ({cover_classes_singular:device_class}|[toate ]{cover_classes_plural:device_class}) ([<din> ]<area>;[<pana_la> ][(<pozitia>|valoare[a]) ][de ]<position>)"
+          - "(<deschide>|<inchide>) ([<pana_la> ][(<pozitia>|valoare[a])[ de] ]<position>;({cover_classes_singular:device_class}|[toate ]{cover_classes_plural:device_class}) [<din> ]<area>)"
+        slots:
+          domain: cover
diff --git a/sentences/ro/homeassistant_HassSetPosition.yaml b/sentences/ro/valve_HassSetPosition.yaml
similarity index 87%
rename from sentences/ro/homeassistant_HassSetPosition.yaml
rename to sentences/ro/valve_HassSetPosition.yaml
index faaa0b104b..f5a9119757 100644
--- a/sentences/ro/homeassistant_HassSetPosition.yaml
+++ b/sentences/ro/valve_HassSetPosition.yaml
@@ -8,6 +8,6 @@ intents:
           - "[<seteaza> ][<in>|<pana_la> ]<position> <pozitia> [<din> ]<name>"
           - "(<deschide>|<inchide>) <name> [<pana_la> ][(valoarea|<pozitia>)[ de] ]<position>"
         requires_context:
-          domain:
-            - cover
-            - valve
+          domain: valve
+        slots:
+          domain: valve
diff --git a/tests/ro/homeassistant_HassSetPosition.yaml b/tests/ro/cover_HassSetPosition.yaml
similarity index 59%
rename from tests/ro/homeassistant_HassSetPosition.yaml
rename to tests/ro/cover_HassSetPosition.yaml
index 0c0fb8c871..cbe1d07132 100644
--- a/tests/ro/homeassistant_HassSetPosition.yaml
+++ b/tests/ro/cover_HassSetPosition.yaml
@@ -8,17 +8,21 @@ tests:
     intent:
       name: HassSetPosition
       slots:
+        domain: cover
         name: "fereastra din stanga"
         position: 50
     response: "Am setat poziția"
+
   - sentences:
-      - "seteaza pozitia de la valva principala la 100"
-      - "pune valva principala la pozitia 100 %"
-      - "modifica la 100 de procente pozitia de la valva principala"
-      - "deschide valva principala 100%"
+      - "seteaza fereastra din dormitor la pozitia 50"
+      - "seteaza pozitia de la ferestrele din dormitor la 50 de procente"
+      - "inchide pana la valoarea de 50 la suta fereastra din dormitor"
+      - "deschide geamurile din dormitor 50%"
     intent:
       name: HassSetPosition
       slots:
-        name: "Valva principala"
-        position: 100
+        domain: cover
+        device_class: "window"
+        area: "Dormitor"
+        position: 50
     response: "Am setat poziția"
diff --git a/tests/ro/valve_HassSetPosition.yaml b/tests/ro/valve_HassSetPosition.yaml
new file mode 100644
index 0000000000..eca8a61494
--- /dev/null
+++ b/tests/ro/valve_HassSetPosition.yaml
@@ -0,0 +1,14 @@
+language: ro
+tests:
+  - sentences:
+      - "seteaza pozitia de la valva principala la 100"
+      - "pune valva principala la pozitia 100 %"
+      - "modifica la 100 de procente pozitia de la valva principala"
+      - "deschide valva principala 100%"
+    intent:
+      name: HassSetPosition
+      slots:
+        domain: valve
+        name: "Valva principala"
+        position: 100
+    response: "Am setat poziția"