diff --git a/crates/caldav/src/calendar/resource.rs b/crates/caldav/src/calendar/resource.rs
index 336e0a4..01031aa 100644
--- a/crates/caldav/src/calendar/resource.rs
+++ b/crates/caldav/src/calendar/resource.rs
@@ -81,11 +81,11 @@ pub enum CalendarProp {
     // Didn't find the spec
     Getctag(String),
 
-    #[serde(skip_deserializing, untagged)]
+    #[serde(skip_deserializing, rename = "$value")]
     #[from]
     ExtCommonProperties(CommonPropertiesProp),
 
-    #[serde(untagged)]
+    #[serde(other)]
     #[default]
     Invalid,
 }
diff --git a/crates/caldav/src/calendar_object/resource.rs b/crates/caldav/src/calendar_object/resource.rs
index e45ac53..cbcda2d 100644
--- a/crates/caldav/src/calendar_object/resource.rs
+++ b/crates/caldav/src/calendar_object/resource.rs
@@ -39,11 +39,11 @@ pub enum CalendarObjectProp {
     #[serde(rename = "C:calendar-data")]
     CalendarData(String),
 
-    #[serde(skip_deserializing, untagged)]
+    #[serde(skip_deserializing, rename = "$value")]
     #[from]
     ExtCommonProperties(CommonPropertiesProp),
 
-    #[serde(untagged)]
+    #[serde(other)]
     #[default]
     Invalid,
 }
diff --git a/crates/caldav/src/principal/mod.rs b/crates/caldav/src/principal/mod.rs
index be1af1c..3c726e1 100644
--- a/crates/caldav/src/principal/mod.rs
+++ b/crates/caldav/src/principal/mod.rs
@@ -38,11 +38,11 @@ pub enum PrincipalProp {
     #[serde(rename = "C:calendar-user-address-set")]
     CalendarUserAddressSet(HrefElement),
 
-    #[serde(skip_deserializing, untagged)]
+    #[serde(skip_deserializing, rename = "$value")]
     #[from]
     ExtCommonProperties(CommonPropertiesProp),
 
-    #[serde(untagged)]
+    #[serde(other)]
     #[default]
     Invalid,
 }
diff --git a/crates/carddav/src/address_object/resource.rs b/crates/carddav/src/address_object/resource.rs
index 4c291fe..d0f11e9 100644
--- a/crates/carddav/src/address_object/resource.rs
+++ b/crates/carddav/src/address_object/resource.rs
@@ -40,11 +40,11 @@ pub enum AddressObjectProp {
     #[serde(rename = "CARD:address-data")]
     AddressData(String),
 
-    #[serde(skip_deserializing, untagged)]
+    #[serde(skip_deserializing, rename = "$value")]
     #[from]
     ExtCommonProperties(CommonPropertiesProp),
 
-    #[serde(untagged)]
+    #[serde(other)]
     #[default]
     Invalid,
 }
diff --git a/crates/carddav/src/addressbook/resource.rs b/crates/carddav/src/addressbook/resource.rs
index 08b43c5..b2e56c0 100644
--- a/crates/carddav/src/addressbook/resource.rs
+++ b/crates/carddav/src/addressbook/resource.rs
@@ -66,11 +66,11 @@ pub enum AddressbookProp {
     // Didn't find the spec
     Getctag(String),
 
-    #[serde(skip_deserializing, untagged)]
+    #[serde(skip_deserializing, rename = "$value")]
     #[from]
     ExtCommonProperties(CommonPropertiesProp),
 
-    #[serde(untagged)]
+    #[serde(other)]
     #[default]
     Invalid,
 }
diff --git a/crates/carddav/src/principal/mod.rs b/crates/carddav/src/principal/mod.rs
index ee80388..741b0a2 100644
--- a/crates/carddav/src/principal/mod.rs
+++ b/crates/carddav/src/principal/mod.rs
@@ -38,11 +38,11 @@ pub enum PrincipalProp {
     #[serde(rename = "CARD:principal-address")]
     PrincipalAddress(Option<HrefElement>),
 
-    #[serde(skip_deserializing, untagged)]
+    #[serde(skip_deserializing, rename = "$value")]
     #[from]
     ExtCommonProperties(CommonPropertiesProp),
 
-    #[serde(untagged)]
+    #[serde(other)]
     #[default]
     Invalid,
 }
diff --git a/crates/dav/src/extensions/mod.rs b/crates/dav/src/extensions/mod.rs
index 86482a0..40a0232 100644
--- a/crates/dav/src/extensions/mod.rs
+++ b/crates/dav/src/extensions/mod.rs
@@ -33,7 +33,7 @@ pub enum CommonPropertiesProp {
     CurrentUserPrivilegeSet(UserPrivilegeSet),
     Owner(Option<HrefElement>),
 
-    #[serde(untagged)]
+    #[serde(other)]
     Invalid,
 }