diff --git a/.github/workflows/aoe-cd-dev.yml b/.github/workflows/aoe-cd-dev.yml
index e7ad7f341..c839be52e 100644
--- a/.github/workflows/aoe-cd-dev.yml
+++ b/.github/workflows/aoe-cd-dev.yml
@@ -17,8 +17,6 @@ jobs:
       AOE_SQL_PASSWD: ${{ secrets.AOE_SQL_PASSWD }}
       AOE_LOCATION: ${{ secrets.AOE_LOCATION }}
       AOE_NAMEPREFIX: ${{ secrets.AOE_NAMEPREFIX }}
-      AOE_WORKSPACENAME: ${{ secrets.AOE_WORKSPACENAME }}
-      AOE_WORKSPACERG: ${{ secrets.AOE_WORKSPACERG }}
     steps:
       - run: echo "This job is now running on a ${{ runner.os }} server hosted by GitHub for the ${{ github.ref_name }} branch of the ${{ github.repository }} repository!"
       - name: Installing modules
diff --git a/docs/_config.yml b/docs/_config.yml
index 75551f7ce..b59cd4f1f 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -21,7 +21,7 @@ collections:
   reporting:
     permalink: /:collection/:path/
     output: true
-  workbooks:
+  optimize:
     permalink: /:collection/:path/
     output: true
   automation:
@@ -37,8 +37,8 @@ just_the_docs:
       name: Implementing FinOps
     reporting:
       name: Reporting + analytics
-    workbooks:
-      name: Azure Monitor workbooks
+    optimize:
+      name: Optimization + governance
     automation:
       name: Automation + extensibility
     resources:
diff --git a/docs/_workbooks/governance-workbook/README.md b/docs/_optimize/governance-workbook/README.md
similarity index 100%
rename from docs/_workbooks/governance-workbook/README.md
rename to docs/_optimize/governance-workbook/README.md
diff --git a/docs/_workbooks/governance-workbook/details.md b/docs/_optimize/governance-workbook/details.md
similarity index 100%
rename from docs/_workbooks/governance-workbook/details.md
rename to docs/_optimize/governance-workbook/details.md
diff --git a/docs/optimization-engine/README.md b/docs/_optimize/optimization-engine/README.md
similarity index 100%
rename from docs/optimization-engine/README.md
rename to docs/_optimize/optimization-engine/README.md
diff --git a/docs/optimization-engine/configuring-workspaces.md b/docs/_optimize/optimization-engine/configuring-workspaces.md
similarity index 100%
rename from docs/optimization-engine/configuring-workspaces.md
rename to docs/_optimize/optimization-engine/configuring-workspaces.md
diff --git a/docs/optimization-engine/customize.md b/docs/_optimize/optimization-engine/customize.md
similarity index 100%
rename from docs/optimization-engine/customize.md
rename to docs/_optimize/optimization-engine/customize.md
diff --git a/docs/optimization-engine/faq.md b/docs/_optimize/optimization-engine/faq.md
similarity index 100%
rename from docs/optimization-engine/faq.md
rename to docs/_optimize/optimization-engine/faq.md
diff --git a/docs/optimization-engine/reports.md b/docs/_optimize/optimization-engine/reports.md
similarity index 100%
rename from docs/optimization-engine/reports.md
rename to docs/_optimize/optimization-engine/reports.md
diff --git a/docs/optimization-engine/setup-options.md b/docs/_optimize/optimization-engine/setup-options.md
similarity index 100%
rename from docs/optimization-engine/setup-options.md
rename to docs/_optimize/optimization-engine/setup-options.md
diff --git a/docs/optimization-engine/suppressing-recommendations.md b/docs/_optimize/optimization-engine/suppressing-recommendations.md
similarity index 100%
rename from docs/optimization-engine/suppressing-recommendations.md
rename to docs/_optimize/optimization-engine/suppressing-recommendations.md
diff --git a/docs/_workbooks/optimization-workbook/README.md b/docs/_optimize/optimization-workbook/README.md
similarity index 100%
rename from docs/_workbooks/optimization-workbook/README.md
rename to docs/_optimize/optimization-workbook/README.md
diff --git a/docs/_workbooks/optimization-workbook/cost-optimization-workbook.md b/docs/_optimize/optimization-workbook/cost-optimization-workbook.md
similarity index 100%
rename from docs/_workbooks/optimization-workbook/cost-optimization-workbook.md
rename to docs/_optimize/optimization-workbook/cost-optimization-workbook.md