diff --git a/savings-opportunities/0001_unattached_ebs_volumes.md b/savings-opportunities/0001_unattached_ebs_volumes.md
new file mode 100644
index 0000000..4353b76
--- /dev/null
+++ b/savings-opportunities/0001_unattached_ebs_volumes.md
@@ -0,0 +1,78 @@
+# AWS Unattached EBS Volumes
+
+{% hint style="success" %}
+See [optimization-opportunities.md](../fundamentals/cost-savings/key-concepts/optimization-opportunities.md "mention") for more details on the concept.
+{% endhint %}
+
+## Key Metadata
+
+### Source: `AWS`
+
+### Service: `Amazon EC2`
+
+### Difficulty: `Easy`
+
+### Regions: ALL
+
+{% hint style="info" %}
+**Easy:** Zero downtime, zero performance risks
+
+**Medium:** Zero downtime, potential performance trade-offs
+
+**Hard:** Downtime required, potential performance trade-offs
+{% endhint %}
+
+### Type: `Usage`
+
+{% hint style="info" %}
+**Usage:** Actions altering actual cloud resources (e.g. changing VM specs, storage retention policies, removing unused resources)
+
+**Rate:** Actions targeting financial concepts, mainly commitment-based discounts (e.g. [Reserved Instances](https://aws.amazon.com/ec2/pricing/reserved-instances/) and [Savings Plans](https://aws.amazon.com/savingsplans/) for AWS, [Committed Use Discounts](https://cloud.google.com/compute/docs/instances/signing-up-committed-use-discounts) for GCP)
+
+**Custom:** Ad-hoc opportunities for custom tracking needs. See [creating-custom-optimization-opportunities.md](../guides/optimizing-cloud-costs/creating-custom-optimization-opportunities.md "mention") for more details.
+{% endhint %}
+
+## Details
+
+### How Opportunity is Detected
+
+Cloudthread scans EC2 for EBS volumes with status \`available\`.
+
+### Opportunity Thresholds Metrics
+
+* Waiting Period Days
+  * **Default value:** `1`
+* Priority
+  * **Default value:** `1`
+
+### Attached Context Metrics
+
+* VolumeReadOps
+* VolumeWriteOps
+
+{% hint style="info" %}
+What metrics Cloudthread attaches to the Savings Opportunity.
+{% endhint %}
+
+### How Estimated Savings is Calculated
+
+The daily cost impact for this opportunity is the average daily cost of the volume between minus the cost of archiving a snapshot of the same volume size for one day.
+
+{% hint style="warning" %}
+Note that this is an **upper bound** for snapshot cost - snapshots are typically smaller than the full volume size.
+{% endhint %}
+
+### Example
+
+daily-volume-cost = $5.029869
+daily-archived-snapshot-cost = ($-gb-per-month / 30) * volume-size-gib * gib-to-gb-conversion = $0.894783
+daily-cost-impact = $5.029869 - $0.894783
+
+### Record ID Explanation
+
+An ID of EBS volume, e.g. `vol-0c2aecd978c03dd7a`
+
+### Actions You Can Take
+
+Generate a snapshot of the volume, archive the generated snapshot, then delete the volume.
+
diff --git a/savings-opportunities/aws-ebs-volumes-attached-to-stopped-instances.md b/savings-opportunities/template.md
similarity index 87%
rename from savings-opportunities/aws-ebs-volumes-attached-to-stopped-instances.md
rename to savings-opportunities/template.md
index 39f0027..f2804ad 100644
--- a/savings-opportunities/aws-ebs-volumes-attached-to-stopped-instances.md
+++ b/savings-opportunities/template.md
@@ -12,6 +12,8 @@ See [optimization-opportunities.md](../fundamentals/cost-savings/key-concepts/op
 
 ### Difficulty: `Easy`
 
+### Reginos: ALL
+
 {% hint style="info" %}
 **Easy:** Zero downtime, zero performance risks
 
@@ -34,17 +36,22 @@ See [optimization-opportunities.md](../fundamentals/cost-savings/key-concepts/op
 
 ### How Opportunity is Detected
 
-Cloudthread scans EC2 for instances older than 1 days that are in the \`stopped\` state, and gathers attached volumes.
+Cloudthread scans EC2 for instances that are in the \`stopped\` state, and gathers attached volumes.
+
+### Opportunity Thresholds Metrics
+
+* Waiting Period Days
+  * **Default value:** `1`
+* Priority
+  * **Default value:** `1`
 
-### Opportunity Threshold Metrics
+### Attached Context Metrics
 
 * VolumeReadOps
-  * **Default value:** `0`
 * VolumeWriteOps
-  * **Default value:** `0`
 
 {% hint style="info" %}
-What metrics the Savings Opportunity is referencing.
+What metrics Cloudthread attaches to the Savings Opportunity.
 {% endhint %}
 
 ### How Estimated Monthly Savings is Calculated
@@ -67,12 +74,6 @@ An ID of EBS volume, e.g. `vol-0c2aecd978c03dd7a`
 
 Generate a snapshot of the volume, archive the generated snapshot, then delete the volume.
 
-#### CLI code
-
-```jsx
-XYZ
-```
-
 ### Other Notes
 
 XYZ