diff --git a/packages/announcements.yaml b/packages/announcements.yaml
index 62531ea..ca1d9a6 100644
--- a/packages/announcements.yaml
+++ b/packages/announcements.yaml
@@ -337,6 +337,15 @@ script:
         call_interruption: 1
         call_server_maintenance: 1
 
+  server_maintenance_done_annc:
+    alias: Server Maintenance Done Announcement
+    sequence:
+    - service: script.status_annc
+      data:
+        who: "{{ who|default('everywhere') }}"
+        call_interruption: 1
+        call_server_maintenance_done: 1
+
   welcome_home:
     alias: 'Welcome Home'
     sequence:
diff --git a/packages/notify.yaml b/packages/notify.yaml
index 817e76b..5211234 100644
--- a/packages/notify.yaml
+++ b/packages/notify.yaml
@@ -1739,6 +1739,14 @@ script:
               ] | random }}
             {% endmacro %}
 
+            {% macro server_maintenance_done() %}
+              {{ [
+                'Home assistant has returned to service. Nerd Home Incorporated appreciates your patience.',
+                'All services are operational again. We appreciate your business.',
+                'Mischief managed. Server back online.',
+                ] | random }}
+            {% endmacro %}
+
 
             {# a macro that removes all newline characters, empty spaces, and returns formatted text. Also replaces all Underscores with Spaces  #}
             {%- macro cleanup(data) -%}
@@ -1847,6 +1855,10 @@ script:
               {% if call_server_maintenance == 1 %}
                 {{ server_maintenance() }}
               {% endif %}
+
+              {% if call_server_maintenance_done == 1 %}
+                {{ server_maintenance_done() }}
+              {% endif %}
               
             {%- endmacro -%}