diff --git a/ACKNOWLEDGEMENTS.md b/ACKNOWLEDGEMENTS.md
index 7be207d56a..48bfb6a4df 100644
--- a/ACKNOWLEDGEMENTS.md
+++ b/ACKNOWLEDGEMENTS.md
@@ -693,3 +693,4 @@ Further device support has been made with the assistance of users. Please consid
 - [sorrison](https://github.com/sorrison) for contributing improvements to Sanden heat pump.
 - [OsaedYahya](https://github.com/OsaedYahya) for contributing support for MyQ TD8 vide doorbell.
 - [holgergrote](https://github.com/holgergrote) for contributing support for Sygonix Smarter dehumidifier.
+- [rmf1995](https://github.com/rmf1995) for contributing support for Giatsu VAW 2 heat pump water heater.
diff --git a/DEVICES.md b/DEVICES.md
index fa9f86eb1e..192f6d1f10 100644
--- a/DEVICES.md
+++ b/DEVICES.md
@@ -145,6 +145,7 @@
 - Ferroli Titano Twin water heater
 - Fisher air to water heat pump
 - Geyserwise TSE1 Geyser controller kit
+- Giatsu VAW 2 heat pump water heater
 - Hydrotherm Dynamic/X8 heat pump hot water systems (Gen 5 and 6)
 - ITS-4.5HD super water heat pump
 - Koi Duo HTW-TD-080KOID
diff --git a/custom_components/tuya_local/devices/giatsu_vaw2_waterheater.yaml b/custom_components/tuya_local/devices/giatsu_vaw2_waterheater.yaml
new file mode 100644
index 0000000000..567b3bbb02
--- /dev/null
+++ b/custom_components/tuya_local/devices/giatsu_vaw2_waterheater.yaml
@@ -0,0 +1,54 @@
+name: Water heater
+products:
+  - id: rmzdb9fyj9jo1bza
+    name: Giatsu GIA-ATS-O-300VAWT
+primary_entity:
+  entity: water_heater
+  dps:
+    - id: 1
+      type: boolean
+      name: operation_mode
+      mapping:
+        - dps_val: false
+          value: "off"
+        - dps_val: true
+          constraint: mode
+          conditions:
+            - dps_val: heat
+              value: Heating
+            - dps_val: heatfan
+              value: "Heating + Ventilation"
+    - id: 2
+      type: integer
+      name: temperature
+      range:
+        min: 10
+        max: 70
+      unit: C
+    - id: 4
+      type: string
+      name: mode
+      hidden: true
+secondary_entities:
+  - entity: sensor
+    class: temperature
+    dps:
+      - id: 3
+        type: integer
+        name: sensor
+        unit: C
+        class: measurement
+  - entity: binary_sensor
+    class: problem
+    category: diagnostic
+    dps:
+      - id: 9
+        type: bitfield
+        name: sensor
+        mapping:
+          - dps_val: 0
+            value: false
+          - value: true
+      - id: 9
+        type: bitfield
+        name: fault_code