diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index e61bae637c..0ffde5f0f0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -42,6 +42,7 @@ body:
         - area:gcp-cloud-run
         - area:gcp-gce
         - area:graphql
+        - area:heroku
         - area:host
         - area:http
         - area:k8s
diff --git a/.github/ISSUE_TEMPLATE/change_proposal.yaml b/.github/ISSUE_TEMPLATE/change_proposal.yaml
index 0ae9a6fb32..23a3ecec3e 100644
--- a/.github/ISSUE_TEMPLATE/change_proposal.yaml
+++ b/.github/ISSUE_TEMPLATE/change_proposal.yaml
@@ -35,6 +35,7 @@ body:
         - area:gcp-cloud-run
         - area:gcp-gce
         - area:graphql
+        - area:heroku
         - area:host
         - area:http
         - area:k8s
diff --git a/.github/ISSUE_TEMPLATE/new-conventions.yaml b/.github/ISSUE_TEMPLATE/new-conventions.yaml
index 4eeae1d515..b227df92e9 100644
--- a/.github/ISSUE_TEMPLATE/new-conventions.yaml
+++ b/.github/ISSUE_TEMPLATE/new-conventions.yaml
@@ -44,6 +44,7 @@ body:
         - area:gcp-cloud-run
         - area:gcp-gce
         - area:graphql
+        - area:heroku
         - area:host
         - area:http
         - area:k8s
diff --git a/docs/attributes-registry/README.md b/docs/attributes-registry/README.md
index 13b3fd3777..fd1bc0cb60 100644
--- a/docs/attributes-registry/README.md
+++ b/docs/attributes-registry/README.md
@@ -49,6 +49,7 @@ Currently, the following namespaces exist:
 * [Google Cloud Run](gcp-cloud-run.md)
 * [Google Compute Engine](gcp-gce.md)
 * [GraphQl](graphql.md)
+* [Heroku](heroku.md)
 * [Host](host.md)
 * [HTTP](http.md)
 * [K8s](k8s.md)
diff --git a/docs/attributes-registry/heroku.md b/docs/attributes-registry/heroku.md
new file mode 100644
index 0000000000..b84139462e
--- /dev/null
+++ b/docs/attributes-registry/heroku.md
@@ -0,0 +1,14 @@
+<!--- Hugo front matter used to generate the website version of this page:
+--->
+
+# Heroku
+
+## Heroku Attributes
+
+<!-- semconv registry.heroku(omit_requirement_level) -->
+| Attribute  | Type | Description  | Examples  | Stability |
+|---|---|---|---|---|
+| `heroku.app.id` | string | Unique identifier for the application | `2daa2797-e42b-4624-9322-ec3f968df4da` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `heroku.release.commit` | string | Commit hash for the current release | `e6134959463efd8966b20e75b913cafe3f5ec` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `heroku.release.creation_timestamp` | string | Time and date the release was created | `2022-10-23T18:00:42Z` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+<!-- endsemconv -->
diff --git a/docs/resource/cloud-provider/heroku.md b/docs/resource/cloud-provider/heroku.md
index b16a2b620d..6776486eab 100644
--- a/docs/resource/cloud-provider/heroku.md
+++ b/docs/resource/cloud-provider/heroku.md
@@ -9,9 +9,9 @@
 <!-- semconv heroku -->
 | Attribute  | Type | Description  | Examples  | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability |
 |---|---|---|---|---|---|
-| `heroku.app.id` | string | Unique identifier for the application | `2daa2797-e42b-4624-9322-ec3f968df4da` | `Opt-In` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
-| `heroku.release.commit` | string | Commit hash for the current release | `e6134959463efd8966b20e75b913cafe3f5ec` | `Opt-In` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
-| `heroku.release.creation_timestamp` | string | Time and date the release was created | `2022-10-23T18:00:42Z` | `Opt-In` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| [`heroku.app.id`](../../attributes-registry/heroku.md) | string | Unique identifier for the application | `2daa2797-e42b-4624-9322-ec3f968df4da` | `Opt-In` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| [`heroku.release.commit`](../../attributes-registry/heroku.md) | string | Commit hash for the current release | `e6134959463efd8966b20e75b913cafe3f5ec` | `Opt-In` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| [`heroku.release.creation_timestamp`](../../attributes-registry/heroku.md) | string | Time and date the release was created | `2022-10-23T18:00:42Z` | `Opt-In` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 <!-- endsemconv -->
 
 **Mapping:**
diff --git a/model/registry/heroku.yaml b/model/registry/heroku.yaml
new file mode 100644
index 0000000000..d9fe99a731
--- /dev/null
+++ b/model/registry/heroku.yaml
@@ -0,0 +1,25 @@
+groups:
+  - id: registry.heroku
+    prefix: heroku
+    type: attribute_group
+    brief: >
+        This document defines attributes for the Android platform on which the Android application is running.
+    attributes:
+      - id: release.creation_timestamp
+        type: string
+        stability: experimental
+        brief: >
+          Time and date the release was created
+        examples: [ '2022-10-23T18:00:42Z' ]
+      - id: release.commit
+        type: string
+        stability: experimental
+        brief: >
+          Commit hash for the current release
+        examples: [ 'e6134959463efd8966b20e75b913cafe3f5ec' ]
+      - id: app.id
+        type: string
+        stability: experimental
+        brief: >
+          Unique identifier for the application
+        examples: [ '2daa2797-e42b-4624-9322-ec3f968df4da' ]
diff --git a/model/resource/cloud_provider/heroku.yaml b/model/resource/cloud_provider/heroku.yaml
index c8f7e34143..f609f473e4 100644
--- a/model/resource/cloud_provider/heroku.yaml
+++ b/model/resource/cloud_provider/heroku.yaml
@@ -1,28 +1,12 @@
 groups:
   - id: heroku
-    prefix: heroku
     type: resource
     brief: >
       Heroku dyno metadata
     attributes:
-      - id: release.creation_timestamp
-        type: string
-        stability: experimental
-        brief: >
-          Time and date the release was created
-        examples: [ '2022-10-23T18:00:42Z' ]
+      - ref: heroku.release.creation_timestamp
         requirement_level: opt_in
-      - id: release.commit
-        type: string
-        stability: experimental
-        brief: >
-          Commit hash for the current release
-        examples: [ 'e6134959463efd8966b20e75b913cafe3f5ec' ]
+      - ref: heroku.release.commit
         requirement_level: opt_in
-      - id: app.id
-        type: string
-        stability: experimental
-        brief: >
-          Unique identifier for the application
-        examples: [ '2daa2797-e42b-4624-9322-ec3f968df4da' ]
+      - ref: heroku.app.id
         requirement_level: opt_in