diff --git a/_data/credentials.yml b/_data/credentials.yml
index 5f6cd03..4d2a517 100644
--- a/_data/credentials.yml
+++ b/_data/credentials.yml
@@ -1,15 +1,30 @@
-extra_small:
-  client_id: "3841c594-a8c0-41e5-98cc-38bb45360d3c"
-  client_secret: "efef20edc106b7b355ff09754d5b19014f42820996629a469aa3d4ce1063cbd098b08ccba3bbdcbf"
-small:
-  client_id: "d5f83f74-6c55-4f1e-9d16-0022688171ba"
-  client_secret: "e7a56d9e54dadaae1c0effde59ae1c804088cb4287f7f9fd5de6de0e3399923a59b5ad37a38dab7a"
-medium:
-  client_id: "8c75a6f6-02b9-4a47-96c1-0bd6efd4b5e3"
-  client_secret: "283e10b42cfb7de88bdf7ebd5d4f178ba6af19b6eadfbc36675754a1576c899435bb098dd97aa8b0"
-large:
-  client_id: "f268a8c6-8a29-4d2b-8b92-263dc775750d"
-  client_secret: "1087acf26be69e26d4ab5f8078d63cb737f3dd9aeedb928c463dd72d7b111191de16b484428d8d8f"
-extra_large:
-  client_id: "6152afb4-c555-46e4-93de-fa16a441d643"
-  client_secret: "7c312fbe1fafaf4fab3e4a71c20bb79106a083a24784ef83dc56a2b1f891a9f52b181a20eec698a0"
\ No newline at end of file
+sandbox:
+  extra_small:
+    client_id: "3841c594-a8c0-41e5-98cc-38bb45360d3c"
+    client_secret: "efef20edc106b7b355ff09754d5b19014f42820996629a469aa3d4ce1063cbd098b08ccba3bbdcbf"
+  small:
+    client_id: "d5f83f74-6c55-4f1e-9d16-0022688171ba"
+    client_secret: "e7a56d9e54dadaae1c0effde59ae1c804088cb4287f7f9fd5de6de0e3399923a59b5ad37a38dab7a"
+  medium:
+    client_id: "8c75a6f6-02b9-4a47-96c1-0bd6efd4b5e3"
+    client_secret: "283e10b42cfb7de88bdf7ebd5d4f178ba6af19b6eadfbc36675754a1576c899435bb098dd97aa8b0"
+  large:
+    client_id: "f268a8c6-8a29-4d2b-8b92-263dc775750d"
+    client_secret: "1087acf26be69e26d4ab5f8078d63cb737f3dd9aeedb928c463dd72d7b111191de16b484428d8d8f"
+  extra_large:
+    client_id: "6152afb4-c555-46e4-93de-fa16a441d643"
+    client_secret: "7c312fbe1fafaf4fab3e4a71c20bb79106a083a24784ef83dc56a2b1f891a9f52b181a20eec698a0"
+adv:
+  small:
+    client_id: "6dc59a4c-ef93-46c0-9c00-02e500e13731"
+    client_secret: "317a7e3d11d617931ef9c39a2e5c34747f4349cde2b3ec7355f5b01d6c8e19aefca45483966e5f63"
+  large:
+    client_id: "69b1ecae-750a-479b-9997-eb38b1197adb"
+    client_secret: "3611796c42ee5ee92fae59b66c50f48ab0e40f2bc331e9429d7b10413f232b0477939a9aa6148748"
+enhancement:
+  small:
+    client_id: "d6975f99-d83e-4eee-9a54-c057be12d1ff"
+    client_secret: "56b4057a56d0c83657757e97aef63f4f163d64caad2950cd324ed346dbeffa1ed02a6a3d4d92b116"
+  large:
+    client_id: "1f4575c9-80ea-425c-9d3e-c2b79e9159da"
+    client_secret: "10d824c77f7f00aad9c8cab420244f1008ec08d68eb194818c01e504586db84c6184ea89079cdeef"
diff --git a/_includes/guide/adv_credentials.html b/_includes/guide/adv_credentials.html
index e0be01f..0b89bbd 100644
--- a/_includes/guide/adv_credentials.html
+++ b/_includes/guide/adv_credentials.html
@@ -2,14 +2,14 @@
 <div class="acc_content">
     Client ID:
     {%- capture client_id -%}
-    6dc59a4c-ef93-46c0-9c00-02e500e13731
+    {{site.data.credentials.adv.small.client_id}}
     {%- endcapture -%}
 
     {% include copy_snippet.md code=client_id aco='Small Advanced ACO (100 synthetic beneficiaries)' type='Client ID' %}
 
     Client Secret:
     {%- capture client_secret -%}
-    317a7e3d11d617931ef9c39a2e5c34747f4349cde2b3ec7355f5b01d6c8e19aefca45483966e5f63
+    {{site.data.credentials.adv.small.client_secret}}
     {%- endcapture -%}
 
     {% include copy_snippet.md code=client_secret aco='Small Advanced ACO (100 synthetic beneficiaries)' type='Client Secret' %}
@@ -19,14 +19,14 @@
 <div class="acc_content">
     Client ID:
     {%- capture client_id -%}
-    69b1ecae-750a-479b-9997-eb38b1197adb
+    {{site.data.credentials.adv.large.client_id}}
     {%- endcapture -%}
 
     {% include copy_snippet.md code=client_id aco='Large Advanced ACO (10,000 synthetic beneficiaries)' type='Client ID' %}
 
     Client Secret:
     {%- capture client_secret -%}
-    3611796c42ee5ee92fae59b66c50f48ab0e40f2bc331e9429d7b10413f232b0477939a9aa6148748
+    {{site.data.credentials.adv.large.client_secret}}
     {%- endcapture -%}
 
     {% include copy_snippet.md code=client_secret aco='Large Advanced ACO (10,000 synthetic beneficiaries)' type='Client Secret' %}
diff --git a/_includes/guide/bcda_enhancement_credentials.html b/_includes/guide/bcda_enhancement_credentials.html
index 8ee7baf..328f8c4 100644
--- a/_includes/guide/bcda_enhancement_credentials.html
+++ b/_includes/guide/bcda_enhancement_credentials.html
@@ -2,14 +2,14 @@
 <div class="acc_content">
     Client ID:
     {%- capture client_id -%}
-    d6975f99-d83e-4eee-9a54-c057be12d1ff
+    {{site.data.credentials.enhancement.small.client_id}}
     {%- endcapture -%}
 
     {% include copy_snippet.md code=client_id aco='Small REACH ACO (100 synthetic beneficiaries)' type='Client ID' %}
 
     Client Secret:
     {%- capture client_secret -%}
-    56b4057a56d0c83657757e97aef63f4f163d64caad2950cd324ed346dbeffa1ed02a6a3d4d92b116
+    {{site.data.credentials.enhancement.small.client_secret}}
     {%- endcapture -%}
 
     {% include copy_snippet.md code=client_secret aco='Small REACH ACO (100 synthetic beneficiaries)' type='Client Secret' %}
@@ -19,14 +19,14 @@
 <div class="acc_content">
     Client ID:
     {%- capture client_id -%}
-    1f4575c9-80ea-425c-9d3e-c2b79e9159da
+    {{site.data.credentials.enhancement.large.client_id}}
     {%- endcapture -%}
 
     {% include copy_snippet.md code=client_id aco='Large DCE (10,000 synthetic beneficiaries)' type='Client ID' %}
 
     Client Secret:
     {%- capture client_secret -%}
-    10d824c77f7f00aad9c8cab420244f1008ec08d68eb194818c01e504586db84c6184ea89079cdeef
+    {{site.data.credentials.enhancement.large.client_secret}}
     {%- endcapture -%}
 
     {% include copy_snippet.md code=client_secret aco='Large DCE (10,000 synthetic beneficiaries)' type='Client Secret' %}
diff --git a/_includes/guide/credentials.html b/_includes/guide/credentials.html
index e4a1fb6..4e251b4 100644
--- a/_includes/guide/credentials.html
+++ b/_includes/guide/credentials.html
@@ -2,14 +2,14 @@
 <div class="acc_content">
     Client ID:
     {%- capture client_id -%}
-    {{site.data.credentials.extra_small.client_id}}
+    {{site.data.credentials.sandbox.extra_small.client_id}}
     {%- endcapture -%}
 
     {% include copy_snippet.md code=client_id aco='Extra-Small ACO (50 synthetic beneficiaries)' type='Client ID' %}
 
     Client Secret:
     {%- capture client_secret -%}
-    {{site.data.credentials.extra_small.client_secret}}
+    {{site.data.credentials.sandbox.extra_small.client_secret}}
     {%- endcapture -%}
 
     {% include copy_snippet.md code=client_secret aco='Extra-Small ACO (50 synthetic beneficiaries)' type='Client Secret' %}
@@ -19,14 +19,14 @@
 <div class="acc_content">
     Client ID:
     {%- capture client_id -%}
-    {{site.data.credentials.small.client_id}}
+    {{site.data.credentials.sandbox.small.client_id}}
     {%- endcapture -%}
 
     {% include copy_snippet.md code=client_id aco='Small ACO (2,500 synthetic beneficiaries)' type='Client ID' %}
 
     Client Secret:
     {%- capture client_secret -%}
-    {{site.data.credentials.small.client_secret}}
+    {{site.data.credentials.sandbox.small.client_secret}}
     {%- endcapture -%}
 
     {% include copy_snippet.md code=client_secret aco='Small ACO (2,500 synthetic beneficiaries)' type='Client Secret' %}
@@ -36,14 +36,14 @@
 <div class="acc_content">
     Client ID:
     {%- capture client_id -%}
-    {{site.data.credentials.medium.client_id}}
+    {{site.data.credentials.sandbox.medium.client_id}}
     {%- endcapture -%}
 
     {% include copy_snippet.md code=client_id aco='Medium ACO (7,500 synthetic beneficiaries)' type='Client ID' %}
 
     Client Secret:
     {%- capture client_secret -%}
-    {{site.data.credentials.medium.client_secret}}
+    {{site.data.credentials.sandbox.medium.client_secret}}
     {%- endcapture -%}
 
     {% include copy_snippet.md code=client_secret aco='Medium ACO (7,500 synthetic beneficiaries)' type='Client Secret' %}
@@ -53,14 +53,14 @@
 <div class="acc_content">
     Client ID:
     {%- capture client_id -%}
-    {{site.data.credentials.large.client_id}}
+    {{site.data.credentials.sandbox.large.client_id}}
     {%- endcapture -%}
 
     {% include copy_snippet.md code=client_id aco='Large ACO (20,000 synthetic beneficiaries)' type='Client ID' %}
 
     Client Secret:
     {%- capture client_secret -%}
-    {{site.data.credentials.large.client_secret}}
+    {{site.data.credentials.sandbox.large.client_secret}}
     {%- endcapture -%}
 
     {% include copy_snippet.md code=client_secret aco='Large ACO (20,000 synthetic beneficiaries)' type='Client Secret' %}
@@ -70,14 +70,14 @@
 <div class="acc_content">
     Client ID:
     {%- capture client_id -%}
-    {{site.data.credentials.extra_large.client_id}}
+    {{site.data.credentials.sandbox.extra_large.client_id}}
     {%- endcapture -%}
 
     {% include copy_snippet.md code=client_id aco='Extra-Large ACO (30,000 synthetic beneficiaries)' type='Client ID' %}
 
     Client Secret:
     {%- capture client_secret -%}
-    {{site.data.credentials.extra_large.client_secret}}
+    {{site.data.credentials.sandbox.extra_large.client_secret}}
     {%- endcapture -%}
 
     {% include copy_snippet.md code=client_secret aco='Extra-Large ACO (30,000 synthetic beneficiaries)' type='Client Secret' %}