diff --git a/cyral/internal/policyset/datasource.go b/cyral/internal/policyset/datasource.go
index 43b074da..b0c2f2ae 100644
--- a/cyral/internal/policyset/datasource.go
+++ b/cyral/internal/policyset/datasource.go
@@ -11,7 +11,7 @@ import (
 	"github.com/cyralinc/terraform-provider-cyral/cyral/core/types/resourcetype"
 )
 
-var dsContextHandler = core.DefaultContextHandler{
+var dsContextHandler = core.HTTPContextHandler{
 	ResourceName:                 dataSourceName,
 	ResourceType:                 resourcetype.DataSource,
 	SchemaWriterFactoryGetMethod: func(_ *schema.ResourceData) core.SchemaWriter { return &PolicySet{} },
diff --git a/cyral/internal/policyset/resource.go b/cyral/internal/policyset/resource.go
index 4ea20f0c..0031a663 100644
--- a/cyral/internal/policyset/resource.go
+++ b/cyral/internal/policyset/resource.go
@@ -12,7 +12,7 @@ import (
 	"github.com/cyralinc/terraform-provider-cyral/cyral/core/types/resourcetype"
 )
 
-var resourceContextHandler = core.DefaultContextHandler{
+var resourceContextHandler = core.HTTPContextHandler{
 	ResourceName:                 resourceName,
 	ResourceType:                 resourcetype.Resource,
 	SchemaReaderFactory:          func() core.SchemaReader { return &PolicySet{} },