From 244dfe014a0c8bcd0bc8873fea8aba2e8cc4d5b6 Mon Sep 17 00:00:00 2001
From: Erik Montnemery <erik@montnemery.com>
Date: Thu, 21 May 2026 09:33:10 +0200
Subject: [PATCH] Remove advanced mode from mqtt service actions (#171448)

Co-authored-by: Jan Bouwhuis <jbouwh@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 homeassistant/components/mqtt/services.yaml | 44 +++++++++++----------
 homeassistant/components/mqtt/strings.json  |  7 +++-
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/homeassistant/components/mqtt/services.yaml b/homeassistant/components/mqtt/services.yaml
index a288a4f80f2..a24c084883b 100644
--- a/homeassistant/components/mqtt/services.yaml
+++ b/homeassistant/components/mqtt/services.yaml
@@ -11,27 +11,29 @@ publish:
       example: "The temperature is {{ states('sensor.temperature') }}"
       selector:
         template:
-    evaluate_payload:
-      default: false
-      selector:
-        boolean:
-    qos:
-      default: 0
-      selector:
-        select:
-          options:
-            - "0"
-            - "1"
-            - "2"
-    retain:
-      default: false
-      selector:
-        boolean:
-
-    message_expiry_interval:
-      selector:
-        duration:
-          enable_day: true
+    publish_options:
+      collapsed: true
+      fields:
+        evaluate_payload:
+          default: false
+          selector:
+            boolean:
+        qos:
+          default: "0"
+          selector:
+            select:
+              options:
+                - "0"
+                - "1"
+                - "2"
+        retain:
+          default: false
+          selector:
+            boolean:
+        message_expiry_interval:
+          selector:
+            duration:
+              enable_day: true
 dump:
   fields:
     topic:
diff --git a/homeassistant/components/mqtt/strings.json b/homeassistant/components/mqtt/strings.json
index 8603b84cfcf..812199b2f1a 100644
--- a/homeassistant/components/mqtt/strings.json
+++ b/homeassistant/components/mqtt/strings.json
@@ -1578,7 +1578,12 @@
           "name": "Topic"
         }
       },
-      "name": "Publish"
+      "name": "Publish",
+      "sections": {
+        "publish_options": {
+          "name": "Publish options"
+        }
+      }
     },
     "reload": {
       "description": "Reloads MQTT entities from the YAML-configuration.",