diff --git a/.gitbook/assets/Setup resovle timer (alert rules).png b/.gitbook/assets/Setup resovle timer (alert rules).png
index e6f34c2..3865c11 100644
Binary files a/.gitbook/assets/Setup resovle timer (alert rules).png and b/.gitbook/assets/Setup resovle timer (alert rules).png differ
diff --git a/.gitbook/assets/resolve timer on triggered incident.png b/.gitbook/assets/resolve timer on triggered incident.png
new file mode 100644
index 0000000..b8f94c0
Binary files /dev/null and b/.gitbook/assets/resolve timer on triggered incident.png differ
diff --git a/.gitbook/assets/resolve-timer/3-resolved-states.png b/.gitbook/assets/resolve-timer/3-resolved-states.png
new file mode 100644
index 0000000..505a5b1
Binary files /dev/null and b/.gitbook/assets/resolve-timer/3-resolved-states.png differ
diff --git a/.gitbook/assets/resolve-timer/cover.png b/.gitbook/assets/resolve-timer/cover.png
new file mode 100644
index 0000000..bf82c57
Binary files /dev/null and b/.gitbook/assets/resolve-timer/cover.png differ
diff --git a/.gitbook/assets/resolve-timer/resolve-badge.png b/.gitbook/assets/resolve-timer/resolve-badge.png
new file mode 100644
index 0000000..1b2deef
Binary files /dev/null and b/.gitbook/assets/resolve-timer/resolve-badge.png differ
diff --git a/.gitbook/assets/resolve-timer/resolve-timer.png b/.gitbook/assets/resolve-timer/resolve-timer.png
new file mode 100644
index 0000000..b8975bf
Binary files /dev/null and b/.gitbook/assets/resolve-timer/resolve-timer.png differ
diff --git a/.gitbook/assets/resolve-timer/timer-different-states.png b/.gitbook/assets/resolve-timer/timer-different-states.png
new file mode 100644
index 0000000..5318a56
Binary files /dev/null and b/.gitbook/assets/resolve-timer/timer-different-states.png differ
diff --git a/.gitbook/assets/setup resolve timer (integration).png b/.gitbook/assets/setup resolve timer (integration).png
index b2dbd46..1c1d7bb 100644
Binary files a/.gitbook/assets/setup resolve timer (integration).png and b/.gitbook/assets/setup resolve timer (integration).png differ
diff --git a/SUMMARY.md b/SUMMARY.md
index fdacf2e..b7cf502 100644
--- a/SUMMARY.md
+++ b/SUMMARY.md
@@ -17,7 +17,7 @@
* [Sharing incidents](incidents/sharing-incidents.md)
* [Why does message parsing fail?](incidents/why-does-message-parsing-fail.md)
* [Rate limiting on duplicate incidents](incidents/rate-limiting-on-duplicate-incidents.md)
-* [Setting up Resolve timer](incidents/resolve-timer-for-incidents.md)
+* [Resolve timer](incidents/resolve-timer.md)
## Alerts
diff --git a/incidents/resolve-timer-for-incidents.md b/incidents/resolve-timer-for-incidents.md
deleted file mode 100644
index a3871a6..0000000
--- a/incidents/resolve-timer-for-incidents.md
+++ /dev/null
@@ -1,171 +0,0 @@
-# Resolve Timer
-
-Keep your incident dashboard clean and focused with automated incident resolution. Resolve Timer automatically closes incidents after a specified time period, helping your team focus on what matters most.
-
-## Overview
-
-Resolve Timer is an intelligent automation feature that automatically resolves incidents after a predetermined time period. Think of it as your dashboard's cleanup crew - it ensures that incidents don't linger indefinitely and clutter your incident management view.
-
-When an incident remains open for the duration you've specified, Resolve Timer steps in and automatically marks it as resolved. This helps maintain a clean, actionable dashboard where your team can focus on active, unresolved incidents that need immediate attention.
-
-## Why use Resolve Timer?
-
-**Cleaner dashboards**: Eliminate incident clutter and maintain focus on active issues that require immediate attention.
-
-**Better team productivity**: Your team spends time on genuine incidents.
-
-**Consistent incident hygiene**: Ensure incidents don't remain open indefinitely, maintaining accurate incident metrics and reporting.
-
-## How Resolve Timer works
-
-Once configured, Resolve Timer monitors your incidents and automatically resolves them based on your specified timeframe. The timer starts counting from the moment an incident is created, and when it reaches your configured duration, the incident is automatically marked as resolved.
-
-You can configure Resolve Timer in two ways:
-- **Integration-level**: Automatically resolve all incidents from a specific integration
-- **Alert rule-level**: Resolve incidents that match specific conditions using alert rules
-
-## Prerequisites
-
-Before configuring Resolve Timer, make sure you have:
-- Permission to Edit/Create an Alert rule
-- Permission to Edit/Create an Integration
-
-## Configuration Methods
-
-### Method 1: Integration-level Resolve Timer
-
-Use this method when you want every incident from a specific integration to automatically resolve after a set time period.
-
-#### Step-by-step setup
-
-**Step 1**: Navigate to your integration settings
-- Go to **Integrations** in your Spike dashboard
-- Find the integration you want to configure
-- Click **Edit** or create a new integration
-
-**Step 2**: Access advanced configuration
-- Scroll down to the **Advanced Configuration** section
-- Look for the **Resolve Timer** toggle switch
-
-**Step 3**: Enable and configure Resolve Timer
-- Toggle the **Resolve Timer** switch to **ON**
-- Enter your desired time value in the input field
-- Select the time unit from the dropdown: **Minutes**, **Hours**, or **Days**
-
-**Step 4**: Save your configuration
-- Click **Save** to apply your changes
-- All future incidents from this integration will automatically resolve after your specified time period
-
-#### Example configuration
-- **Time value**: 24
-- **Time unit**: Hours
-- **Result**: All incidents from this integration will automatically resolve after 24 hours
-
-.png)
-
-### Method 2: Alert Rule-based Resolve Timer
-
-Use this method when you want to resolve incidents that match specific conditions, giving you more granular control over which incidents get automatically resolved.
-
-#### Step-by-step setup
-
-**Step 1**: Create or edit an alert rule
-- Navigate to **Alert Rules** in your dashboard
-- Click **Create Alert Rule** or select an existing rule to edit
-
-**Step 2**: Configure your conditions
-- Set up your alert conditions as needed
-- Define which incidents should trigger this rule
-
-**Step 3**: Add the Resolve Timer action
-- In the **Actions** section, click **Add Action**
-- Select **Resolve After** from the action dropdown
-
-**Step 4**: Configure timing
-- Enter your desired time value
-- Select the time unit: **Minutes**, **Hours**, or **Days**
-- Click **Save** or **Update** to apply your rule
-
-#### Example alert rule configuration
-- **Condition**: Incidents from "Production Database" service
-- **Action**: Resolve After 2 hours
-- **Result**: Database incidents automatically resolve after 2 hours if not manually handled
-
-.png)
-
-## Configuration Options
-
-### Time Units Available
-| Unit | Minimum Value | Maximum Value | Best For |
-|------|---------------|---------------|----------|
-| Minutes | 1 | 1440 (24 hours) | Short-lived alerts, testing |
-| Hours | 1 | 168 (7 days) | Standard incident workflows |
-| Days | 1 | 7 | Long-running maintenance, planned outages |
-
-### Integration vs Alert Rule: Which to choose?
-
-**Use Integration-level Resolve Timer when**:
-- You want consistent behavior across all incidents from a source
-- You're dealing with noisy integrations that generate many low-priority alerts
-- You need simple, set-and-forget automation
-
-**Use Alert Rule-based Resolve Timer when**:
-- You need different resolution times based on incident characteristics
-- You want to combine auto-resolution with other automated actions
-- You need conditional logic for incident resolution
-
-
-> ✅ **Resolve Timer is available on all Spike plans** - Starter, Business, and Enterprise.
-
-## Best Practices
-
-**Start with longer timeframes**: Begin with conservative resolution times (like 24 hours) and adjust based on your team's workflow patterns.
-
-**Monitor resolution patterns**: Review auto-resolved incidents periodically to ensure you're not missing important alerts.
-
-**Use different timers for different services**: Critical production services might need longer resolution times than development or staging environments.
-
-**Test your configuration**: Set up Resolve Timer with a test integration first to understand how it behaves with your incident types.
-
-## FAQs
-
-
-Q: Can I disable Resolve Timer for specific incidents?
-A: Not for individual incidents, but you can disable it at the integration level or modify alert rule conditions to exclude certain incident types.
-
-
-
-Q: What happens if I manually resolve an incident before the timer expires?
-A: Manual resolution takes priority. The timer stops, and the incident remains manually resolved.
-
-
-
-Q: Can I see which incidents were auto-resolved?
-A: Yes, auto-resolved incidents show a `Resolved (timer)` status. You can also check activity log to see if the incident was auto
-
-
-
-Q: Can I set different resolution times for different severity levels?
-A: Yes, using alert rules you can create different Resolve Timer configurations based on incident severity, service, or other conditions.
-
-
-
-Q: What's the shortest resolution time I can set?
-A: The minimum is 1 minute, though we recommend at least 15-30 minutes for most use cases to allow for proper incident handling.
-
-
-
-Q: Will I get notified when incidents auto-resolve?
-A: This depends on your notification settings. You can configure whether you want to receive notifications for auto-resolved incidents.
-
-
-## Need Help?
-
-If you're having trouble setting up Resolve Timer or have questions about your specific use case:
-- Check out our [Integration documentation](https://docs.spike.sh/integrations-guideline/create-integration-and-service-on-dashboard)
-- Learn about [Alert Rules](https://docs.spike.sh/alerts/alert-rules) for advanced incident handling
-- Contact our support team at support@spike.sh for personalized assistance
-
----
-
-*Was this helpful? Let us know at support@spike.sh*
\ No newline at end of file
diff --git a/incidents/resolve-timer.md b/incidents/resolve-timer.md
new file mode 100644
index 0000000..218b6b5
--- /dev/null
+++ b/incidents/resolve-timer.md
@@ -0,0 +1,112 @@
+---
+description: >-
+ Resolved by Timer resolves incidents after a specified time period.
+---
+
+
+
+## Introduction
+**Resolved by Timer** lets you automatically resolve incidents after a fixed duration. Once an incident is triggered, a countdown starts. If the incident hasn’t been manually resolved by the time the countdown ends, Spike will mark it as Resolved with Timer.
+
+You’ll see a badge on the incident row and incident page, along with a visual indicator showing the timer. You can cancel the timer at any point from the incident view.
+
+
+
+Resolve Timer can be set up in multiple ways:
+
+**Integration-level**: apply the same timer to all incidents from an integration.
+
+**Alert rules**: apply timers only when certain conditions are met (e.g., based on severity or service).
+
+**Playbooks**: apply timers as part of your playbook.
+
+
+{% hint style="success" %}
+Resolve Timer is available on **all plans**.
+{% endhint %}
+
+---
+
+## How it works?
+
+
+
+When an incident is triggered, a countdown begins automatically. This timer runs in the background while the incident behaves like any other — it can be acknowledged, updated with notes, or manually resolved at any time.
+
+If the countdown finishes and the incident is still open, Spike marks it as Resolved with Timer. A badge and countdown indicator appear on the incident row and detail page, making it clear when and how the resolution happened.
+
+---
+
+## Setup Resolve timer on integration level
+Use this when you want every incident from a specific integration to resolve after a set time.
+
+{% stepper %}
+{% step %}
+When **Editing**/**Creating** your integration scroll to **Advanced Configuration** and locate the **Resolve Timer** toggle.
+{% endstep %}
+{% step %}
+Toggle **Resolve Timer** to **ON**, enter your time value, select the unit (**Minutes**, **Hours**, or **Days**), and click **Save**.
+{% endstep %}
+{% endstepper %}
+
+Example: Setting 24 hours will automatically resolve all incidents from this integration after 24 hours.
+
+.png)
+
+## Setup Alert Rule-based Resolve timer
+Use this for granular control over which incidents to set a timer for.
+
+{% stepper %}
+{% step %}
+While **Editing**/**Creating** an alert rule, set up your alert conditions to define which incidents should trigger this rule.
+{% endstep %}
+{% step %}
+In **Actions** select **Resolve After**. Enter the time value, select the unit, then **Save** or **Update** the rule.
+{% endstep %}
+{% endstepper %}
+
+Example: Database incidents automatically resolve after 2 hours if not manually handled.
+
+.png)
+
+## Setup Resolve timer in Playbooks
+Use this to set timer as part of your response playbook
+
+{% stepper %}
+{% step %}
+While **editing** or **creating** a playbook, add an action to apply a Resolve Timer.
+{% endstep %}
+{% step %}
+You can choose when the timer should start — for example, immediately on trigger or when the incident status changes (e.g., to **Acknowledged**).
+{% endstep %}
+{% endstepper %}
+
+.png)
+
+---
+
+## FAQ
+
+
+Can I Remove Timer for specific incidents?
+Yes, You can remove it from the incident by clicking on the remove timer button.
+
+
+
+Can I set different times for different severity levels?
+Yes, using alert rules you can create different configurations based on incident severity, service, or other conditions.
+
+
+
+What's the minimum resolution time?
+1 minute, though we recommend at least 15-30 minutes for most use cases.
+
+
+
+Will I get notified when incidents resolve by timer?
+This depends on your notification settings. You can configure to get alerts on resolve incidents
+
+
+---
+
+*If you need help setting up Resolve Timer, reach out to [support@spike.sh](mailto:support@spike.sh).*
\ No newline at end of file
