diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c781f0cc3..3e5882907 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -98,7 +98,7 @@ jobs:
           - '8.7.1'
           - '8.8.2'
           - '8.9.2'
-          - '8.10.2'
+          - '8.10.3'
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3aa4c405..b6796647a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## [Unreleased]
 
+### Added
+- Switch to Terraform [protocol version 6](https://developer.hashicorp.com/terraform/plugin/terraform-plugin-protocol#protocol-version-6) that is compatible with Terraform CLI version 1.0 and later.
+
 ## [0.10.0] - 2023-11-02
 
 ### Added
diff --git a/Makefile b/Makefile
index 0b6e3e75e..80f6d88f6 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ SWAGGER_VERSION ?= 8.7
 
 GOVERSION ?= 1.20
 
-STACK_VERSION ?= 8.9.0
+STACK_VERSION ?= 8.10.3
 
 ELASTICSEARCH_NAME ?= terraform-elasticstack-es
 ELASTICSEARCH_ENDPOINTS ?= http://$(ELASTICSEARCH_NAME):9200
diff --git a/docs/guides/elasticstack-and-cloud.md b/docs/guides/elasticstack-and-cloud.md
index 4a8c103b9..40f48a805 100644
--- a/docs/guides/elasticstack-and-cloud.md
+++ b/docs/guides/elasticstack-and-cloud.md
@@ -54,8 +54,13 @@ resource "ec_deployment" "monitoring" {
   version                = data.ec_stack.latest.version
   deployment_template_id = var.deployment_template_id
 
-  elasticsearch {}
-  kibana {}
+  elasticsearch = {
+    hot = {
+      autoscaling = {}
+    }
+  }
+
+  kibana = {}
 }
 
 resource "ec_deployment" "cluster" {
@@ -64,13 +69,18 @@ resource "ec_deployment" "cluster" {
   version                = data.ec_stack.latest.version
   deployment_template_id = var.deployment_template_id
 
-  observability {
+  observability = {
     deployment_id = ec_deployment.monitoring.id
     ref_id        = ec_deployment.monitoring.elasticsearch[0].ref_id
   }
 
-  elasticsearch {}
-  kibana {}
+  elasticsearch = {
+    hot = {
+      autoscaling = {}
+    }
+  }
+
+  kibana = {}
 }
 
 provider "elasticstack" {
diff --git a/docs/index.md b/docs/index.md
index d302157d7..66f6cd34c 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -13,6 +13,7 @@ The Elasticstack provider provides the resources to interact with Elastic stack
 It is recommended to setup at least minimum security, https://www.elastic.co/guide/en/elasticsearch/reference/current/security-minimal-setup.html
 in order to interact with the Elasticsearch and be able to use the provider's full capabilities
 
+The provider uses Terraform [protocol version 6](https://developer.hashicorp.com/terraform/plugin/terraform-plugin-protocol#protocol-version-6) that is compatible with Terraform CLI version 1.0 and later.
 
 ## Authentication
 
@@ -31,6 +32,16 @@ The following methods are supported:
 Default static credentials can be provided by adding the `username`, `password` and `endpoints` in the `elasticsearch` block:
 
 ```terraform
+terraform {
+  required_version = ">= 1.0.0"
+  required_providers {
+    elasticstack = {
+      source  = "elastic/elasticstack"
+      version = "~>0.9"
+    }
+  }
+}
+
 provider "elasticstack" {
   elasticsearch {
     username  = "elastic"
@@ -104,6 +115,16 @@ See docs related to the specific resources.
 ## Example Usage
 
 ```terraform
+terraform {
+  required_version = ">= 1.0.0"
+  required_providers {
+    elasticstack = {
+      source  = "elastic/elasticstack"
+      version = "~>0.9"
+    }
+  }
+}
+
 provider "elasticstack" {
   elasticsearch {
     username  = "elastic"
diff --git a/examples/cloud/deployment.tf b/examples/cloud/deployment.tf
index dc915fee3..a98625082 100644
--- a/examples/cloud/deployment.tf
+++ b/examples/cloud/deployment.tf
@@ -11,8 +11,13 @@ resource "ec_deployment" "monitoring" {
   version                = data.ec_stack.latest.version
   deployment_template_id = var.deployment_template_id
 
-  elasticsearch {}
-  kibana {}
+  elasticsearch = {
+    hot = {
+      autoscaling = {}
+    }
+  }
+
+  kibana = {}
 }
 
 resource "ec_deployment" "cluster" {
@@ -21,13 +26,18 @@ resource "ec_deployment" "cluster" {
   version                = data.ec_stack.latest.version
   deployment_template_id = var.deployment_template_id
 
-  observability {
+  observability = {
     deployment_id = ec_deployment.monitoring.id
     ref_id        = ec_deployment.monitoring.elasticsearch[0].ref_id
   }
 
-  elasticsearch {}
-  kibana {}
+  elasticsearch = {
+    hot = {
+      autoscaling = {}
+    }
+  }
+
+  kibana = {}
 }
 
 provider "elasticstack" {
diff --git a/examples/provider/provider.tf b/examples/provider/provider.tf
index a0bbb7e1a..b7f202e1e 100644
--- a/examples/provider/provider.tf
+++ b/examples/provider/provider.tf
@@ -1,3 +1,13 @@
+terraform {
+  required_version = ">= 1.0.0"
+  required_providers {
+    elasticstack = {
+      source  = "elastic/elasticstack"
+      version = "~>0.9"
+    }
+  }
+}
+
 provider "elasticstack" {
   elasticsearch {
     username  = "elastic"
diff --git a/internal/acctest/acctest.go b/internal/acctest/acctest.go
index 09939cddc..f1827bd4f 100644
--- a/internal/acctest/acctest.go
+++ b/internal/acctest/acctest.go
@@ -7,18 +7,18 @@ import (
 	"testing"
 
 	"github.com/elastic/terraform-provider-elasticstack/provider"
-	"github.com/hashicorp/terraform-plugin-go/tfprotov5"
+	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
 )
 
-var Providers map[string]func() (tfprotov5.ProviderServer, error)
+var Providers map[string]func() (tfprotov6.ProviderServer, error)
 
 func init() {
-	providerServerFactory, err := provider.ProtoV5ProviderServerFactory(context.Background(), "dev")
+	providerServerFactory, err := provider.ProtoV6ProviderServerFactory(context.Background(), "dev")
 	if err != nil {
 		log.Fatal(err)
 	}
-	Providers = map[string]func() (tfprotov5.ProviderServer, error){
-		"elasticstack": func() (tfprotov5.ProviderServer, error) {
+	Providers = map[string]func() (tfprotov6.ProviderServer, error){
+		"elasticstack": func() (tfprotov6.ProviderServer, error) {
 			return providerServerFactory(), nil
 		},
 	}
diff --git a/internal/elasticsearch/cluster/cluster_info_data_source_test.go b/internal/elasticsearch/cluster/cluster_info_data_source_test.go
index 8eb9aa6e0..80b256bab 100644
--- a/internal/elasticsearch/cluster/cluster_info_data_source_test.go
+++ b/internal/elasticsearch/cluster/cluster_info_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceClusterInfo(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceSecurityUser,
diff --git a/internal/elasticsearch/cluster/script_test.go b/internal/elasticsearch/cluster/script_test.go
index 3846179fb..6c8170f53 100644
--- a/internal/elasticsearch/cluster/script_test.go
+++ b/internal/elasticsearch/cluster/script_test.go
@@ -17,7 +17,7 @@ func TestAccResourceScript(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkScriptDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccScriptCreate(scriptID),
@@ -47,7 +47,7 @@ func TestAccResourceScriptSearchTemplate(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkScriptDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccSearchTemplateCreate(scriptID),
diff --git a/internal/elasticsearch/cluster/settings_test.go b/internal/elasticsearch/cluster/settings_test.go
index 292084e3a..1c604e60c 100644
--- a/internal/elasticsearch/cluster/settings_test.go
+++ b/internal/elasticsearch/cluster/settings_test.go
@@ -15,7 +15,7 @@ func TestAccResourceClusterSettings(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceClusterSettingsDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceClusterSettingsCreate(),
diff --git a/internal/elasticsearch/cluster/slm_test.go b/internal/elasticsearch/cluster/slm_test.go
index e2e67ab23..ba1c46d38 100644
--- a/internal/elasticsearch/cluster/slm_test.go
+++ b/internal/elasticsearch/cluster/slm_test.go
@@ -18,7 +18,7 @@ func TestAccResourceSLM(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkSlmDestroy(name),
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccSlmCreate(name),
diff --git a/internal/elasticsearch/cluster/snapshot_repository_data_source_test.go b/internal/elasticsearch/cluster/snapshot_repository_data_source_test.go
index 79e68d64c..50878fa43 100644
--- a/internal/elasticsearch/cluster/snapshot_repository_data_source_test.go
+++ b/internal/elasticsearch/cluster/snapshot_repository_data_source_test.go
@@ -14,7 +14,7 @@ func TestAccDataSourceSnapRepoFs(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceSnapRepoFs(name),
@@ -59,7 +59,7 @@ func TestAccDataSourceSnapRepoUrl(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceSnapRepoUrl(name),
diff --git a/internal/elasticsearch/cluster/snapshot_repository_test.go b/internal/elasticsearch/cluster/snapshot_repository_test.go
index 2ef0cde57..6deb49db6 100644
--- a/internal/elasticsearch/cluster/snapshot_repository_test.go
+++ b/internal/elasticsearch/cluster/snapshot_repository_test.go
@@ -18,7 +18,7 @@ func TestAccResourceSnapRepoFs(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkRepoDestroy(name),
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccRepoFsCreate(name),
@@ -51,7 +51,7 @@ func TestAccResourceSnapRepoUrl(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkRepoDestroy(name),
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccRepoUrlCreate(name),
diff --git a/internal/elasticsearch/enrich/policy_data_source_test.go b/internal/elasticsearch/enrich/policy_data_source_test.go
index ee1b983dc..be51d1094 100644
--- a/internal/elasticsearch/enrich/policy_data_source_test.go
+++ b/internal/elasticsearch/enrich/policy_data_source_test.go
@@ -13,7 +13,7 @@ func TestAccDataSourceEnrichPolicy(t *testing.T) {
 	name := sdkacctest.RandStringFromCharSet(10, sdkacctest.CharSetAlphaNum)
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccEnrichPolicyDataSource(name),
diff --git a/internal/elasticsearch/enrich/policy_test.go b/internal/elasticsearch/enrich/policy_test.go
index 491fc49c6..a33a6e3bb 100644
--- a/internal/elasticsearch/enrich/policy_test.go
+++ b/internal/elasticsearch/enrich/policy_test.go
@@ -18,7 +18,7 @@ func TestAccResourceEnrichPolicy(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkEnrichPolicyDestroy(name),
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccEnrichPolicy(name),
diff --git a/internal/elasticsearch/index/component_template_test.go b/internal/elasticsearch/index/component_template_test.go
index 6e82c4290..70dfb3ed2 100644
--- a/internal/elasticsearch/index/component_template_test.go
+++ b/internal/elasticsearch/index/component_template_test.go
@@ -18,7 +18,7 @@ func TestAccResourceComponentTemplate(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceComponentTemplateDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceComponentTemplateCreate(templateName),
diff --git a/internal/elasticsearch/index/data_stream_test.go b/internal/elasticsearch/index/data_stream_test.go
index 321e6ec42..c9e352059 100644
--- a/internal/elasticsearch/index/data_stream_test.go
+++ b/internal/elasticsearch/index/data_stream_test.go
@@ -18,7 +18,7 @@ func TestAccResourceDataStream(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceDataStreamDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceDataStreamCreate(dsName),
diff --git a/internal/elasticsearch/index/ilm_test.go b/internal/elasticsearch/index/ilm_test.go
index 40614f042..d30e0a5c0 100644
--- a/internal/elasticsearch/index/ilm_test.go
+++ b/internal/elasticsearch/index/ilm_test.go
@@ -23,7 +23,7 @@ func TestAccResourceILM(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceILMDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceILMCreate(policyName),
@@ -86,7 +86,7 @@ func TestAccResourceILMRolloverConditions(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceILMDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(index.RolloverMinConditionsMinSupportedVersion),
diff --git a/internal/elasticsearch/index/index_test.go b/internal/elasticsearch/index/index_test.go
index 5896656c2..b0e34ccae 100644
--- a/internal/elasticsearch/index/index_test.go
+++ b/internal/elasticsearch/index/index_test.go
@@ -20,7 +20,7 @@ func TestAccResourceIndex(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceIndexDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceIndexCreate(indexName),
@@ -58,7 +58,7 @@ func TestAccResourceIndexSettings(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceIndexDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceIndexSettingsCreate(indexName),
@@ -109,7 +109,7 @@ func TestAccResourceIndexSettingsMigration(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceIndexDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceIndexSettingsMigrationCreate(indexName),
@@ -138,7 +138,7 @@ func TestAccResourceIndexSettingsConflict(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceIndexDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config:      testAccResourceIndexSettingsConflict(indexName),
@@ -154,7 +154,7 @@ func TestAccResourceIndexRemovingField(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceIndexDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			// Confirm removing field doesn't produce recreate by using prevent_destroy
 			{Config: testAccResourceIndexRemovingFieldCreate(indexName)},
diff --git a/internal/elasticsearch/index/template_test.go b/internal/elasticsearch/index/template_test.go
index 2452d6f6b..c3f0cd657 100644
--- a/internal/elasticsearch/index/template_test.go
+++ b/internal/elasticsearch/index/template_test.go
@@ -18,7 +18,7 @@ func TestAccResourceIndexTemplate(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceIndexTemplateDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceIndexTemplateCreate(templateName),
diff --git a/internal/elasticsearch/ingest/pipeline_test.go b/internal/elasticsearch/ingest/pipeline_test.go
index 30fa2537d..6dac7fa5e 100644
--- a/internal/elasticsearch/ingest/pipeline_test.go
+++ b/internal/elasticsearch/ingest/pipeline_test.go
@@ -17,7 +17,7 @@ func TestAccResourceIngestPipeline(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceIngestPipelineDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceIngestPipelineCreate(pipelineName),
diff --git a/internal/elasticsearch/ingest/processor_append_data_source_test.go b/internal/elasticsearch/ingest/processor_append_data_source_test.go
index a4bcc94cf..4dbb95cda 100644
--- a/internal/elasticsearch/ingest/processor_append_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_append_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorAppend(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorAppend,
diff --git a/internal/elasticsearch/ingest/processor_bytes_data_source_test.go b/internal/elasticsearch/ingest/processor_bytes_data_source_test.go
index 6ae516d35..aacc9cb93 100644
--- a/internal/elasticsearch/ingest/processor_bytes_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_bytes_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorBytes(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorBytes,
diff --git a/internal/elasticsearch/ingest/processor_circle_data_source_test.go b/internal/elasticsearch/ingest/processor_circle_data_source_test.go
index 86dfb8cd2..7c3afdb02 100644
--- a/internal/elasticsearch/ingest/processor_circle_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_circle_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorCircle(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorCircle,
diff --git a/internal/elasticsearch/ingest/processor_community_id_data_source_test.go b/internal/elasticsearch/ingest/processor_community_id_data_source_test.go
index 69dee84c5..3593d04cc 100644
--- a/internal/elasticsearch/ingest/processor_community_id_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_community_id_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorCommunityId(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorCommunityId,
diff --git a/internal/elasticsearch/ingest/processor_convert_data_source_test.go b/internal/elasticsearch/ingest/processor_convert_data_source_test.go
index 01ce3477f..821cb4ccc 100644
--- a/internal/elasticsearch/ingest/processor_convert_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_convert_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorConvert(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorConvert,
diff --git a/internal/elasticsearch/ingest/processor_csv_data_source_test.go b/internal/elasticsearch/ingest/processor_csv_data_source_test.go
index bceab7b82..b71862845 100644
--- a/internal/elasticsearch/ingest/processor_csv_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_csv_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorCSV(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorCSV,
diff --git a/internal/elasticsearch/ingest/processor_date_data_source_test.go b/internal/elasticsearch/ingest/processor_date_data_source_test.go
index 1f5750509..eeec82f95 100644
--- a/internal/elasticsearch/ingest/processor_date_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_date_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorDate(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorDate,
diff --git a/internal/elasticsearch/ingest/processor_date_index_name_data_source_test.go b/internal/elasticsearch/ingest/processor_date_index_name_data_source_test.go
index d9a2cb7af..e1445cb27 100644
--- a/internal/elasticsearch/ingest/processor_date_index_name_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_date_index_name_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorDateIndexName(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorDateIndexName,
diff --git a/internal/elasticsearch/ingest/processor_dissect_data_source_test.go b/internal/elasticsearch/ingest/processor_dissect_data_source_test.go
index 2480058d7..34d94cc0e 100644
--- a/internal/elasticsearch/ingest/processor_dissect_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_dissect_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorDissect(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorDissect,
diff --git a/internal/elasticsearch/ingest/processor_dot_expander_data_source_test.go b/internal/elasticsearch/ingest/processor_dot_expander_data_source_test.go
index cf231179e..6062a90c0 100644
--- a/internal/elasticsearch/ingest/processor_dot_expander_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_dot_expander_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorDotExpander(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorDotExpander,
diff --git a/internal/elasticsearch/ingest/processor_drop_data_source_test.go b/internal/elasticsearch/ingest/processor_drop_data_source_test.go
index 7f0355848..52f388856 100644
--- a/internal/elasticsearch/ingest/processor_drop_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_drop_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorDrop(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorDrop,
diff --git a/internal/elasticsearch/ingest/processor_fail_data_source_test.go b/internal/elasticsearch/ingest/processor_fail_data_source_test.go
index fb2d22e63..58c9d56c2 100644
--- a/internal/elasticsearch/ingest/processor_fail_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_fail_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorFail(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorFail,
diff --git a/internal/elasticsearch/ingest/processor_fingerprint_data_source_test.go b/internal/elasticsearch/ingest/processor_fingerprint_data_source_test.go
index 75b92b888..9430db472 100644
--- a/internal/elasticsearch/ingest/processor_fingerprint_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_fingerprint_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorFingerprint(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorFingerprint,
diff --git a/internal/elasticsearch/ingest/processor_foreach_data_source_test.go b/internal/elasticsearch/ingest/processor_foreach_data_source_test.go
index 8ea928167..39e29ac28 100644
--- a/internal/elasticsearch/ingest/processor_foreach_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_foreach_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorForeach(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorForeach,
diff --git a/internal/elasticsearch/ingest/processor_geoip_data_source_test.go b/internal/elasticsearch/ingest/processor_geoip_data_source_test.go
index 46317f096..f1701116b 100644
--- a/internal/elasticsearch/ingest/processor_geoip_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_geoip_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorGeoip(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorGeoip,
diff --git a/internal/elasticsearch/ingest/processor_grok_data_source_test.go b/internal/elasticsearch/ingest/processor_grok_data_source_test.go
index 86258e4c7..a27f2dd10 100644
--- a/internal/elasticsearch/ingest/processor_grok_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_grok_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorGrok(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorGrok,
diff --git a/internal/elasticsearch/ingest/processor_gsub_data_source_test.go b/internal/elasticsearch/ingest/processor_gsub_data_source_test.go
index cb972b88e..3f67c93c1 100644
--- a/internal/elasticsearch/ingest/processor_gsub_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_gsub_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorGsub(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorGsub,
diff --git a/internal/elasticsearch/ingest/processor_html_strip_data_source_test.go b/internal/elasticsearch/ingest/processor_html_strip_data_source_test.go
index bbdb2a2b5..947d668e9 100644
--- a/internal/elasticsearch/ingest/processor_html_strip_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_html_strip_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorHtmlStrip(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorHtmlStrip,
diff --git a/internal/elasticsearch/ingest/processor_join_data_source_test.go b/internal/elasticsearch/ingest/processor_join_data_source_test.go
index 8039b041e..eaf305786 100644
--- a/internal/elasticsearch/ingest/processor_join_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_join_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorJoin(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorJoin,
diff --git a/internal/elasticsearch/ingest/processor_json_data_source_test.go b/internal/elasticsearch/ingest/processor_json_data_source_test.go
index 4800012c7..e2561bb2e 100644
--- a/internal/elasticsearch/ingest/processor_json_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_json_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorJson(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorJson,
diff --git a/internal/elasticsearch/ingest/processor_kv_data_source_test.go b/internal/elasticsearch/ingest/processor_kv_data_source_test.go
index 97694e797..e6a0b545c 100644
--- a/internal/elasticsearch/ingest/processor_kv_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_kv_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorKV(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorKV,
diff --git a/internal/elasticsearch/ingest/processor_lowercase_data_source_test.go b/internal/elasticsearch/ingest/processor_lowercase_data_source_test.go
index cdcf839fe..d3f1bef0e 100644
--- a/internal/elasticsearch/ingest/processor_lowercase_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_lowercase_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorLowercase(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorLowercase,
diff --git a/internal/elasticsearch/ingest/processor_network_direction_data_source_test.go b/internal/elasticsearch/ingest/processor_network_direction_data_source_test.go
index e9ec29570..9da8f33ba 100644
--- a/internal/elasticsearch/ingest/processor_network_direction_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_network_direction_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorNetworkDirection(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorNetworkDirection,
diff --git a/internal/elasticsearch/ingest/processor_pipeline_data_source_test.go b/internal/elasticsearch/ingest/processor_pipeline_data_source_test.go
index 341505f5d..5a18c6568 100644
--- a/internal/elasticsearch/ingest/processor_pipeline_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_pipeline_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorPipeline(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorPipeline,
diff --git a/internal/elasticsearch/ingest/processor_registered_domain_data_source_test.go b/internal/elasticsearch/ingest/processor_registered_domain_data_source_test.go
index beb0c5bf7..89824bc5b 100644
--- a/internal/elasticsearch/ingest/processor_registered_domain_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_registered_domain_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorRegisteredDomain(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorRegisteredDomain,
diff --git a/internal/elasticsearch/ingest/processor_remove_data_source_test.go b/internal/elasticsearch/ingest/processor_remove_data_source_test.go
index b6f1dd2d7..ee9383466 100644
--- a/internal/elasticsearch/ingest/processor_remove_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_remove_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorRemove(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorRemove,
diff --git a/internal/elasticsearch/ingest/processor_rename_data_source_test.go b/internal/elasticsearch/ingest/processor_rename_data_source_test.go
index 622e9250f..0f246c484 100644
--- a/internal/elasticsearch/ingest/processor_rename_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_rename_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorRename(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorRename,
diff --git a/internal/elasticsearch/ingest/processor_script_data_source_test.go b/internal/elasticsearch/ingest/processor_script_data_source_test.go
index 6abcf6b33..ca4973646 100644
--- a/internal/elasticsearch/ingest/processor_script_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_script_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorScript(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorScript,
diff --git a/internal/elasticsearch/ingest/processor_set_data_source_test.go b/internal/elasticsearch/ingest/processor_set_data_source_test.go
index 7836b12e1..221596685 100644
--- a/internal/elasticsearch/ingest/processor_set_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_set_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorSet(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorSet,
diff --git a/internal/elasticsearch/ingest/processor_set_security_user_data_source_test.go b/internal/elasticsearch/ingest/processor_set_security_user_data_source_test.go
index 6fe6a9036..a71da658a 100644
--- a/internal/elasticsearch/ingest/processor_set_security_user_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_set_security_user_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorSetSecurityUser(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorSetSecurityUser,
diff --git a/internal/elasticsearch/ingest/processor_sort_data_source_test.go b/internal/elasticsearch/ingest/processor_sort_data_source_test.go
index 12d06daca..59cc21db4 100644
--- a/internal/elasticsearch/ingest/processor_sort_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_sort_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorSort(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorSort,
diff --git a/internal/elasticsearch/ingest/processor_split_data_source_test.go b/internal/elasticsearch/ingest/processor_split_data_source_test.go
index fa170f21a..5de811a5c 100644
--- a/internal/elasticsearch/ingest/processor_split_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_split_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorSplit(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorSplit,
diff --git a/internal/elasticsearch/ingest/processor_trim_data_source_test.go b/internal/elasticsearch/ingest/processor_trim_data_source_test.go
index 759c2b782..5d8232846 100644
--- a/internal/elasticsearch/ingest/processor_trim_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_trim_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorTrim(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorTrim,
diff --git a/internal/elasticsearch/ingest/processor_uppercase_data_source_test.go b/internal/elasticsearch/ingest/processor_uppercase_data_source_test.go
index b08ddb2ad..afcfacaca 100644
--- a/internal/elasticsearch/ingest/processor_uppercase_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_uppercase_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorUppercase(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorUppercase,
diff --git a/internal/elasticsearch/ingest/processor_uri_parts_data_source_test.go b/internal/elasticsearch/ingest/processor_uri_parts_data_source_test.go
index ddb8c7d0b..63076128d 100644
--- a/internal/elasticsearch/ingest/processor_uri_parts_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_uri_parts_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorUriParts(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorUriParts,
diff --git a/internal/elasticsearch/ingest/processor_urldecode_data_source_test.go b/internal/elasticsearch/ingest/processor_urldecode_data_source_test.go
index 9a3534be4..e40687a19 100644
--- a/internal/elasticsearch/ingest/processor_urldecode_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_urldecode_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorUrldecode(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorUrldecode,
diff --git a/internal/elasticsearch/ingest/processor_user_agent_data_source_test.go b/internal/elasticsearch/ingest/processor_user_agent_data_source_test.go
index ff58cabc4..b9dde3701 100644
--- a/internal/elasticsearch/ingest/processor_user_agent_data_source_test.go
+++ b/internal/elasticsearch/ingest/processor_user_agent_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceIngestProcessorUserAgent(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceIngestProcessorUserAgent,
diff --git a/internal/elasticsearch/logstash/pipeline_test.go b/internal/elasticsearch/logstash/pipeline_test.go
index 37e73e6a0..61dc3f4cc 100644
--- a/internal/elasticsearch/logstash/pipeline_test.go
+++ b/internal/elasticsearch/logstash/pipeline_test.go
@@ -17,7 +17,7 @@ func TestResourceLogstashPipeline(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceLogstashPipelineDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceLogstashPipelineCreate(pipelineID),
diff --git a/internal/elasticsearch/security/api_key_test.go b/internal/elasticsearch/security/api_key_test.go
index 36030237b..5bac86911 100644
--- a/internal/elasticsearch/security/api_key_test.go
+++ b/internal/elasticsearch/security/api_key_test.go
@@ -24,7 +24,7 @@ func TestAccResourceSecuritApiKey(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceSecurityApiKeyDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(security.APIKeyMinVersion),
diff --git a/internal/elasticsearch/security/role_data_source_test.go b/internal/elasticsearch/security/role_data_source_test.go
index 62ce4b1c2..a08e8b11f 100644
--- a/internal/elasticsearch/security/role_data_source_test.go
+++ b/internal/elasticsearch/security/role_data_source_test.go
@@ -11,7 +11,7 @@ import (
 func TestAccDataSourceSecurityRole(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceSecurityRole,
diff --git a/internal/elasticsearch/security/role_mapping_data_source_test.go b/internal/elasticsearch/security/role_mapping_data_source_test.go
index 99e37056d..821df8146 100644
--- a/internal/elasticsearch/security/role_mapping_data_source_test.go
+++ b/internal/elasticsearch/security/role_mapping_data_source_test.go
@@ -11,7 +11,7 @@ import (
 func TestAccDataSourceSecurityRoleMapping(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceSecurityRoleMapping,
diff --git a/internal/elasticsearch/security/role_mapping_test.go b/internal/elasticsearch/security/role_mapping_test.go
index a3db5b792..c88b0df7c 100644
--- a/internal/elasticsearch/security/role_mapping_test.go
+++ b/internal/elasticsearch/security/role_mapping_test.go
@@ -18,7 +18,7 @@ func TestResourceRoleMapping(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceSecurityRoleMappingDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceSecurityRoleMappingCreate(roleMappingName),
diff --git a/internal/elasticsearch/security/role_test.go b/internal/elasticsearch/security/role_test.go
index a99da61db..4f6382d78 100644
--- a/internal/elasticsearch/security/role_test.go
+++ b/internal/elasticsearch/security/role_test.go
@@ -18,7 +18,7 @@ func TestAccResourceSecurityRole(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceSecurityRoleDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceSecurityRoleCreate(roleName),
diff --git a/internal/elasticsearch/security/system_user_test.go b/internal/elasticsearch/security/system_user_test.go
index c95deb3d5..fef75b269 100644
--- a/internal/elasticsearch/security/system_user_test.go
+++ b/internal/elasticsearch/security/system_user_test.go
@@ -11,7 +11,7 @@ import (
 func TestAccResourceSecuritySystemUser(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceSecuritySystemUserCreate,
@@ -34,7 +34,7 @@ func TestAccResourceSecuritySystemUser(t *testing.T) {
 func TestAccResourceSecuritySystemUserNotFound(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config:      testAccResourceSecuritySystemUserNotFound,
diff --git a/internal/elasticsearch/security/user_data_source_test.go b/internal/elasticsearch/security/user_data_source_test.go
index 5f0490c0a..58d16c1d4 100644
--- a/internal/elasticsearch/security/user_data_source_test.go
+++ b/internal/elasticsearch/security/user_data_source_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccDataSourceSecurityUser(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceSecurityUser,
diff --git a/internal/elasticsearch/security/user_test.go b/internal/elasticsearch/security/user_test.go
index 95d631ca4..ea61944ac 100644
--- a/internal/elasticsearch/security/user_test.go
+++ b/internal/elasticsearch/security/user_test.go
@@ -22,7 +22,7 @@ func TestAccResourceSecurityUser(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceSecurityUserDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceSecurityUserCreate(username),
@@ -48,7 +48,7 @@ func TestAccImportedUserDoesNotResetPassword(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceSecurityUserDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceSecurityUserUpdateNoPassword(username),
diff --git a/internal/elasticsearch/transform/transform_test.go b/internal/elasticsearch/transform/transform_test.go
index 0de736470..2482bf1b3 100644
--- a/internal/elasticsearch/transform/transform_test.go
+++ b/internal/elasticsearch/transform/transform_test.go
@@ -17,7 +17,7 @@ func TestAccResourceTransformWithPivot(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceTransformDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceTransformWithPivotCreate(transformNamePivot),
@@ -62,7 +62,7 @@ func TestAccResourceTransformWithLatest(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceTransformDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceTransformWithLatestCreate(transformNameLatest),
@@ -87,7 +87,7 @@ func TestAccResourceTransformNoDefer(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceTransformDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceTransformNoDeferCreate(transformName, indexName),
diff --git a/internal/elasticsearch/watcher/watch_test.go b/internal/elasticsearch/watcher/watch_test.go
index e9d8b92cf..8736d44ae 100644
--- a/internal/elasticsearch/watcher/watch_test.go
+++ b/internal/elasticsearch/watcher/watch_test.go
@@ -17,7 +17,7 @@ func TestResourceWatch(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceWatchDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceWatchCreate(watchID),
diff --git a/internal/fleet/agent_policy_resource_test.go b/internal/fleet/agent_policy_resource_test.go
index 534019399..cd08bc8d9 100644
--- a/internal/fleet/agent_policy_resource_test.go
+++ b/internal/fleet/agent_policy_resource_test.go
@@ -23,7 +23,7 @@ func TestAccResourceAgentPolicy(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceAgentPolicyDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minVersionAgentPolicy),
@@ -59,7 +59,7 @@ func TestAccResourceAgentPolicySkipDestroy(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceAgentPolicySkipDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minVersionAgentPolicy),
diff --git a/internal/fleet/enrollment_tokens_data_source_test.go b/internal/fleet/enrollment_tokens_data_source_test.go
index e8211f500..d7c1616d6 100644
--- a/internal/fleet/enrollment_tokens_data_source_test.go
+++ b/internal/fleet/enrollment_tokens_data_source_test.go
@@ -14,7 +14,7 @@ var minVersionEnrollmentTokens = version.Must(version.NewVersion("8.6.0"))
 func TestAccDataSourceEnrollmentTokens(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		CheckDestroy:             checkResourceAgentPolicyDestroy,
 		Steps: []resource.TestStep{
 			{
diff --git a/internal/fleet/fleet_server_host_resource_test.go b/internal/fleet/fleet_server_host_resource_test.go
index c1c5d6fd6..579f98ab1 100644
--- a/internal/fleet/fleet_server_host_resource_test.go
+++ b/internal/fleet/fleet_server_host_resource_test.go
@@ -23,7 +23,7 @@ func TestAccResourceFleetServerHost(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceFleetServerHostDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minVersionFleetServerHost),
diff --git a/internal/fleet/output_resource_test.go b/internal/fleet/output_resource_test.go
index 583c55579..9dd71a368 100644
--- a/internal/fleet/output_resource_test.go
+++ b/internal/fleet/output_resource_test.go
@@ -23,7 +23,7 @@ func TestAccResourceOutputElasticsearch(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceOutputDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minVersionOutput),
@@ -59,7 +59,7 @@ func TestAccResourceOutputLogstash(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceOutputDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minVersionOutput),
diff --git a/internal/fleet/package_policy_resource_test.go b/internal/fleet/package_policy_resource_test.go
index 71f81e222..89702e4a7 100644
--- a/internal/fleet/package_policy_resource_test.go
+++ b/internal/fleet/package_policy_resource_test.go
@@ -24,7 +24,7 @@ func TestAccResourcePackagePolicy(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourcePackagePolicyDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minVersionPackagePolicy),
diff --git a/internal/fleet/package_resource_test.go b/internal/fleet/package_resource_test.go
index 1563d855b..a6900941a 100644
--- a/internal/fleet/package_resource_test.go
+++ b/internal/fleet/package_resource_test.go
@@ -29,7 +29,7 @@ resource "elasticstack_fleet_package" "test_package" {
 func TestAccResourcePackage(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minVersionPackage),
diff --git a/internal/kibana/alerting_test.go b/internal/kibana/alerting_test.go
index 12f2e790e..e225ab39c 100644
--- a/internal/kibana/alerting_test.go
+++ b/internal/kibana/alerting_test.go
@@ -23,7 +23,7 @@ func TestAccResourceAlertingRule(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceAlertingRuleDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minSupportedVersion),
diff --git a/internal/kibana/connector_test.go b/internal/kibana/connector_test.go
index e73cfb867..0c187553b 100644
--- a/internal/kibana/connector_test.go
+++ b/internal/kibana/connector_test.go
@@ -81,7 +81,7 @@ func TestAccResourceKibanaConnectorCasesWebhook(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceKibanaConnectorDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minSupportedVersion),
@@ -179,7 +179,7 @@ func TestAccResourceKibanaConnectorEmail(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceKibanaConnectorDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minSupportedVersion),
@@ -254,7 +254,7 @@ func TestAccResourceKibanaConnectorIndex(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceKibanaConnectorDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minSupportedVersion),
@@ -332,7 +332,7 @@ func TestAccResourceKibanaConnectorJira(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceKibanaConnectorDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minSupportedVersion),
@@ -412,7 +412,7 @@ func TestAccResourceKibanaConnectorOpsgenie(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceKibanaConnectorDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minSupportedVersion),
@@ -488,7 +488,7 @@ func TestAccResourceKibanaConnectorPagerduty(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceKibanaConnectorDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minSupportedVersion),
@@ -566,7 +566,7 @@ func TestAccResourceKibanaConnectorResilient(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceKibanaConnectorDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minSupportedVersion),
@@ -634,7 +634,7 @@ func TestAccResourceKibanaConnectorServerLog(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceKibanaConnectorDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minSupportedVersion),
@@ -705,7 +705,7 @@ func TestAccResourceKibanaConnectorServicenow(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceKibanaConnectorDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minSupportedVersion),
@@ -791,7 +791,7 @@ func TestAccResourceKibanaConnectorServicenowItom(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceKibanaConnectorDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minSupportedVersion),
@@ -871,7 +871,7 @@ func TestAccResourceKibanaConnectorServicenowSir(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceKibanaConnectorDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minSupportedVersion),
@@ -949,7 +949,7 @@ func TestAccResourceKibanaConnectorSlack(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceKibanaConnectorDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minSupportedVersion),
@@ -1015,7 +1015,7 @@ func TestAccResourceKibanaConnectorSlackApi(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceKibanaConnectorDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minSupportedVersion),
@@ -1107,7 +1107,7 @@ func TestAccResourceKibanaConnectorSwimlane(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceKibanaConnectorDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minSupportedVersion),
@@ -1189,7 +1189,7 @@ func TestAccResourceKibanaConnectorTeams(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceKibanaConnectorDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minSupportedVersion),
@@ -1263,7 +1263,7 @@ func TestAccResourceKibanaConnectorTines(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceKibanaConnectorDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minSupportedVersion),
@@ -1341,7 +1341,7 @@ func TestAccResourceKibanaConnectorWebhook(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceKibanaConnectorDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minSupportedVersion),
@@ -1415,7 +1415,7 @@ func TestAccResourceKibanaConnectorXmatters(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceKibanaConnectorDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minSupportedVersion),
diff --git a/internal/kibana/import_saved_objects/acc_test.go b/internal/kibana/import_saved_objects/acc_test.go
index f8a39df6f..d2f89b608 100644
--- a/internal/kibana/import_saved_objects/acc_test.go
+++ b/internal/kibana/import_saved_objects/acc_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccResourceImportSavedObjects(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceImportSavedObjects(),
diff --git a/internal/kibana/role_data_source_test.go b/internal/kibana/role_data_source_test.go
index 3afaeeb5a..fb237c2bc 100644
--- a/internal/kibana/role_data_source_test.go
+++ b/internal/kibana/role_data_source_test.go
@@ -11,7 +11,7 @@ import (
 func TestAccDataSourceKibanaSecurityRole(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceSecurityRole,
diff --git a/internal/kibana/role_test.go b/internal/kibana/role_test.go
index 7e8d3178f..55e04ae57 100644
--- a/internal/kibana/role_test.go
+++ b/internal/kibana/role_test.go
@@ -19,7 +19,7 @@ func TestAccResourceKibanaSecurityRole(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceSecurityRoleDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceSecurityRoleCreate(roleName),
diff --git a/internal/kibana/slo_test.go b/internal/kibana/slo_test.go
index e51de1b67..fb60506c7 100644
--- a/internal/kibana/slo_test.go
+++ b/internal/kibana/slo_test.go
@@ -24,7 +24,7 @@ func TestAccResourceSlo(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceSloDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(version.Must(version.NewSemver("8.9.0"))),
@@ -179,7 +179,7 @@ func TestAccResourceSloErrors(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc:    versionutils.CheckIfVersionIsUnsupported(version.Must(version.NewSemver("8.9.0"))),
diff --git a/internal/kibana/space_test.go b/internal/kibana/space_test.go
index 16a4d25da..b87918668 100644
--- a/internal/kibana/space_test.go
+++ b/internal/kibana/space_test.go
@@ -17,7 +17,7 @@ func TestAccResourceSpace(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
 		CheckDestroy:             checkResourceSpaceDestroy,
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccResourceSpaceCreate(spaceId),
diff --git a/main.go b/main.go
index 2a5b13662..cce099c26 100644
--- a/main.go
+++ b/main.go
@@ -6,7 +6,7 @@ import (
 	"log"
 
 	"github.com/elastic/terraform-provider-elasticstack/provider"
-	"github.com/hashicorp/terraform-plugin-go/tfprotov5/tf5server"
+	"github.com/hashicorp/terraform-plugin-go/tfprotov6/tf6server"
 )
 
 //go:generate terraform fmt -recursive ./examples/
@@ -26,17 +26,17 @@ func main() {
 	flag.BoolVar(&debugMode, "debug", false, "set to true to run the provider with support for debuggers like delve")
 	flag.Parse()
 
-	serverFactory, err := provider.ProtoV5ProviderServerFactory(context.Background(), version)
+	serverFactory, err := provider.ProtoV6ProviderServerFactory(context.Background(), version)
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	var serveOpts []tf5server.ServeOpt
+	var serveOpts []tf6server.ServeOpt
 	if debugMode {
-		serveOpts = append(serveOpts, tf5server.WithManagedDebug())
+		serveOpts = append(serveOpts, tf6server.WithManagedDebug())
 	}
 
-	err = tf5server.Serve(
+	err = tf6server.Serve(
 		"registry.terraform.io/elastic/elasticstack",
 		serverFactory,
 		serveOpts...,
diff --git a/provider/factory.go b/provider/factory.go
index 1c3745f7d..ae2b19321 100644
--- a/provider/factory.go
+++ b/provider/factory.go
@@ -5,21 +5,32 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-framework/providerserver"
-	"github.com/hashicorp/terraform-plugin-go/tfprotov5"
-	"github.com/hashicorp/terraform-plugin-mux/tf5muxserver"
+	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
+	"github.com/hashicorp/terraform-plugin-mux/tf5to6server"
+	"github.com/hashicorp/terraform-plugin-mux/tf6muxserver"
 )
 
-// ProtoV5ProviderServerFactory returns a muxed terraform-plugin-go protocol v5 provider factory function.
-func ProtoV5ProviderServerFactory(ctx context.Context, version string) (func() tfprotov5.ProviderServer, error) {
+func ProtoV6ProviderServerFactory(ctx context.Context, version string) (func() tfprotov6.ProviderServer, error) {
 	sdkv2Provider := New(version)
-	frameworkProvider := providerserver.NewProtocol5(NewFrameworkProvider(version))
+	frameworkProvider := providerserver.NewProtocol6(NewFrameworkProvider(version))
 
-	servers := []func() tfprotov5.ProviderServer{
-		frameworkProvider,
+	upgradedSdkProvider, err := tf5to6server.UpgradeServer(
+		context.Background(),
 		sdkv2Provider.GRPCProvider,
+	)
+
+	if err != nil {
+		return nil, fmt.Errorf("cannot upgrade the SDKv2 provider to protocol 6: %w", err)
+	}
+
+	servers := []func() tfprotov6.ProviderServer{
+		frameworkProvider,
+		func() tfprotov6.ProviderServer {
+			return upgradedSdkProvider
+		},
 	}
 
-	muxServer, err := tf5muxserver.NewMuxServer(ctx, servers...)
+	muxServer, err := tf6muxserver.NewMuxServer(ctx, servers...)
 	if err != nil {
 		return nil, fmt.Errorf("initialize mux server: %w", err)
 	}
diff --git a/provider/factory_test.go b/provider/factory_test.go
index 568360e58..05cb90f29 100644
--- a/provider/factory_test.go
+++ b/provider/factory_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-go/tfprotov5"
+	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
@@ -20,10 +20,10 @@ func TestMuxServer(t *testing.T) {
 	  }
 	`
 	resource.Test(t, resource.TestCase{
-		ProtoV5ProviderFactories: map[string]func() (tfprotov5.ProviderServer, error){
-			"elasticstack": func() (tfprotov5.ProviderServer, error) {
+		ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
+			"elasticstack": func() (tfprotov6.ProviderServer, error) {
 				version := "acceptance_test"
-				server, err := ProtoV5ProviderServerFactory(context.Background(), version)
+				server, err := ProtoV6ProviderServerFactory(context.Background(), version)
 				if err != nil {
 					return nil, err
 				}
diff --git a/provider/provider_test.go b/provider/provider_test.go
index 7ab338c8b..e778a88f4 100644
--- a/provider/provider_test.go
+++ b/provider/provider_test.go
@@ -27,7 +27,7 @@ func TestElasticsearchAPIKeyConnection(t *testing.T) {
 	apiKeyName := sdkacctest.RandStringFromCharSet(10, sdkacctest.CharSetAlphaNum)
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(security.APIKeyMinVersion),
@@ -45,7 +45,7 @@ func TestFleetConfiguration(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minVersionForFleet),
@@ -63,7 +63,7 @@ func TestKibanaConfiguration(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV5ProviderFactories: acctest.Providers,
+		ProtoV6ProviderFactories: acctest.Providers,
 		Steps: []resource.TestStep{
 			{
 				Config: testKibanaConfiguration(envConfig),
diff --git a/templates/index.md.tmpl b/templates/index.md.tmpl
index d18d3a2bd..6eb749862 100644
--- a/templates/index.md.tmpl
+++ b/templates/index.md.tmpl
@@ -13,6 +13,7 @@ The Elasticstack provider provides the resources to interact with Elastic stack
 It is recommended to setup at least minimum security, https://www.elastic.co/guide/en/elasticsearch/reference/current/security-minimal-setup.html
 in order to interact with the Elasticsearch and be able to use the provider's full capabilities
 
+The provider uses Terraform [protocol version 6](https://developer.hashicorp.com/terraform/plugin/terraform-plugin-protocol#protocol-version-6) that is compatible with Terraform CLI version 1.0 and later.
 
 ## Authentication