diff --git a/spinifex/handlers/ec2/igw/service_impl.go b/spinifex/handlers/ec2/igw/service_impl.go
index 52b7f7a17..7223a83fb 100644
--- a/spinifex/handlers/ec2/igw/service_impl.go
+++ b/spinifex/handlers/ec2/igw/service_impl.go
@@ -291,7 +291,7 @@ func (s *IGWServiceImpl) AttachInternetGateway(input *ec2.AttachInternetGatewayI
 	}
 
 	record.VpcId = vpcID
-	record.State = "available"
+	record.State = "attached"
 
 	data, err := json.Marshal(record)
 	if err != nil {
@@ -349,7 +349,7 @@ func (s *IGWServiceImpl) DetachInternetGateway(input *ec2.DetachInternetGatewayI
 	}
 
 	record.VpcId = ""
-	record.State = "available"
+	record.State = "detached"
 
 	data, err := json.Marshal(record)
 	if err != nil {
diff --git a/spinifex/handlers/ec2/igw/service_impl_test.go b/spinifex/handlers/ec2/igw/service_impl_test.go
index b01e55887..ef21eef3a 100644
--- a/spinifex/handlers/ec2/igw/service_impl_test.go
+++ b/spinifex/handlers/ec2/igw/service_impl_test.go
@@ -191,7 +191,7 @@ func TestAttachInternetGateway(t *testing.T) {
 	require.Len(t, desc.InternetGateways, 1)
 	require.Len(t, desc.InternetGateways[0].Attachments, 1)
 	assert.Equal(t, "vpc-test123", *desc.InternetGateways[0].Attachments[0].VpcId)
-	assert.Equal(t, "available", *desc.InternetGateways[0].Attachments[0].State)
+	assert.Equal(t, "attached", *desc.InternetGateways[0].Attachments[0].State)
 }
 
 func TestAttachInternetGateway_NotFound(t *testing.T) {
@@ -527,7 +527,7 @@ func TestDescribeInternetGateways_FilterByAttachmentState(t *testing.T) {
 
 	desc, err := svc.DescribeInternetGateways(&ec2.DescribeInternetGatewaysInput{
 		Filters: []*ec2.Filter{
-			{Name: aws.String("attachment.state"), Values: []*string{aws.String("available")}},
+			{Name: aws.String("attachment.state"), Values: []*string{aws.String("attached")}},
 		},
 	}, testAccountID)
 	require.NoError(t, err)