diff --git a/roles/ensure_dovecot/templates/Fedora/43/etc/dovecot/conf.d/local.conf b/roles/ensure_dovecot/templates/Fedora/43/etc/dovecot/conf.d/local.conf
index b3a7cfa..eb22847 100644
--- a/roles/ensure_dovecot/templates/Fedora/43/etc/dovecot/conf.d/local.conf
+++ b/roles/ensure_dovecot/templates/Fedora/43/etc/dovecot/conf.d/local.conf
@@ -35,7 +35,7 @@ protocols {
 
 service lmtp {
   inet_listener lmtp {
-    address = 0.0.0.0 ::
+    listen = 0.0.0.0 ::
     port = 24
   }
 }
@@ -56,9 +56,9 @@ protocol imap {
 service quota-status {
   client_limit = 1
   executable = quota-status -p postfix
-  inet_listener {
+  # inet_listener quota-status {
     # port = 12340
-  }
+  # }
 }
 
 mailbox_list_index = yes
@@ -66,15 +66,18 @@ protocol !indexer-worker {
   mail_vsize_bg_after_count = 100
 }
 
-plugin {
-  quota = count:User quota
-  quota_rule = *:storage={{ dovecot_quota }}
-  quota_rule2 = Trash:storage=+100M
-  quota_rule3 = SPAM:ignore
-  quota_vsizes = yes
+quota_storage_size = {{ dovecot_quota }}
+namespace inbox {
+  mailbox Trash {
+    quota_storage_extra = 100M
+  }
+  mailbox SPAM {
+    quota_ignore = yes
+  }
 }
 
 submission_relay_host = localhost
 protocol submission {
   mail_max_userip_connections = 10
 }
+
diff --git a/roles/ensure_dovecot/templates/Fedora/44/etc/dovecot/conf.d/local.conf b/roles/ensure_dovecot/templates/Fedora/44/etc/dovecot/conf.d/local.conf
index b3a7cfa..6d23cb9 100644
--- a/roles/ensure_dovecot/templates/Fedora/44/etc/dovecot/conf.d/local.conf
+++ b/roles/ensure_dovecot/templates/Fedora/44/etc/dovecot/conf.d/local.conf
@@ -35,7 +35,7 @@ protocols {
 
 service lmtp {
   inet_listener lmtp {
-    address = 0.0.0.0 ::
+    listen = 0.0.0.0 ::
     port = 24
   }
 }
@@ -56,8 +56,8 @@ protocol imap {
 service quota-status {
   client_limit = 1
   executable = quota-status -p postfix
-  inet_listener {
-    # port = 12340
+  inet_listener quota-status {
+    port = 12340
   }
 }
 
@@ -66,15 +66,18 @@ protocol !indexer-worker {
   mail_vsize_bg_after_count = 100
 }
 
-plugin {
-  quota = count:User quota
-  quota_rule = *:storage={{ dovecot_quota }}
-  quota_rule2 = Trash:storage=+100M
-  quota_rule3 = SPAM:ignore
-  quota_vsizes = yes
+quota_storage_size = {{ dovecot_quota }}
+namespace inbox {
+  mailbox Trash {
+    quota_storage_extra = 100M
+  }
+  mailbox SPAM {
+    quota_ignore = yes
+  }
 }
 
 submission_relay_host = localhost
 protocol submission {
   mail_max_userip_connections = 10
 }
+