diff --git a/root/apps/clouddriver/config/clouddriver.yml b/root/apps/clouddriver/config/clouddriver.yml
index 3dece44ac69..468a3719131 100644
--- a/root/apps/clouddriver/config/clouddriver.yml
+++ b/root/apps/clouddriver/config/clouddriver.yml
@@ -113,6 +113,8 @@ aws:
 #    - name: oss
 #      accountId: 751929122243
     - name: mceprod
+      environment: prod
+      accountType: mce
       defaultKeyPair: prod
       edda: http://edda-mce.{{region}}.prod.netflix.net:7001
       discovery: "http://{{region}}.discoveryprod.netflix.net:7001/discovery"
@@ -120,6 +122,8 @@ aws:
       regions:
         - name: us-east-1
     - name: prod
+      environment: prod
+      accountType: main
       edda: http://edda-main.{{region}}.prod.netflix.net:7001
       discovery: "http://{{region}}.discoveryprod.netflix.net:7001/discovery"
       accountId: 149510111645
@@ -129,6 +133,8 @@ aws:
         - name: us-west-2
         - name: eu-west-1
     - name: mcetest
+      environment: test
+      accountType: mce
       defaultKeyPair: test
       edda: http://edda-mce.{{region}}.test.netflix.net:7001
       discovery: "http://{{region}}.discoverytest.netflix.net:7001/discovery"
@@ -137,6 +143,8 @@ aws:
         - name: us-east-1
         - name: us-west-2
     - name: test
+      environment: test
+      accountType: main
       edda: http://edda-main.{{region}}.test.netflix.net:7001
       front50: http://front50.test.netflix.net/test
       discovery: "http://{{region}}.discoverytest.netflix.net:7001/discovery"
@@ -147,6 +155,8 @@ aws:
         - name: us-west-2
         - name: eu-west-1
     - name: cpl
+      environment: prod
+      accountType: cpl
       edda: http://edda-cpl.{{region}}.prod.netflix.net:7001
       front50: http://front50-cpl.prod.netflix.net/cpl
       discovery: "http://{{region}}.discoveryprod.netflix.net:7001/discovery"
@@ -154,12 +164,16 @@ aws:
       regions:
         - name: us-east-1
     - name: dataeng
+      environment: prod
+      accountType: dse
       edda: http://edda-dse.{{region}}.prod.netflix.net:7001
       discovery: "http://{{region}}.discoveryprod.netflix.net:7001/discovery"
       accountId: 219382154434
       regions:
         - name: us-east-1
     - name: itopsprod
+      environment: prod
+      accountType: itops
       edda: http://edda-itops.{{region}}.prod.netflix.net:7001
       discovery: "http://{{region}}.discoveryprod.netflix.net:7001/discovery"
       accountId: 788777746278
@@ -167,6 +181,8 @@ aws:
         - name: us-east-1
         - name: us-west-2
     - name: itopsdev
+      environment: test
+      accountType: itops
       edda: http://edda-itops.{{region}}.test.netflix.net:7001
       discovery: "http://{{region}}.discoverytest.netflix.net:7001/discovery"
       accountId: "020769165682"
@@ -174,6 +190,8 @@ aws:
         - name: us-east-1
         - name: us-west-2
     - name: mgmttest
+      environment: test
+      accountType: mgmt
       edda: http://edda-mgmt.{{region}}.test.netflix.net:7001
       discovery: "http://{{region}}.discoverytest.netflix.net:7001/discovery"
       accountId: 521597827845
@@ -186,6 +204,8 @@ aws:
         - mgmt_spinnaker
         - meechumsg-mgmt_spinnaker@netflix.com
     - name: mgmt
+      environment: prod
+      accountType: mgmt
       edda: http://edda-mgmt.{{region}}.prod.netflix.net:7001
       discovery: "http://{{region}}.discoveryprod.netflix.net:7001/discovery"
       accountId: 567395257996