diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44a42b51c..6cb36b524 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,11 @@ nav_order: 1
 <!-- Always keep the following header in place: -->
 <!-- ## [MAJOR.MINOR.PATCH] - YYYY-MM-DD -->
 
+## [MAJOR.MINOR.PATCH] - YYYY-MM-DD
+
+- Remove `aiven_valkey` from beta resources
+- Remove `aiven_valkey_user` from beta resources
+
 ## [4.25.0] - 2024-09-17
 
 - Fix `aiven_kafka_connector`: increase create polling timeout
diff --git a/docs/data-sources/valkey.md b/docs/data-sources/valkey.md
index cdefac041..8825ce04e 100644
--- a/docs/data-sources/valkey.md
+++ b/docs/data-sources/valkey.md
@@ -4,16 +4,11 @@ page_title: "aiven_valkey Data Source - terraform-provider-aiven"
 subcategory: ""
 description: |-
   Gets information about an Aiven for Valkey service.
-  This resource is in the beta stage and may change without notice. Set
-  the PROVIDER_AIVEN_ENABLE_BETA environment variable to use the resource.
 ---
 
 # aiven_valkey (Data Source)
 
-Gets information about an Aiven for Valkey service. 
-
-**This resource is in the beta stage and may change without notice.** Set
-the `PROVIDER_AIVEN_ENABLE_BETA` environment variable to use the resource.
+Gets information about an Aiven for Valkey service.
 
 ## Example Usage
 
diff --git a/docs/data-sources/valkey_user.md b/docs/data-sources/valkey_user.md
index 3703752a5..85facc00f 100644
--- a/docs/data-sources/valkey_user.md
+++ b/docs/data-sources/valkey_user.md
@@ -4,16 +4,11 @@ page_title: "aiven_valkey_user Data Source - terraform-provider-aiven"
 subcategory: ""
 description: |-
   The Valkey User data source provides information about the existing Aiven for Valkey user.
-  This resource is in the beta stage and may change without notice. Set
-  the PROVIDER_AIVEN_ENABLE_BETA environment variable to use the resource.
 ---
 
 # aiven_valkey_user (Data Source)
 
-The Valkey User data source provides information about the existing Aiven for Valkey user. 
-
-**This resource is in the beta stage and may change without notice.** Set
-the `PROVIDER_AIVEN_ENABLE_BETA` environment variable to use the resource.
+The Valkey User data source provides information about the existing Aiven for Valkey user.
 
 
 
diff --git a/docs/resources/valkey.md b/docs/resources/valkey.md
index 3a53349bb..bd51cd1fe 100644
--- a/docs/resources/valkey.md
+++ b/docs/resources/valkey.md
@@ -4,16 +4,11 @@ page_title: "aiven_valkey Resource - terraform-provider-aiven"
 subcategory: ""
 description: |-
   Creates and manages an Aiven for Valkey https://aiven.io/docs/products/valkey service.
-  This resource is in the beta stage and may change without notice. Set
-  the PROVIDER_AIVEN_ENABLE_BETA environment variable to use the resource.
 ---
 
 # aiven_valkey (Resource)
 
-Creates and manages an [Aiven for Valkey](https://aiven.io/docs/products/valkey) service. 
-
-**This resource is in the beta stage and may change without notice.** Set
-the `PROVIDER_AIVEN_ENABLE_BETA` environment variable to use the resource.
+Creates and manages an [Aiven for Valkey](https://aiven.io/docs/products/valkey) service.
 
 ## Example Usage
 
diff --git a/docs/resources/valkey_user.md b/docs/resources/valkey_user.md
index 4c9a15ff0..7d3665e8b 100644
--- a/docs/resources/valkey_user.md
+++ b/docs/resources/valkey_user.md
@@ -4,16 +4,11 @@ page_title: "aiven_valkey_user Resource - terraform-provider-aiven"
 subcategory: ""
 description: |-
   Creates and manages an Aiven for Valkey https://aiven.io/docs/products/valkey user.
-  This resource is in the beta stage and may change without notice. Set
-  the PROVIDER_AIVEN_ENABLE_BETA environment variable to use the resource.
 ---
 
 # aiven_valkey_user (Resource)
 
-Creates and manages an [Aiven for Valkey](https://aiven.io/docs/products/valkey) user. 
-
-**This resource is in the beta stage and may change without notice.** Set
-the `PROVIDER_AIVEN_ENABLE_BETA` environment variable to use the resource.
+Creates and manages an [Aiven for Valkey](https://aiven.io/docs/products/valkey) user.
 
 
 
diff --git a/internal/sdkprovider/provider/provider.go b/internal/sdkprovider/provider/provider.go
index 1e1fff84a..386ee86b1 100644
--- a/internal/sdkprovider/provider/provider.go
+++ b/internal/sdkprovider/provider/provider.go
@@ -278,15 +278,11 @@ func Provider(version string) (*schema.Provider, error) {
 	// Adds "beta" warning to the description
 	betaResources := []string{
 		"aiven_thanos",
-		"aiven_valkey",
-		"aiven_valkey_user",
 		"aiven_organization_permission",
 	}
 
 	betaDataSources := []string{
 		"aiven_thanos",
-		"aiven_valkey",
-		"aiven_valkey_user",
 	}
 
 	missing := append(