diff --git a/aws/arcgis-enterprise-core/workflows/enterprise-ingress-aws-destroy.yaml b/aws/arcgis-enterprise-core/workflows/enterprise-ingress-aws-destroy.yaml
index 6a8b1a2..9aac03b 100644
--- a/aws/arcgis-enterprise-core/workflows/enterprise-ingress-aws-destroy.yaml
+++ b/aws/arcgis-enterprise-core/workflows/enterprise-ingress-aws-destroy.yaml
@@ -47,6 +47,6 @@ jobs:
       id: terraform-destroy
       run: |
         ENTERPRISE_ID=$(jq -r '.enterprise_id' $CONFIG_FILE)
-        DEPLOYMENT_ID=$(jq -r '.deployment_id' $CONFIG_FILE)
-        terraform init -backend-config="bucket=$TERRAFORM_BACKEND_S3_BUCKET" -backend-config="key=$ENTERPRISE_ID/aws/$DEPLOYMENT_ID/ingress.tfstate" -backend-config="region=$TF_VAR_aws_region" 
+        INGRESS_ID=$(jq -r '.ingress_id' $CONFIG_FILE)
+        terraform init -backend-config="bucket=$TERRAFORM_BACKEND_S3_BUCKET" -backend-config="key=$ENTERPRISE_ID/aws/$INGRESS_ID/ingress.tfstate" -backend-config="region=$TF_VAR_aws_region" 
         terraform destroy -var-file $CONFIG_FILE -auto-approve
diff --git a/aws/arcgis-enterprise-core/workflows/enterprise-ingress-aws.yaml b/aws/arcgis-enterprise-core/workflows/enterprise-ingress-aws.yaml
index caa5882..2e18c8a 100644
--- a/aws/arcgis-enterprise-core/workflows/enterprise-ingress-aws.yaml
+++ b/aws/arcgis-enterprise-core/workflows/enterprise-ingress-aws.yaml
@@ -56,8 +56,8 @@ jobs:
       id: terraform-init
       run: |
         ENTERPRISE_ID=$(jq -r '.enterprise_id' $CONFIG_FILE)
-        DEPLOYMENT_ID=$(jq -r '.deployment_id' $CONFIG_FILE)
-        terraform init -backend-config="bucket=$TERRAFORM_BACKEND_S3_BUCKET" -backend-config="key=$ENTERPRISE_ID/aws/$DEPLOYMENT_ID/ingress.tfstate" -backend-config="region=$TF_VAR_aws_region" 
+        INGRESS_ID=$(jq -r '.ingress_id' $CONFIG_FILE)
+        terraform init -backend-config="bucket=$TERRAFORM_BACKEND_S3_BUCKET" -backend-config="key=$ENTERPRISE_ID/aws/$INGRESS_ID/ingress.tfstate" -backend-config="region=$TF_VAR_aws_region" 
     - name: Terraform Apply
       id: terraform-apply
       if: github.event.inputs.terraform_command != 'plan'
diff --git a/aws/iam-policies/ArcGISEnterpriseCore.json b/aws/iam-policies/ArcGISEnterpriseCore.json
index 383eab7..9128457 100644
--- a/aws/iam-policies/ArcGISEnterpriseCore.json
+++ b/aws/iam-policies/ArcGISEnterpriseCore.json
@@ -18,6 +18,7 @@
                 "sns:GetSubscriptionAttributes",
                 "sns:ListTagsForResource",
                 "sns:SetTopicAttributes",
+                "sns:Subscribe",                
                 "sns:TagResource"
             ],
             "Resource": "*"
diff --git a/aws/iam-policies/ArcGISEnterpriseCoreDestroy.json b/aws/iam-policies/ArcGISEnterpriseCoreDestroy.json
index 1fc8fb1..39195c3 100644
--- a/aws/iam-policies/ArcGISEnterpriseCoreDestroy.json
+++ b/aws/iam-policies/ArcGISEnterpriseCoreDestroy.json
@@ -15,7 +15,8 @@
                 "sns:DeleteTopic",
                 "sns:GetTopicAttributes",
                 "sns:GetSubscriptionAttributes",
-                "sns:ListTagsForResource"
+                "sns:ListTagsForResource",
+                "sns:Unsubscribe"
             ],
             "Resource": "*"
         },
diff --git a/azure/arcgis-enterprise-core/workflows/enterprise-ingress-azure-destroy.yaml b/azure/arcgis-enterprise-core/workflows/enterprise-ingress-azure-destroy.yaml
index e4bb189..ea5d53d 100644
--- a/azure/arcgis-enterprise-core/workflows/enterprise-ingress-azure-destroy.yaml
+++ b/azure/arcgis-enterprise-core/workflows/enterprise-ingress-azure-destroy.yaml
@@ -51,10 +51,10 @@ jobs:
         id: terraform-init
         run: |
           ENTERPRISE_ID=$(jq -r '.enterprise_id' $CONFIG_FILE)
-          DEPLOYMENT_ID=$(jq -r '.deployment_id' $CONFIG_FILE)
+          INGRESS_ID=$(jq -r '.ingress_id' $CONFIG_FILE)
           terraform init -backend-config="storage_account_name=$TERRAFORM_BACKEND_STORAGE_ACCOUNT_NAME" \
                          -backend-config="container_name=$TERRAFORM_BACKEND_CONTAINER_NAME" \
-                         -backend-config="key=$ENTERPRISE_ID/azure/$DEPLOYMENT_ID/ingress.tfstate"
+                         -backend-config="key=$ENTERPRISE_ID/azure/$INGRESS_ID/ingress.tfstate"
       - name: Terraform Destroy
         id: terraform-destroy
         run: terraform destroy -var-file $CONFIG_FILE -auto-approve -input=false
diff --git a/azure/arcgis-enterprise-core/workflows/enterprise-ingress-azure.yaml b/azure/arcgis-enterprise-core/workflows/enterprise-ingress-azure.yaml
index c80a517..e79837c 100644
--- a/azure/arcgis-enterprise-core/workflows/enterprise-ingress-azure.yaml
+++ b/azure/arcgis-enterprise-core/workflows/enterprise-ingress-azure.yaml
@@ -58,10 +58,10 @@ jobs:
         id: terraform-init
         run: |
           ENTERPRISE_ID=$(jq -r '.enterprise_id' $CONFIG_FILE)
-          DEPLOYMENT_ID=$(jq -r '.deployment_id' $CONFIG_FILE)
+          INGRESS_ID=$(jq -r '.ingress_id' $CONFIG_FILE)
           terraform init -backend-config="storage_account_name=$TERRAFORM_BACKEND_STORAGE_ACCOUNT_NAME" \
                          -backend-config="container_name=$TERRAFORM_BACKEND_CONTAINER_NAME" \
-                         -backend-config="key=$ENTERPRISE_ID/azure/$DEPLOYMENT_ID/ingress.tfstate"
+                         -backend-config="key=$ENTERPRISE_ID/azure/$INGRESS_ID/ingress.tfstate"
       - name: Terraform Apply
         id: terraform-apply
         if: github.event.inputs.terraform_command != 'plan'