diff --git a/.changelog/20561.txt b/.changelog/20561.txt
new file mode 100644
index 00000000000..c2941fd3956
--- /dev/null
+++ b/.changelog/20561.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_eks_identity_provider_config: Increase Create and Delete timeouts to 40 minutes
+```
\ No newline at end of file
diff --git a/aws/resource_aws_eks_identity_provider_config.go b/aws/resource_aws_eks_identity_provider_config.go
index 452fee75d96..88419bf7aae 100644
--- a/aws/resource_aws_eks_identity_provider_config.go
+++ b/aws/resource_aws_eks_identity_provider_config.go
@@ -22,10 +22,10 @@ import (
 
 func resourceAwsEksIdentityProviderConfig() *schema.Resource {
 	return &schema.Resource{
-		CreateContext: resourceAwsEksIdentityProviderConfigCreate,
-		ReadContext:   resourceAwsEksIdentityProviderConfigRead,
-		UpdateContext: resourceAwsEksIdentityProviderConfigUpdate,
-		DeleteContext: resourceAwsEksIdentityProviderConfigDelete,
+		CreateWithoutTimeout: resourceAwsEksIdentityProviderConfigCreate,
+		ReadWithoutTimeout:   resourceAwsEksIdentityProviderConfigRead,
+		UpdateWithoutTimeout: resourceAwsEksIdentityProviderConfigUpdate,
+		DeleteWithoutTimeout: resourceAwsEksIdentityProviderConfigDelete,
 
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
@@ -34,8 +34,8 @@ func resourceAwsEksIdentityProviderConfig() *schema.Resource {
 		CustomizeDiff: SetTagsDiff,
 
 		Timeouts: &schema.ResourceTimeout{
-			Create: schema.DefaultTimeout(25 * time.Minute),
-			Delete: schema.DefaultTimeout(25 * time.Minute),
+			Create: schema.DefaultTimeout(40 * time.Minute),
+			Delete: schema.DefaultTimeout(40 * time.Minute),
 		},
 
 		Schema: map[string]*schema.Schema{
diff --git a/website/docs/r/eks_identity_provider_config.html.markdown b/website/docs/r/eks_identity_provider_config.html.markdown
index ffe45bc08f5..58b8491fee9 100644
--- a/website/docs/r/eks_identity_provider_config.html.markdown
+++ b/website/docs/r/eks_identity_provider_config.html.markdown
@@ -56,8 +56,8 @@ In addition to all arguments above, the following attributes are exported:
 
 `aws_eks_identity_provider_config` provides the following [Timeouts](https://www.terraform.io/docs/configuration/blocks/resources/syntax.html#operation-timeouts) configuration options:
 
-* `create` - (Default `25 minutes`) How long to wait for the EKS Identity Provider Configuration to be associated.
-* `delete` - (Default `25 minutes`) How long to wait for the EKS Identity Provider Configuration to be disassociated.
+* `create` - (Default `40 minutes`) How long to wait for the EKS Identity Provider Configuration to be associated.
+* `delete` - (Default `40 minutes`) How long to wait for the EKS Identity Provider Configuration to be disassociated.
 
 ## Import