diff --git a/compose/faq.md b/compose/faq.md
index 45269c3682..05dddd7ef5 100644
--- a/compose/faq.md
+++ b/compose/faq.md
@@ -1,6 +1,6 @@
 ---
 description: Docker Compose FAQ
-keywords: documentation, docs, docker, compose, faq
+keywords: documentation, docs,  docker, compose, faq
 menu:
   main:
     identifier: faq.compose
diff --git a/docker-trusted-registry/support.md b/docker-trusted-registry/support.md
index 62daa14500..6a7baa8454 100644
--- a/docker-trusted-registry/support.md
+++ b/docker-trusted-registry/support.md
@@ -1,7 +1,9 @@
 ---
 description: Your Docker subscription gives you access to prioritized support. You
   can file tickets via email, your the support portal.
-keywords: Docker, support, help
+keywords:
+- Docker, support
+- help
 menu:
   main:
     parent: workw_dtr
diff --git a/engine/breaking_changes.md b/engine/breaking_changes.md
index f773411dc3..bc79fa4d8c 100644
--- a/engine/breaking_changes.md
+++ b/engine/breaking_changes.md
@@ -2,7 +2,9 @@
 aliases:
 - /engine/misc/breaking/
 description: Breaking changes
-keywords: docker, documentation, about, technology, breaking, incompatibilities
+keywords:
+- docker, documentation, about, technology, breaking
+- incompatibilities
 title: Breaking changes
 ---
 
diff --git a/engine/installation/linux/index.md b/engine/installation/linux/index.md
index c472b18754..a0d4868ce1 100644
--- a/engine/installation/linux/index.md
+++ b/engine/installation/linux/index.md
@@ -1,6 +1,10 @@
 ---
 description: Lists the installation methods
-keywords: docker, engine, install, linux
+keywords:
+- docker
+- engine
+- install
+- linux
 menu:
   main:
     identifier: engine_linux
diff --git a/engine/swarm/how-swarm-mode-works/pki.md b/engine/swarm/how-swarm-mode-works/pki.md
index 0fdbd30439..96f08292a4 100644
--- a/engine/swarm/how-swarm-mode-works/pki.md
+++ b/engine/swarm/how-swarm-mode-works/pki.md
@@ -1,6 +1,13 @@
 ---
 description: How PKI works in swarm mode
-keywords: docker, container, cluster, swarm mode, node, tls, pki
+keywords:
+- docker
+- container
+- cluster
+- swarm mode
+- node
+- tls
+- pki
 menu:
   main:
     identifier: how-pki-work
diff --git a/engine/swarm/ingress.md b/engine/swarm/ingress.md
index d8cbc147ae..a1e99ff6ac 100644
--- a/engine/swarm/ingress.md
+++ b/engine/swarm/ingress.md
@@ -1,6 +1,12 @@
 ---
 description: Use the routing mesh to publish services externally to a swarm
-keywords: guide, swarm mode, swarm, network, ingress, routing mesh
+keywords:
+- guide
+- swarm mode
+- swarm
+- network
+- ingress
+- routing mesh
 menu:
   main:
     identifier: ingress-guide
diff --git a/engine/swarm/networking.md b/engine/swarm/networking.md
index 17f0555630..5bff126373 100644
--- a/engine/swarm/networking.md
+++ b/engine/swarm/networking.md
@@ -1,6 +1,10 @@
 ---
 description: Use swarm mode networking features
-keywords: guide, swarm mode, swarm, network
+keywords:
+- guide
+- swarm mode
+- swarm
+- network
 menu:
   main:
     identifier: networking-guide
diff --git a/engine/swarm/services.md b/engine/swarm/services.md
index 169ab03839..bf4e4fcba1 100644
--- a/engine/swarm/services.md
+++ b/engine/swarm/services.md
@@ -1,6 +1,10 @@
 ---
 description: Deploy services to a swarm
-keywords: guide, swarm mode, swarm, service
+keywords:
+- guide
+- swarm mode
+- swarm
+- service
 menu:
   main:
     identifier: services-guide
diff --git a/engine/userguide/networking/overlay-security-model.md b/engine/userguide/networking/overlay-security-model.md
index 9a92fed4ce..717c0b22e6 100644
--- a/engine/userguide/networking/overlay-security-model.md
+++ b/engine/userguide/networking/overlay-security-model.md
@@ -1,6 +1,8 @@
 ---
 description: Docker swarm mode overlay network security model
-keywords: network, docker, documentation, user guide, multihost, swarm mode, overlay
+keywords:
+- network, docker, documentation, user guide, multihost, swarm mode
+- overlay
 menu:
   main:
     parent: smn_networking
diff --git a/ucp/release_notes.md b/ucp/release_notes.md
index aee7135613..d1dd634d0f 100644
--- a/ucp/release_notes.md
+++ b/ucp/release_notes.md
@@ -1,7 +1,10 @@
 ---
 description: Release notes for Docker Universal Control Plane. Learn more about the
   changes introduced in the latest versions.
-keywords: Docker, UCP, Release notes, Versions
+keywords:
+- Docker, UCP
+- Release notes
+- Versions
 menu:
   main:
     identifier: ucp_rnotes
diff --git a/ucp/support.md b/ucp/support.md
index bb8aef6b02..fe449c0dde 100644
--- a/ucp/support.md
+++ b/ucp/support.md
@@ -1,7 +1,9 @@
 ---
 description: Your Docker subscription gives you access to prioritized support. You
   can file tickets via email, your the support portal.
-keywords: Docker, support, help
+keywords:
+- Docker, support
+- help
 menu:
   main:
     identifier: ucp_support