diff --git a/src/main/resources/data/minecraft/tags/damage_type/bypasses_armor.json b/src/main/resources/data/minecraft/tags/damage_type/bypasses_armor.json
index 721fecf4..f82e8c40 100644
--- a/src/main/resources/data/minecraft/tags/damage_type/bypasses_armor.json
+++ b/src/main/resources/data/minecraft/tags/damage_type/bypasses_armor.json
@@ -1,6 +1,7 @@
 {
   "replace": false,
   "values": [
-    "origins:no_water_for_gills"
+    "origins:no_water_for_gills",
+    "origins:hurt_by_water"
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/tags/damage_type/bypasses_shield.json b/src/main/resources/data/minecraft/tags/damage_type/bypasses_shield.json
index 721fecf4..f82e8c40 100644
--- a/src/main/resources/data/minecraft/tags/damage_type/bypasses_shield.json
+++ b/src/main/resources/data/minecraft/tags/damage_type/bypasses_shield.json
@@ -1,6 +1,7 @@
 {
   "replace": false,
   "values": [
-    "origins:no_water_for_gills"
+    "origins:no_water_for_gills",
+    "origins:hurt_by_water"
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/origins/damage_type/hurt_by_water.json b/src/main/resources/data/origins/damage_type/hurt_by_water.json
new file mode 100644
index 00000000..7d4456ac
--- /dev/null
+++ b/src/main/resources/data/origins/damage_type/hurt_by_water.json
@@ -0,0 +1,5 @@
+{
+  "exhaustion": 0.1,
+  "message_id": "hurt_by_water",
+  "scaling": "when_caused_by_living_non_player"
+}
\ No newline at end of file
diff --git a/src/main/resources/data/origins/powers/damage_from_potions.json b/src/main/resources/data/origins/powers/damage_from_potions.json
index 370b0db1..63d1b02f 100644
--- a/src/main/resources/data/origins/powers/damage_from_potions.json
+++ b/src/main/resources/data/origins/powers/damage_from_potions.json
@@ -10,10 +10,6 @@
   "entity_action": {
     "type": "origins:damage",
     "amount": 2,
-    "source": {
-      "name": "hurt_by_water",
-      "unblockable": true,
-      "bypasses_armor": true
-    }
+    "damage_type": "origins:hurt_by_water"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/origins/powers/water_vulnerability.json b/src/main/resources/data/origins/powers/water_vulnerability.json
index 861fca9e..78894c1e 100644
--- a/src/main/resources/data/origins/powers/water_vulnerability.json
+++ b/src/main/resources/data/origins/powers/water_vulnerability.json
@@ -4,11 +4,7 @@
   "onset_delay": 1,
   "damage": 2,
   "damage_easy": 1,
-  "damage_source": {
-    "name": "hurt_by_water",
-    "unblockable": true,
-    "bypasses_armor": true
-  },
+  "damage_type": "origins:hurt_by_water",
   "protection_enchantment": "origins:water_protection",
   "protection_effectiveness": 1.0,
   "condition": {