diff --git a/docs/data-sources/mongodbflex_instance.md b/docs/data-sources/mongodbflex_instance.md
index 6035684f..7a5419cb 100644
--- a/docs/data-sources/mongodbflex_instance.md
+++ b/docs/data-sources/mongodbflex_instance.md
@@ -16,7 +16,6 @@ MongoDB Flex instance data source schema. Must have a `region` specified in the
 data "stackit_mongodbflex_instance" "example" {
   project_id  = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
   instance_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-  user_id     = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
 }
 ```
 
diff --git a/docs/data-sources/mongodbflex_user.md b/docs/data-sources/mongodbflex_user.md
index b0c6ed26..326e65bb 100644
--- a/docs/data-sources/mongodbflex_user.md
+++ b/docs/data-sources/mongodbflex_user.md
@@ -13,9 +13,10 @@ MongoDB Flex user data source schema. Must have a `region` specified in the prov
 ## Example Usage
 
 ```terraform
-data "stackit_mongodbflex_instance" "example" {
+data "stackit_mongodbflex_user" "example" {
   project_id  = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
   instance_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  user_id     = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
 }
 ```
 
diff --git a/examples/data-sources/stackit_mongodbflex_instance/data-source.tf b/examples/data-sources/stackit_mongodbflex_instance/data-source.tf
index bae8590a..cc6d6148 100644
--- a/examples/data-sources/stackit_mongodbflex_instance/data-source.tf
+++ b/examples/data-sources/stackit_mongodbflex_instance/data-source.tf
@@ -1,5 +1,4 @@
 data "stackit_mongodbflex_instance" "example" {
   project_id  = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
   instance_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-  user_id     = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
 }
diff --git a/examples/data-sources/stackit_mongodbflex_user/data-source.tf b/examples/data-sources/stackit_mongodbflex_user/data-source.tf
index cc6d6148..2bbdfc92 100644
--- a/examples/data-sources/stackit_mongodbflex_user/data-source.tf
+++ b/examples/data-sources/stackit_mongodbflex_user/data-source.tf
@@ -1,4 +1,5 @@
-data "stackit_mongodbflex_instance" "example" {
+data "stackit_mongodbflex_user" "example" {
   project_id  = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
   instance_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  user_id     = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
 }
diff --git a/go.mod b/go.mod
index 7ba49497..689a2d64 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/mux v1.8.1
-	github.com/hashicorp/terraform-plugin-framework v1.6.0
+	github.com/hashicorp/terraform-plugin-framework v1.6.1
 	github.com/hashicorp/terraform-plugin-framework-validators v0.12.0
 	github.com/hashicorp/terraform-plugin-go v0.22.0
 	github.com/hashicorp/terraform-plugin-log v0.9.0
diff --git a/go.sum b/go.sum
index 31d7c196..33842ab5 100644
--- a/go.sum
+++ b/go.sum
@@ -79,8 +79,8 @@ github.com/hashicorp/terraform-exec v0.20.0 h1:DIZnPsqzPGuUnq6cH8jWcPunBfY+C+M8J
 github.com/hashicorp/terraform-exec v0.20.0/go.mod h1:ckKGkJWbsNqFKV1itgMnE0hY9IYf1HoiekpuN0eWoDw=
 github.com/hashicorp/terraform-json v0.21.0 h1:9NQxbLNqPbEMze+S6+YluEdXgJmhQykRyRNd+zTI05U=
 github.com/hashicorp/terraform-json v0.21.0/go.mod h1:qdeBs11ovMzo5puhrRibdD6d2Dq6TyE/28JiU4tIQxk=
-github.com/hashicorp/terraform-plugin-framework v1.6.0 h1:hMPWoCiNGR+yzoDlXtZ/meGlUOCn8r1OFuPG84MkhWg=
-github.com/hashicorp/terraform-plugin-framework v1.6.0/go.mod h1:QRG6J+m5QBJum+lzKi0Ci2CB8a/xflS3T/aWoz8WD4Y=
+github.com/hashicorp/terraform-plugin-framework v1.6.1 h1:hw2XrmUu8d8jVL52ekxim2IqDc+2Kpekn21xZANARLU=
+github.com/hashicorp/terraform-plugin-framework v1.6.1/go.mod h1:aJI+n/hBPhz1J+77GdgNfk5svW12y7fmtxe/5L5IuwI=
 github.com/hashicorp/terraform-plugin-framework-validators v0.12.0 h1:HOjBuMbOEzl7snOdOoUfE2Jgeto6JOjLVQ39Ls2nksc=
 github.com/hashicorp/terraform-plugin-framework-validators v0.12.0/go.mod h1:jfHGE/gzjxYz6XoUwi/aYiiKrJDeutQNUtGQXkaHklg=
 github.com/hashicorp/terraform-plugin-go v0.22.0 h1:1OS1Jk5mO0f5hrziWJGXXIxBrMe2j/B8E+DVGw43Xmc=