diff --git a/.chloggen/feat_upcloud.yaml b/.chloggen/feat_upcloud.yaml
new file mode 100644
index 0000000000..1870f652c0
--- /dev/null
+++ b/.chloggen/feat_upcloud.yaml
@@ -0,0 +1,22 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: "enhancement"
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: "cloud"
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Add upcloud to cloud.provider and upcloud_compute to cloud.platform"
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [2786]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
diff --git a/docs/registry/attributes/cloud.md b/docs/registry/attributes/cloud.md
index 690a5a99c9..a088ebac8a 100644
--- a/docs/registry/attributes/cloud.md
+++ b/docs/registry/attributes/cloud.md
@@ -81,6 +81,7 @@ The following well-known definitions MUST be used if you set this attribute and
 | `tencent_cloud_cvm` | Tencent Cloud Cloud Virtual Machine (CVM) | ![Development](https://img.shields.io/badge/-development-blue) |
 | `tencent_cloud_eks` | Tencent Cloud Elastic Kubernetes Service (EKS) | ![Development](https://img.shields.io/badge/-development-blue) |
 | `tencent_cloud_scf` | Tencent Cloud Serverless Cloud Function (SCF) | ![Development](https://img.shields.io/badge/-development-blue) |
+| `upcloud_compute` | Compute on Upcloud | ![Development](https://img.shields.io/badge/-development-blue) |
 | `vultr.cloud_compute` | Vultr Cloud Compute | ![Development](https://img.shields.io/badge/-development-blue) |
 
 ---
@@ -99,4 +100,5 @@ The following well-known definitions MUST be used if you set this attribute and
 | `ibm_cloud` | IBM Cloud | ![Development](https://img.shields.io/badge/-development-blue) |
 | `oracle_cloud` | Oracle Cloud Infrastructure (OCI) | ![Development](https://img.shields.io/badge/-development-blue) |
 | `tencent_cloud` | Tencent Cloud | ![Development](https://img.shields.io/badge/-development-blue) |
+| `upcloud` | Upcloud | ![Development](https://img.shields.io/badge/-development-blue) |
 | `vultr` | Vultr | ![Development](https://img.shields.io/badge/-development-blue) |
diff --git a/model/cloud/registry.yaml b/model/cloud/registry.yaml
index 1c1eaba941..e05ecb714d 100644
--- a/model/cloud/registry.yaml
+++ b/model/cloud/registry.yaml
@@ -48,6 +48,10 @@ groups:
               value: 'tencent_cloud'
               brief: 'Tencent Cloud'
               stability: development
+            - id: 'upcloud'
+              value: 'upcloud'
+              brief: 'Upcloud'
+              stability: development
             - id: 'vultr'
               value: 'vultr'
               brief: 'Vultr'
@@ -321,6 +325,10 @@ groups:
               value: 'tencent_cloud_scf'
               brief: Tencent Cloud Serverless Cloud Function (SCF)
               stability: development
+            - id: upcloud_compute
+              value: 'upcloud_compute'
+              brief: Compute on Upcloud
+              stability: development
             - id: vultr.cloud_compute
               value: 'vultr.cloud_compute'
               brief: Vultr Cloud Compute