diff --git a/keys/gpg-public-keys/marti926.gpg.asc b/keys/gpg-public-keys/marti926.gpg.asc
deleted file mode 100644
index 0e69c53a..00000000
--- a/keys/gpg-public-keys/marti926.gpg.asc
+++ /dev/null
@@ -1,90 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBGT57qoBCACsPgoYTHIRhpcxAH54h9Cp0nhgvuyE0i+B+AHcVB2ppUs/21nq
-crmN98/pkaV09aAkohu35sd715AgMy5yAfzMlFHp663VvrLBCxikNkSyTUj3Q+Xb
-pdRK0aThuHBjKqH7wqyKIPG8WT9YGxTWPGkeJA+Hxn4RNxCnhqZL2khDJqDb2fja
-xgDWYfcF7WzGPD8SB+ggizDl/QPh8EvINwZRtXpFwKHrfiVy+yfdwjO6fXwVK+Ja
-6DjI53E9MDpL24U24Qt9tEhvny1oZzxOMbrxOQgvb4Nvp+f0EBA/Nq35ytdhndC4
-ts0iUKtS7Em9ZSYj0E3DxudRhkphYy6Hv2QHABEBAAG0JWt5bGVtYXJ0aW4gPGt5
-bGUubS5tYXJ0aW5AY2Vuc3VzLmdvdj6JAVQEEwEIAD4WIQQkOQZz0nY21MSQUTJe
-CeZSfwx2sAUCZPnuqgIbAwUJAHanAAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAK
-CRBeCeZSfwx2sCwPB/0UGIoZwA4NMlbTTgL6Z9rEHOzX2xK8RYQ7cocDItlsq4cL
-ldrf5dQEjUMEXmyvRo5cy+jQIFTOz8p2assDyDTSLm57AwAICWFFirmTMRvKumBQ
-RiTwMjZksaoU0eQ/Vt+jVtR0QhSWtuxqwDcWXdOg9/23jl0RnQyJ0rN8aIOLciZG
-lJ4sjIxPeyaJnhjHS0Jakta7jdqjr+2JX4RSjR6VP330JmJFnzUNQw9PzeLlTw7l
-KktU5hx7mZQnSDqgK5WGORQnIdzH1+I1paHbyT1gA3YBVg/b7Xs3/N6vnDgz/ySi
-uJLFN+BmfrRK6aaC9wojbYrJc55Gd+srs968VtlAuQENBGT57qoBCAD2MU/eN/Qe
-Oxle3FFkkJT/GiUdNP5yhoK6rDSj56+bfKgpnlwjKriyX8FQg+2ETCTaxaEY/NXD
-SRPXEBgSo42NywZ7FB4/LZ5KXJ3bh8JLOrs1yWVT44Le2GOvqp72O24FYpNOJqSl
-lYnuKSOS+whH6h3xgq0bwIPlA4hl5m1fylZ7lnEwiOlg+hvacwrBtcGZFjRBuzSc
-fjhTPbq8BAA53DoVki1+IvRneEMRyKOIHD4xqHVuak1mcSyOm9QZcDCgVAMarwW1
-OKhq7HHqKYlChqmqa9BXLajUiENmcsAwMdidrCpfOKKyvXgQh0s1wITrtvFg1p5O
-GjecJmPVQbJvABEBAAGJATwEGAEIACYWIQQkOQZz0nY21MSQUTJeCeZSfwx2sAUC
-ZPnuqgIbDAUJAHanAAAKCRBeCeZSfwx2sMFMB/9Nk6YSp65OEf90VDvgYKXuWLdK
-rnLd4/JIU0nXD8zqC57Wanx7UNTimwJ3ZpgOS1v3uWfPVZLjFiycE1e1+54aiTTl
-NYX047FQwsbvQe2cJf6qPhYl0EDQmAnHrTWwWUfM4rA1ZtZRNGk61wX57zsGCxj/
-TU3GFmun9UTBKjRT0m2l8M7RwbBG2L5C56EmJA93/wcPNJlgnekm4532ETCxG/X+
-PWQwxQ+sJENh6b8sdEROv1xOnCpLVylDnE3xXsv0mGwZ6NBj+TZhQ/wjjPd5HnqF
-/hW0aSxqVD8vsSqnn/39h4kRuXFuf+XJNZ/bB/v9Vt6ubNHDOMfIkM8shfAHmQIN
-BGT/F84BEADMWg+cxfNTOA8XIxzQr8HMyxxqZ3oOpSOg7VjBJch4HLAJ6+TJnhsm
-oY1ieAjjQMwJbxggG+zk+fbjV2wSQWCEVEUKGuU8kOiYTeCNuvnZqAVzGH0iN/RR
-XSAAbRwS6K2werpS5MZw6J0b2OCXX2imPRsWPwhmlP3e5fShEjheRW3lEKvI2fve
-Bmi6VMji/ha2r9Dr9ZLmO+HhpbfSk+V/5fK/lOedw5KJfRx5VXu5R9T3IbW0RtN9
-OwMjX/bHJ0NjeuhbZ0a1p+T/Mqku/Pmqd1PZ283Q81AAt1x0SLK3IJ3lg4X6grxS
-v1unexNlmdaM/XzFWq++YX/SDPbFi+ynPSgRt8oPeT91p3sgLUQ7GyEXorTeW0R7
-P+SYxUqp3ruJapi1wBFKyMLeSB+ygEg9kK3qsAE6vN3JSqhd9hC6laqkMgVtsgBU
-q+ExHGItAPz12PxxQwe6LC9TBpSVfDC4sBM9HjLYJwS7GaFnFXEl5Jy/kLde2d8Y
-/GxNgxxhvTLunTXZg4CDU6rgnSvzbb9kMs+GStLZT23jM2RYTx1irRlFtRbX52/0
-Sv3XsMYn17r1Xx4UwVahBwbVaNW4EGZ8Z/4ZC+WBfC7ujP3yZHjcKG2DG3xld3ff
-13WNVhlMjuwYtQf+VlwhbOxnQTVtTxesX6+YNl7ZfUdhv1yoHwGEwQARAQABtC1L
-eWxlIE1hcmNlbCBNYXJ0aW4gPGt5bGUubS5tYXJ0aW5AY2Vuc3VzLmdvdj6JAk4E
-EwEIADgWIQSIqzSLPGig7hD8yqPNaVvmSypHWQUCZP8XzgIbLwULCQgHAgYVCgkI
-CwIEFgIDAQIeAQIXgAAKCRDNaVvmSypHWZupD/9FVVFu5MXqR+V9EssOTKK6Kfyp
-YcXXUGhY0jeq7CHzr+s+oq8Y7h7EU5tR0XsXSofi49X5hXrF7NmngXuWk9QozNUF
-dWL1wON/oDEHZpQZZcf0LpRTWjv+mC6fypG1LFxPyHjFYjN38wsRMl/WsMHgFsRK
-aMoZguq++c7orNhGeaFMObHcYK38tjUI+L9uq4UYeROPEfS49PgjnvQx8ecwjcRA
-9ok5gyBom8NFeRsTVTiJLA9LyiLk3WTKkDmdJSOatF9VwU47pBaJcQKTXyJ2n1H7
-ovEoSjyOpXsm66seRsstiKDk6FTfyI7uZ3hkjpckNOJ5ZV6I2rdvFDgKwVL4mrOg
-CaJN2npXGDT6To5/+wSFPs/lsT6hHRKCa+vUHVP0jnaJU7G4gACuJ2viM1/iYawV
-3tfkynjW1azZmXX5tk47sVhL9oo3phYpUaNK5L1LGiD5NDmpnnr9vFi7eA8N/jx3
-Z0fkJ4+3pFgJHo6OIVE6egzxlvwSeVhccHC/pPvyODqRTzZxVezfYnV5xNcbXs4d
-POF0l6dJfQgptckOFf/px9P3QPmgOjBrYkzRsx0tBZUosLKLyFJNn9fkBGHk8Mui
-vxu8QkuQfEHvhWehUUfgRCowptLJLKQkd3GZ0jwaV5xHoIynDCBqiLv++O6kx/Qm
-NZTJYplQmu4A0G0TNrkCDQRk/xfOARAA60oGME9ikbt/H/JfbWyGyu/MPBH9+21L
-v+z6hSXBFEjWSauUeQi13wl73DKCawrN7kn1Z9xxm7lCaeiU3/CfwHewU13aZiWt
-E6sf2PDoV4M8ZnxsC/qeH9XfSdbx/hhKGjqRlrXpWPGUUucdSiXopNmn0msDBxTe
-KkDLWmaVSaWZUhiIxpD3xVs8v9G52gKM0x6CniW1YeKFIunOfX/FrtXgICLqZ7Bs
-YaoCzj7PNtr0vgVhFeak8QBc0lhJNtrQon+IHjGBwipemLmTU/UPRfgTBZ4ncyfB
-/Ll2mWVn+pNpzWwTiaCDGfKRHZzDaUtkHXGkXEhruIQArfSsZQ969ppX75/A3gE+
-3rk9+NL+yBcuSZl1ggTf/l3SLbBiHaHN/kwy0EneqZVwj5LH4PDi9aKafGZYQ0uW
-WhQXNog4NpJYyKELlLC77KuCmIZsts4ON85TTyor/Y2EPZr/5hA5/yHR7K8C2klb
-4Ed4h5Oks4uDN0rwlNRjHYLHgFP6OO0uYaVktPjwZ97/maoqSVvsOvq7BUg4sQQn
-X/SlqKwpuAG5C0y1lnx2oysp30DiBKa3OLs8tnqF9nsfq4TKFLyvTm62P1Zwl6hf
-Ux2umowE8/tGftecdx+fByK8X1ZDLvA6YDhKk4YlCUZ5vPr6l1o5A4r6kW4RbsEa
-0FnWpcF76kcAEQEAAYkEbAQYAQgAIBYhBIirNIs8aKDuEPzKo81pW+ZLKkdZBQJk
-/xfOAhsuAkAJEM1pW+ZLKkdZwXQgBBkBCAAdFiEEC8Cp3IvPggNPBKOqCN/2uAwp
-jrYFAmT/F84ACgkQCN/2uAwpjrZCFA/+Plq0IqX5dmjiyQLhqJ7Zf0qsasRrIW46
-vxVu6/yro8L3wqyIqJwMO8QNY3fjA1LPoSvJj9//CsELY+f91il9STYtnp84mnp+
-ePmJi9kR6XKW96hXh5zTRmfELl8CHOfRXQCp6gX6f1Ya80sDgIBLkL7NtWt4cuwJ
-v5sQUXeymlkhXEpwmbWDEzKakqy9uWG6TZfXnNP1VaqXJYf8FYdl62MdsK/v4yyC
-qXl/hD90I8QrNzQqOgXPMvagtB5Vavw3YXR1TTjf8bkVx39thpY56Js7ttg4IsD0
-JCZU8hw2sFDiwnrcpI1Rvcks0mdzWKWAaZDn4qayOtIrvHbyO9SPbnFeB3FiBpFs
-pDxJYZBnuq62MUZKa/123yZBGMnUM7/8BNBfFCbu0FnWhaTCev8L1g7P9XXF42mk
-bw9WlACmO+ZQcXuxD0UqwKFSMCnEu3lQzGkPleI9sDzzTZH4geVgRGtOKHIxNW7Q
-p55g3CzlntyFBdsfKUbw9Zkx1Mw1ixZt63MuJf5Zpx0+k2wyleoyq9xjCfJvjAHi
-zKY23VbdVv3DsLQkX5c3/VZ9GX/V7dc0o59XKgVXrmuN7rBaoelAa7l5aLJmlig4
-9on5aWVzFVq+uY5Fvm82lwiXyAAMqS4aYoUqhKZ4uhUop9dGLPfWQ/t/w4bWqmoQ
-LvFuNLmzP7eMzxAAkSZ1aRGkvy07dzy001gfrj8pnj9W7tJdzSImx9BLFUnFm7dp
-7yhZlapQE4IfeJ+IpQeGA3XUsK3i/PsOful1n7h4nDOLMdqnsNtpnN4S3NDtOcSv
-4UGRltY0zBtzGXhhKBE5wVhGHJ8tFmBDgK7BYDAm6zYAA4Vd3Hb+vpJpJiJHyInn
-Bt1+hs08mgsnoCrkAQ89/nU96ZR5aRUvs3/JLJQ5CF5xxHwQkQmUeUzDNcNLIbWB
-Ez1QEq7mRK+Keq9s138bKZmm4ZvzogKNhFp3NJtTjN7NhjaOPJLVhWGvo5ob4ORX
-qK+om0Nr/2r0YudEN1XtFtMMgq4eLAfhgTR1RxVCdyqxlQkAldLNtL/+uJIy5iG5
-AcUJk/zVR7K/3RZPhFhQByWysDXpwqwRhaa7/oI8xbUMzODwUkNlsGnh+FH8eF6q
-0pvv/jKsl+qKzEIIO7TqgmFFTqpslO4ZxtDkrIiQ2FDXSC/qa/F7AuzMQEftx4zb
-DMR9p0pZrELQXRbbXjnobTbaeqBhMaAo9+cEa34rJwRlO1VCU/IA864m5GMGpfxc
-aC+3u4Zz863H16dpk4Hy8xPukApYz9AlKXjhXjw+gZN1CuWsRV3LBBTstpUKXW2s
-uuEXimwrHDyS2NQr0G/rSFZiQ/3ra8Lh6qJNuZOTMF92JIvGvoCL0iTFBBQ=
-=sXS6
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/local-app/aws-account-setup/ansible/inventory/group_vars/ditd-ags-nonprod-ew/main.yml b/local-app/aws-account-setup/ansible/inventory/group_vars/ditd-ags-nonprod-ew/main.yml
new file mode 100644
index 00000000..1a03a628
--- /dev/null
+++ b/local-app/aws-account-setup/ansible/inventory/group_vars/ditd-ags-nonprod-ew/main.yml
@@ -0,0 +1,7 @@
+tf_account: "236157369267"
+tf_account_name: "ditd-ags-nonprod-ew"
+tf_account_use: "DITD AGS NonProd EW"
+tf_region_type: "ew"
+vpc_dns_servers: [ ]
+vpc_ntp_servers: [ ]
+vpc_domain_name: ""	
diff --git a/local-app/aws-account-setup/ansible/inventory/group_vars/ditd-ags-nonprod-ew/secret.yml b/local-app/aws-account-setup/ansible/inventory/group_vars/ditd-ags-nonprod-ew/secret.yml
new file mode 120000
index 00000000..25fee175
--- /dev/null
+++ b/local-app/aws-account-setup/ansible/inventory/group_vars/ditd-ags-nonprod-ew/secret.yml
@@ -0,0 +1 @@
+../secret.yml
\ No newline at end of file
diff --git a/local-app/aws-account-setup/ansible/inventory/group_vars/ditd-ags-nonprod-gov/main.yml b/local-app/aws-account-setup/ansible/inventory/group_vars/ditd-ags-nonprod-gov/main.yml
new file mode 100644
index 00000000..cbacd925
--- /dev/null
+++ b/local-app/aws-account-setup/ansible/inventory/group_vars/ditd-ags-nonprod-gov/main.yml
@@ -0,0 +1,7 @@
+tf_account: "382381014825"
+tf_account_name: "ditd-ags-nonprod-gov"
+tf_account_use: DITD AGS NonProd GovCloud"
+tf_region_type: "gov"
+vpc_dns_servers: [ ]
+vpc_ntp_servers: [ ]
+vpc_domain_name: ""
diff --git a/local-app/aws-account-setup/ansible/inventory/group_vars/ditd-ags-nonprod-gov/secret.yml b/local-app/aws-account-setup/ansible/inventory/group_vars/ditd-ags-nonprod-gov/secret.yml
new file mode 120000
index 00000000..25fee175
--- /dev/null
+++ b/local-app/aws-account-setup/ansible/inventory/group_vars/ditd-ags-nonprod-gov/secret.yml
@@ -0,0 +1 @@
+../secret.yml
\ No newline at end of file
diff --git a/local-app/aws-account-setup/ansible/inventory/inventory.yml b/local-app/aws-account-setup/ansible/inventory/inventory.yml
index 6e693e7b..d0105577 100644
--- a/local-app/aws-account-setup/ansible/inventory/inventory.yml
+++ b/local-app/aws-account-setup/ansible/inventory/inventory.yml
@@ -760,7 +760,13 @@ all:
         cedsci-dmz-stage-ew.cloud ansible_host=localhost
     cedsci-dmz-stage-gov:
       hosts:
-        cedsci-dmz-stage-gov.cloud ansible_host=localhost     
+        cedsci-dmz-stage-gov.cloud ansible_host=localhost
+    ditd-ags-nonprod-ew:
+      hosts:
+        ditd-ags-nonprod-ew.cloud ansible_host=localhost
+    ditd-ags-nonprod-gov:
+      hosts:
+        ditd-ags-nonprod-gov.cloud ansible_host=localhost     
 #---
 # master payer
 #---