diff --git a/group_vars/all.yml b/group_vars/all.yml
index 9652239..7600ffb 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -22,15 +22,15 @@ comanage_training_password_salt: !vault |
 
 comanage_training_region: "us-west-2"
 
-r53_hosted_zone: scgvm.org
+r53_hosted_zone: incommon.training
 r53_dns_domain: "comanage.{{ r53_hosted_zone }}"
 
 # key for ssh-ing into training nodes
-training_node_ssh_key_name: "AWS_oregon_SCG_training"
+training_node_ssh_key_name: "AWS-Trng-1.pem"
 
 # The full ARN for an X.509 wildcard certificate provisioned by the
 # AWS Certificate Manager for domain *.comanage.incommong.training
-aws_cert_manager_cert_arn: "arn:aws:acm:us-west-2:886593122405:certificate/317c209f-5552-453a-bb8b-764d65456623"
+aws_cert_manager_cert_arn: "arn:aws:acm:us-west-2:626413038627:certificate/162508f9-f5e4-479d-bdb8-f614d8a7ccb0"
 
 vpc_cidr_block: 192.168.0.0/16
 
diff --git a/vpc.yml b/vpc.yml
index 3605b28..828cf15 100644
--- a/vpc.yml
+++ b/vpc.yml
@@ -71,18 +71,15 @@
           - dest: 0.0.0.0/0
             gateway_id: igw
 
-    - name: NAT gateway for public subnet A
+    - name: NAT gateway for public subnet 
       community.aws.ec2_vpc_nat_gateway:
         region: "{{ comanage_training_region }}"
         state: present
         subnet_id: "{{ item.subnet.id }}"
-        eip_address:  "{{ (subnet_index == 0) | ternary( '18.236.23.61', '34.211.214.32') }}"
         if_exist_do_not_create: yes
         wait: yes
       register: nat_gateway
       loop: "{{ subnet_public.results }}"
-      loop_control:
-         index_var: subnet_index
 
     - name: List NAT GW information
       debug: