diff --git a/bin/core/src/cloud/hetzner/common.rs b/bin/core/src/cloud/hetzner/common.rs
index 442bae85c..d8213da69 100644
--- a/bin/core/src/cloud/hetzner/common.rs
+++ b/bin/core/src/cloud/hetzner/common.rs
@@ -233,32 +233,30 @@ pub enum HetznerActionStatus {
 #[allow(clippy::enum_variant_names)]
 pub enum HetznerServerType {
   // Shared
-  #[serde(rename = "cx11")]
-  SharedIntel1Core2Ram20Disk,
   #[serde(rename = "cpx11")]
   SharedAmd2Core2Ram40Disk,
   #[serde(rename = "cax11")]
   SharedArm2Core4Ram40Disk,
-  #[serde(rename = "cx21")]
+  #[serde(rename = "cx22")]
   SharedIntel2Core4Ram40Disk,
   #[serde(rename = "cpx21")]
   SharedAmd3Core4Ram80Disk,
   #[serde(rename = "cax21")]
   SharedArm4Core8Ram80Disk,
-  #[serde(rename = "cx31")]
-  SharedIntel2Core8Ram80Disk,
+  #[serde(rename = "cx32")]
+  SharedIntel4Core8Ram80Disk,
   #[serde(rename = "cpx31")]
   SharedAmd4Core8Ram160Disk,
   #[serde(rename = "cax31")]
   SharedArm8Core16Ram160Disk,
-  #[serde(rename = "cx41")]
-  SharedIntel4Core16Ram160Disk,
+  #[serde(rename = "cx42")]
+  SharedIntel8Core16Ram160Disk,
   #[serde(rename = "cpx41")]
   SharedAmd8Core16Ram240Disk,
   #[serde(rename = "cax41")]
   SharedArm16Core32Ram320Disk,
-  #[serde(rename = "cx51")]
-  SharedIntel8Core32Ram240Disk,
+  #[serde(rename = "cx52")]
+  SharedIntel16Core32Ram320Disk,
   #[serde(rename = "cpx51")]
   SharedAmd16Core32Ram360Disk,
   // Dedicated
diff --git a/bin/core/src/cloud/hetzner/mod.rs b/bin/core/src/cloud/hetzner/mod.rs
index 9544591fc..0555084b1 100644
--- a/bin/core/src/cloud/hetzner/mod.rs
+++ b/bin/core/src/cloud/hetzner/mod.rs
@@ -218,9 +218,6 @@ fn hetzner_server_type(
   server_type: HetznerServerType,
 ) -> common::HetznerServerType {
   match server_type {
-    HetznerServerType::SharedIntel1Core2Ram20Disk => {
-      common::HetznerServerType::SharedIntel1Core2Ram20Disk
-    }
     HetznerServerType::SharedAmd2Core2Ram40Disk => {
       common::HetznerServerType::SharedAmd2Core2Ram40Disk
     }
@@ -236,8 +233,8 @@ fn hetzner_server_type(
     HetznerServerType::SharedArm4Core8Ram80Disk => {
       common::HetznerServerType::SharedArm4Core8Ram80Disk
     }
-    HetznerServerType::SharedIntel2Core8Ram80Disk => {
-      common::HetznerServerType::SharedIntel2Core8Ram80Disk
+    HetznerServerType::SharedIntel4Core8Ram80Disk => {
+      common::HetznerServerType::SharedIntel4Core8Ram80Disk
     }
     HetznerServerType::SharedAmd4Core8Ram160Disk => {
       common::HetznerServerType::SharedAmd4Core8Ram160Disk
@@ -245,8 +242,8 @@ fn hetzner_server_type(
     HetznerServerType::SharedArm8Core16Ram160Disk => {
       common::HetznerServerType::SharedArm8Core16Ram160Disk
     }
-    HetznerServerType::SharedIntel4Core16Ram160Disk => {
-      common::HetznerServerType::SharedIntel4Core16Ram160Disk
+    HetznerServerType::SharedIntel8Core16Ram160Disk => {
+      common::HetznerServerType::SharedIntel8Core16Ram160Disk
     }
     HetznerServerType::SharedAmd8Core16Ram240Disk => {
       common::HetznerServerType::SharedAmd8Core16Ram240Disk
@@ -254,8 +251,8 @@ fn hetzner_server_type(
     HetznerServerType::SharedArm16Core32Ram320Disk => {
       common::HetznerServerType::SharedArm16Core32Ram320Disk
     }
-    HetznerServerType::SharedIntel8Core32Ram240Disk => {
-      common::HetznerServerType::SharedIntel8Core32Ram240Disk
+    HetznerServerType::SharedIntel16Core32Ram320Disk => {
+      common::HetznerServerType::SharedIntel16Core32Ram320Disk
     }
     HetznerServerType::SharedAmd16Core32Ram360Disk => {
       common::HetznerServerType::SharedAmd16Core32Ram360Disk
diff --git a/client/core/rs/src/entities/server_template/hetzner.rs b/client/core/rs/src/entities/server_template/hetzner.rs
index 7bc1c00fa..074b603d2 100644
--- a/client/core/rs/src/entities/server_template/hetzner.rs
+++ b/client/core/rs/src/entities/server_template/hetzner.rs
@@ -152,27 +152,47 @@ pub enum HetznerVolumeFormat {
 )]
 #[allow(clippy::enum_variant_names)]
 pub enum HetznerServerType {
-  SharedIntel1Core2Ram20Disk,
-  // The lowest tier available at all locations
+  // Shared
   #[default]
+  /// CPX11 - AMD 2 Cores, 2 Gb Ram, 40 Gb disk
   SharedAmd2Core2Ram40Disk,
+  /// CAX11 - Arm 2 Cores, 4 Gb Ram, 40 Gb disk
   SharedArm2Core4Ram40Disk,
+  /// CX22 - Intel 2 Cores, 4 Gb Ram, 40 Gb disk
   SharedIntel2Core4Ram40Disk,
+  /// CPX21 - AMD 3 Cores, 4 Gb Ram, 80 Gb disk
   SharedAmd3Core4Ram80Disk,
+  /// CAX21 - Arm 4 Cores, 8 Gb Ram, 80 Gb disk
   SharedArm4Core8Ram80Disk,
-  SharedIntel2Core8Ram80Disk,
+  /// CX32 - Intel 4 Cores, 8 Gb Ram, 80 Gb disk
+  SharedIntel4Core8Ram80Disk,
+  /// CPX31 - AMD 4 Cores, 8 Gb Ram, 160 Gb disk
   SharedAmd4Core8Ram160Disk,
+  /// CAX31 - Arm 8 Cores, 16 Gb Ram, 160 Gb disk
   SharedArm8Core16Ram160Disk,
-  SharedIntel4Core16Ram160Disk,
+  /// CX42 - Intel 8 Cores, 16 Gb Ram, 160 Gb disk
+  SharedIntel8Core16Ram160Disk,
+  /// CPX41 - AMD 8 Cores, 16 Gb Ram, 240 Gb disk
   SharedAmd8Core16Ram240Disk,
+  /// CAX41 - Arm 16 Cores, 32 Gb Ram, 320 Gb disk
   SharedArm16Core32Ram320Disk,
-  SharedIntel8Core32Ram240Disk,
+  /// CX52 - Intel 16 Cores, 32 Gb Ram, 320 Gb disk
+  SharedIntel16Core32Ram320Disk,
+  /// CPX51 - AMD 16 Cores, 32 Gb Ram, 360 Gb disk
   SharedAmd16Core32Ram360Disk,
+
+  // Dedicated
+  /// CCX13 - AMD 2 Cores, 8 Gb Ram, 80 Gb disk
   DedicatedAmd2Core8Ram80Disk,
+  /// CCX23 - AMD 4 Cores, 16 Gb Ram, 160 Gb disk
   DedicatedAmd4Core16Ram160Disk,
+  /// CCX33 - AMD 8 Cores, 32 Gb Ram, 240 Gb disk
   DedicatedAmd8Core32Ram240Disk,
+  /// CCX43 - AMD 16 Cores, 64 Gb Ram, 360 Gb disk
   DedicatedAmd16Core64Ram360Disk,
+  /// CCX53 - AMD 32 Cores, 128 Gb Ram, 600 Gb disk
   DedicatedAmd32Core128Ram600Disk,
+  /// CCX63 - AMD 48 Cores, 192 Gb Ram, 960 Gb disk
   DedicatedAmd48Core192Ram960Disk,
 }
 
diff --git a/client/core/ts/src/types.ts b/client/core/ts/src/types.ts
index ac5060763..1c4372bee 100644
--- a/client/core/ts/src/types.ts
+++ b/client/core/ts/src/types.ts
@@ -3974,25 +3974,43 @@ export enum HetznerDatacenter {
 }
 
 export enum HetznerServerType {
-	SharedIntel1Core2Ram20Disk = "SharedIntel1Core2Ram20Disk",
+	/** CPX11 - AMD 2 Cores, 2 Gb Ram, 40 Gb disk */
 	SharedAmd2Core2Ram40Disk = "SharedAmd2Core2Ram40Disk",
+	/** CAX11 - Arm 2 Cores, 4 Gb Ram, 40 Gb disk */
 	SharedArm2Core4Ram40Disk = "SharedArm2Core4Ram40Disk",
+	/** CX22 - Intel 2 Cores, 4 Gb Ram, 40 Gb disk */
 	SharedIntel2Core4Ram40Disk = "SharedIntel2Core4Ram40Disk",
+	/** CPX21 - AMD 3 Cores, 4 Gb Ram, 80 Gb disk */
 	SharedAmd3Core4Ram80Disk = "SharedAmd3Core4Ram80Disk",
+	/** CAX21 - Arm 4 Cores, 8 Gb Ram, 80 Gb disk */
 	SharedArm4Core8Ram80Disk = "SharedArm4Core8Ram80Disk",
-	SharedIntel2Core8Ram80Disk = "SharedIntel2Core8Ram80Disk",
+	/** CX32 - Intel 4 Cores, 8 Gb Ram, 80 Gb disk */
+	SharedIntel4Core8Ram80Disk = "SharedIntel4Core8Ram80Disk",
+	/** CPX31 - AMD 4 Cores, 8 Gb Ram, 160 Gb disk */
 	SharedAmd4Core8Ram160Disk = "SharedAmd4Core8Ram160Disk",
+	/** CAX31 - Arm 8 Cores, 16 Gb Ram, 160 Gb disk */
 	SharedArm8Core16Ram160Disk = "SharedArm8Core16Ram160Disk",
-	SharedIntel4Core16Ram160Disk = "SharedIntel4Core16Ram160Disk",
+	/** CX42 - Intel 8 Cores, 16 Gb Ram, 160 Gb disk */
+	SharedIntel8Core16Ram160Disk = "SharedIntel8Core16Ram160Disk",
+	/** CPX41 - AMD 8 Cores, 16 Gb Ram, 240 Gb disk */
 	SharedAmd8Core16Ram240Disk = "SharedAmd8Core16Ram240Disk",
+	/** CAX41 - Arm 16 Cores, 32 Gb Ram, 320 Gb disk */
 	SharedArm16Core32Ram320Disk = "SharedArm16Core32Ram320Disk",
-	SharedIntel8Core32Ram240Disk = "SharedIntel8Core32Ram240Disk",
+	/** CX52 - Intel 16 Cores, 32 Gb Ram, 320 Gb disk */
+	SharedIntel16Core32Ram320Disk = "SharedIntel16Core32Ram320Disk",
+	/** CPX51 - AMD 16 Cores, 32 Gb Ram, 360 Gb disk */
 	SharedAmd16Core32Ram360Disk = "SharedAmd16Core32Ram360Disk",
+	/** CCX13 - AMD 2 Cores, 8 Gb Ram, 80 Gb disk */
 	DedicatedAmd2Core8Ram80Disk = "DedicatedAmd2Core8Ram80Disk",
+	/** CCX23 - AMD 4 Cores, 16 Gb Ram, 160 Gb disk */
 	DedicatedAmd4Core16Ram160Disk = "DedicatedAmd4Core16Ram160Disk",
+	/** CCX33 - AMD 8 Cores, 32 Gb Ram, 240 Gb disk */
 	DedicatedAmd8Core32Ram240Disk = "DedicatedAmd8Core32Ram240Disk",
+	/** CCX43 - AMD 16 Cores, 64 Gb Ram, 360 Gb disk */
 	DedicatedAmd16Core64Ram360Disk = "DedicatedAmd16Core64Ram360Disk",
+	/** CCX53 - AMD 32 Cores, 128 Gb Ram, 600 Gb disk */
 	DedicatedAmd32Core128Ram600Disk = "DedicatedAmd32Core128Ram600Disk",
+	/** CCX63 - AMD 48 Cores, 192 Gb Ram, 960 Gb disk */
 	DedicatedAmd48Core192Ram960Disk = "DedicatedAmd48Core192Ram960Disk",
 }