diff --git a/docs/stackit_logme_instance_create.md b/docs/stackit_logme_instance_create.md
index e24b6e54..b5cf0ac3 100644
--- a/docs/stackit_logme_instance_create.md
+++ b/docs/stackit_logme_instance_create.md
@@ -14,7 +14,7 @@ stackit logme instance create [flags]
 
 ```
   Create an LogMe instance with name "my-instance" and specify plan by name and version
-  $ stackit logme instance create --name my-instance --plan-name stackit-logme-1.2.10-replica --version 3.10
+  $ stackit logme instance create --name my-instance --plan-name stackit-logme2-1.2.50-replica --version 2
 
   Create an LogMe instance with name "my-instance" and specify plan by ID
   $ stackit logme instance create --name my-instance --plan-id xxx
diff --git a/docs/stackit_logme_instance_update.md b/docs/stackit_logme_instance_update.md
index 6283eeb9..db7221c6 100644
--- a/docs/stackit_logme_instance_update.md
+++ b/docs/stackit_logme_instance_update.md
@@ -14,7 +14,7 @@ stackit logme instance update INSTANCE_ID [flags]
 
 ```
   Update the plan of an LogMe instance with ID "xxx"
-  $ stackit logme instance update xxx --plan-id xxx
+  $ stackit logme instance update xxx --plan-id yyy
 
   Update the range of IPs allowed to access an LogMe instance with ID "xxx"
   $ stackit logme instance update xxx --acl 192.168.1.0/24
diff --git a/docs/stackit_mariadb_instance_create.md b/docs/stackit_mariadb_instance_create.md
index 6c67ed0c..38a58a77 100644
--- a/docs/stackit_mariadb_instance_create.md
+++ b/docs/stackit_mariadb_instance_create.md
@@ -14,7 +14,7 @@ stackit mariadb instance create [flags]
 
 ```
   Create an MariaDB instance with name "my-instance" and specify plan by name and version
-  $ stackit mariadb instance create --name my-instance --plan-name stackit-mariadb-1.2.10-replica --version 3.10
+  $ stackit mariadb instance create --name my-instance --plan-name stackit-mariadb-1.2.10-replica --version 10.6
 
   Create an MariaDB instance with name "my-instance" and specify plan by ID
   $ stackit mariadb instance create --name my-instance --plan-id xxx
diff --git a/docs/stackit_mariadb_instance_update.md b/docs/stackit_mariadb_instance_update.md
index b8e0f0c8..155ec864 100644
--- a/docs/stackit_mariadb_instance_update.md
+++ b/docs/stackit_mariadb_instance_update.md
@@ -14,7 +14,7 @@ stackit mariadb instance update INSTANCE_ID [flags]
 
 ```
   Update the plan of an MariaDB instance with ID "xxx"
-  $ stackit mariadb instance update xxx --plan-id xxx
+  $ stackit mariadb instance update xxx --plan-id yyy
 
   Update the range of IPs allowed to access an MariaDB instance with ID "xxx"
   $ stackit mariadb instance update xxx --acl 192.168.1.0/24
diff --git a/docs/stackit_opensearch_instance_update.md b/docs/stackit_opensearch_instance_update.md
index 2e49c76f..2847cdf4 100644
--- a/docs/stackit_opensearch_instance_update.md
+++ b/docs/stackit_opensearch_instance_update.md
@@ -14,7 +14,7 @@ stackit opensearch instance update INSTANCE_ID [flags]
 
 ```
   Update the plan of an OpenSearch instance with ID "xxx"
-  $ stackit opensearch instance update xxx --plan-id xxx
+  $ stackit opensearch instance update xxx --plan-id yyy
 
   Update the range of IPs allowed to access an OpenSearch instance with ID "xxx"
   $ stackit opensearch instance update xxx --acl 192.168.1.0/24
diff --git a/docs/stackit_postgresflex_instance_create.md b/docs/stackit_postgresflex_instance_create.md
index 0078f9e1..5a9f24fc 100644
--- a/docs/stackit_postgresflex_instance_create.md
+++ b/docs/stackit_postgresflex_instance_create.md
@@ -35,7 +35,7 @@ stackit postgresflex instance create [flags]
       --ram int                  Amount of RAM (in GB)
       --storage-class string     Storage class (default "premium-perf2-stackit")
       --storage-size int         Storage size (in GB) (default 10)
-      --type string              Instance type, one of ["Replica" "Single"] (default "Replica")
+      --type string              Instance type, one of ["Single" "Replica"] (default "Replica")
       --version string           PostgreSQL version. Defaults to the latest version available
 ```
 
diff --git a/docs/stackit_rabbitmq_instance_update.md b/docs/stackit_rabbitmq_instance_update.md
index f962420a..fe122827 100644
--- a/docs/stackit_rabbitmq_instance_update.md
+++ b/docs/stackit_rabbitmq_instance_update.md
@@ -14,7 +14,7 @@ stackit rabbitmq instance update INSTANCE_ID [flags]
 
 ```
   Update the plan of an RabbitMQ instance with ID "xxx"
-  $ stackit rabbitmq instance update xxx --plan-id xxx
+  $ stackit rabbitmq instance update xxx --plan-id yyy
 
   Update the range of IPs allowed to access an RabbitMQ instance with ID "xxx"
   $ stackit rabbitmq instance update xxx --acl 192.168.1.0/24
diff --git a/docs/stackit_redis_instance_update.md b/docs/stackit_redis_instance_update.md
index aa2e3685..8af6b3fc 100644
--- a/docs/stackit_redis_instance_update.md
+++ b/docs/stackit_redis_instance_update.md
@@ -14,7 +14,7 @@ stackit redis instance update INSTANCE_ID [flags]
 
 ```
   Update the plan of a Redis instance with ID "xxx"
-  $ stackit redis instance update xxx --plan-id xxx
+  $ stackit redis instance update xxx --plan-id yyy
 
   Update the range of IPs allowed to access a Redis instance with ID "xxx"
   $ stackit redis instance update xxx --acl 192.168.1.0/24
diff --git a/internal/cmd/logme/instance/create/create.go b/internal/cmd/logme/instance/create/create.go
index dec01fa7..169a7237 100644
--- a/internal/cmd/logme/instance/create/create.go
+++ b/internal/cmd/logme/instance/create/create.go
@@ -64,7 +64,7 @@ func NewCmd() *cobra.Command {
 		Example: examples.Build(
 			examples.NewExample(
 				`Create an LogMe instance with name "my-instance" and specify plan by name and version`,
-				"$ stackit logme instance create --name my-instance --plan-name stackit-logme-1.2.10-replica --version 3.10"),
+				"$ stackit logme instance create --name my-instance --plan-name stackit-logme2-1.2.50-replica --version 2"),
 			examples.NewExample(
 				`Create an LogMe instance with name "my-instance" and specify plan by ID`,
 				"$ stackit logme instance create --name my-instance --plan-id xxx"),
diff --git a/internal/cmd/logme/instance/update/update.go b/internal/cmd/logme/instance/update/update.go
index 0d8808a8..0961d8b8 100644
--- a/internal/cmd/logme/instance/update/update.go
+++ b/internal/cmd/logme/instance/update/update.go
@@ -65,7 +65,7 @@ func NewCmd() *cobra.Command {
 		Example: examples.Build(
 			examples.NewExample(
 				`Update the plan of an LogMe instance with ID "xxx"`,
-				"$ stackit logme instance update xxx --plan-id xxx"),
+				"$ stackit logme instance update xxx --plan-id yyy"),
 			examples.NewExample(
 				`Update the range of IPs allowed to access an LogMe instance with ID "xxx"`,
 				"$ stackit logme instance update xxx --acl 192.168.1.0/24"),
diff --git a/internal/cmd/mariadb/instance/create/create.go b/internal/cmd/mariadb/instance/create/create.go
index 226e631a..7f1b8fca 100644
--- a/internal/cmd/mariadb/instance/create/create.go
+++ b/internal/cmd/mariadb/instance/create/create.go
@@ -64,7 +64,7 @@ func NewCmd() *cobra.Command {
 		Example: examples.Build(
 			examples.NewExample(
 				`Create an MariaDB instance with name "my-instance" and specify plan by name and version`,
-				"$ stackit mariadb instance create --name my-instance --plan-name stackit-mariadb-1.2.10-replica --version 3.10"),
+				"$ stackit mariadb instance create --name my-instance --plan-name stackit-mariadb-1.2.10-replica --version 10.6"),
 			examples.NewExample(
 				`Create an MariaDB instance with name "my-instance" and specify plan by ID`,
 				"$ stackit mariadb instance create --name my-instance --plan-id xxx"),
diff --git a/internal/cmd/mariadb/instance/update/update.go b/internal/cmd/mariadb/instance/update/update.go
index b6f62e3a..16e94a0d 100644
--- a/internal/cmd/mariadb/instance/update/update.go
+++ b/internal/cmd/mariadb/instance/update/update.go
@@ -65,7 +65,7 @@ func NewCmd() *cobra.Command {
 		Example: examples.Build(
 			examples.NewExample(
 				`Update the plan of an MariaDB instance with ID "xxx"`,
-				"$ stackit mariadb instance update xxx --plan-id xxx"),
+				"$ stackit mariadb instance update xxx --plan-id yyy"),
 			examples.NewExample(
 				`Update the range of IPs allowed to access an MariaDB instance with ID "xxx"`,
 				"$ stackit mariadb instance update xxx --acl 192.168.1.0/24"),
diff --git a/internal/cmd/opensearch/instance/update/update.go b/internal/cmd/opensearch/instance/update/update.go
index c432147a..9271f911 100644
--- a/internal/cmd/opensearch/instance/update/update.go
+++ b/internal/cmd/opensearch/instance/update/update.go
@@ -65,7 +65,7 @@ func NewCmd() *cobra.Command {
 		Example: examples.Build(
 			examples.NewExample(
 				`Update the plan of an OpenSearch instance with ID "xxx"`,
-				"$ stackit opensearch instance update xxx --plan-id xxx"),
+				"$ stackit opensearch instance update xxx --plan-id yyy"),
 			examples.NewExample(
 				`Update the range of IPs allowed to access an OpenSearch instance with ID "xxx"`,
 				"$ stackit opensearch instance update xxx --acl 192.168.1.0/24"),
diff --git a/internal/cmd/rabbitmq/instance/update/update.go b/internal/cmd/rabbitmq/instance/update/update.go
index c8bcd408..3ccd3138 100644
--- a/internal/cmd/rabbitmq/instance/update/update.go
+++ b/internal/cmd/rabbitmq/instance/update/update.go
@@ -65,7 +65,7 @@ func NewCmd() *cobra.Command {
 		Example: examples.Build(
 			examples.NewExample(
 				`Update the plan of an RabbitMQ instance with ID "xxx"`,
-				"$ stackit rabbitmq instance update xxx --plan-id xxx"),
+				"$ stackit rabbitmq instance update xxx --plan-id yyy"),
 			examples.NewExample(
 				`Update the range of IPs allowed to access an RabbitMQ instance with ID "xxx"`,
 				"$ stackit rabbitmq instance update xxx --acl 192.168.1.0/24"),
diff --git a/internal/cmd/redis/instance/update/update.go b/internal/cmd/redis/instance/update/update.go
index a499e1a3..797bb018 100644
--- a/internal/cmd/redis/instance/update/update.go
+++ b/internal/cmd/redis/instance/update/update.go
@@ -65,7 +65,7 @@ func NewCmd() *cobra.Command {
 		Example: examples.Build(
 			examples.NewExample(
 				`Update the plan of a Redis instance with ID "xxx"`,
-				"$ stackit redis instance update xxx --plan-id xxx"),
+				"$ stackit redis instance update xxx --plan-id yyy"),
 			examples.NewExample(
 				`Update the range of IPs allowed to access a Redis instance with ID "xxx"`,
 				"$ stackit redis instance update xxx --acl 192.168.1.0/24"),
diff --git a/internal/pkg/config/config.go b/internal/pkg/config/config.go
index f7f5ca66..a9f93e8d 100644
--- a/internal/pkg/config/config.go
+++ b/internal/pkg/config/config.go
@@ -48,6 +48,8 @@ var ConfigKeys = []string{
 	SessionTimeLimitKey,
 
 	DNSCustomEndpointKey,
+	LogMeCustomEndpointKey,
+	MariaDBCustomEndpointKey,
 	OpenSearchCustomEndpointKey,
 	PostgresFlexCustomEndpointKey,
 	ResourceManagerEndpointKey,