diff --git a/docs/_data/sidebars/talk_sidebar.yml b/docs/_data/sidebars/talk_sidebar.yml
index 62660783c..ebbc6e006 100644
--- a/docs/_data/sidebars/talk_sidebar.yml
+++ b/docs/_data/sidebars/talk_sidebar.yml
@@ -37,20 +37,6 @@ entries:
       url: /install-setup.html
       output: web
 
-  - title: Architecture
-    output: web
-    folderitems:
-    - title: Overview
-      url: /architecture.html
-      output: web
-    - title: Tags
-      url: /architecture-tags.html
-      output: web
-    - title: cli
-      url: /architecture-cli.html
-      output: web
-
-
   - title: Plugins
     output: web
     folderitems:
@@ -70,6 +56,22 @@ entries:
       url: /plugins-experimental.html
       output: web
 
+  - title: Architecture
+    output: web
+    folderitems:
+    - title: Overview
+      url: /architecture.html
+      output: web
+    - title: Tags
+      url: /architecture-tags.html
+      output: web
+    - title: Metadata API
+      url: /architecture-metadata.html
+      output: web
+    - title: cli
+      url: /architecture-cli.html
+      output: web
+
   - title: Development
     output: web
     folderitems:
diff --git a/docs/architecture-metadata.md b/docs/architecture-metadata.md
new file mode 100644
index 000000000..e69de29bb