diff --git a/pkg/resources/api_authentication_integration_with_client_credentials.go b/pkg/resources/api_authentication_integration_with_client_credentials.go
index 45e25ca0cd8..d027493ab25 100644
--- a/pkg/resources/api_authentication_integration_with_client_credentials.go
+++ b/pkg/resources/api_authentication_integration_with_client_credentials.go
@@ -146,7 +146,7 @@ func ReadContextApiAuthenticationIntegrationWithClientCredentials(withExternalCh
 		}); err != nil {
 			return diag.FromErr(err)
 		}
-		if err := setStateToValuesFromConfig(d, warehouseSchema, []string{
+		if err := setStateToValuesFromConfig(d, apiAuthClientCredentialsSchema, []string{
 			"oauth_allowed_scopes",
 		}); err != nil {
 			return diag.FromErr(err)
diff --git a/pkg/resources/api_authentication_integration_with_jwt_bearer.go b/pkg/resources/api_authentication_integration_with_jwt_bearer.go
index df54815f894..edc612f56d9 100644
--- a/pkg/resources/api_authentication_integration_with_jwt_bearer.go
+++ b/pkg/resources/api_authentication_integration_with_jwt_bearer.go
@@ -162,7 +162,7 @@ func ReadContextApiAuthenticationIntegrationWithJwtBearer(withExternalChangesMar
 		}); err != nil {
 			return diag.FromErr(err)
 		}
-		if err := setStateToValuesFromConfig(d, warehouseSchema, []string{
+		if err := setStateToValuesFromConfig(d, apiAuthJwtBearerSchema, []string{
 			"oauth_authorization_endpoint",
 			"oauth_assertion_issuer",
 		}); err != nil {
diff --git a/pkg/resources/external_oauth_integration.go b/pkg/resources/external_oauth_integration.go
index 2434dc284c6..37c91ded280 100644
--- a/pkg/resources/external_oauth_integration.go
+++ b/pkg/resources/external_oauth_integration.go
@@ -21,7 +21,7 @@ import (
 
 var privilegedRoles = []string{"ACCOUNTADMIN", "ORGADMIN", "SECURITYADMIN"}
 
-var oauthExternalIntegrationSchema = map[string]*schema.Schema{
+var externalOauthIntegrationSchema = map[string]*schema.Schema{
 	"name": {
 		Type:        schema.TypeString,
 		Required:    true,
@@ -159,7 +159,7 @@ func ExternalOauthIntegration() *schema.Resource {
 		DeleteContext: DeleteContextExternalOauthIntegration,
 		Description:   "Resource used to manage external oauth security integration objects. For more information, check [security integrations documentation](https://docs.snowflake.com/en/sql-reference/sql/create-security-integration-oauth-external).",
 
-		Schema: oauthExternalIntegrationSchema,
+		Schema: externalOauthIntegrationSchema,
 		CustomizeDiff: customdiff.All(
 			ForceNewIfChangeToEmptyString("external_oauth_rsa_public_key"),
 			ForceNewIfChangeToEmptyString("external_oauth_rsa_public_key_2"),
@@ -521,7 +521,7 @@ func ReadContextExternalOauthIntegration(withExternalChangesMarking bool) schema
 			}
 		}
 
-		if err = setStateToValuesFromConfig(d, warehouseSchema, []string{
+		if err = setStateToValuesFromConfig(d, externalOauthIntegrationSchema, []string{
 			"external_oauth_jws_keys_url",
 			"external_oauth_rsa_public_key",
 			"external_oauth_rsa_public_key_2",
diff --git a/pkg/resources/scim_integration.go b/pkg/resources/scim_integration.go
index d1841453612..ba78acbeac8 100644
--- a/pkg/resources/scim_integration.go
+++ b/pkg/resources/scim_integration.go
@@ -331,7 +331,7 @@ func ReadContextSCIMIntegration(withExternalChangesMarking bool) schema.ReadCont
 			}
 		}
 
-		if err = setStateToValuesFromConfig(d, saml2IntegrationSchema, []string{
+		if err = setStateToValuesFromConfig(d, scimIntegrationSchema, []string{
 			"network_policy",
 			"sync_password",
 		}); err != nil {