diff --git a/compose/faq.md b/compose/faq.md
index 05dddd7ef5..45269c3682 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 6a7baa8454..62daa14500 100644
--- a/docker-trusted-registry/support.md
+++ b/docker-trusted-registry/support.md
@@ -1,9 +1,7 @@
 ---
 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 bc79fa4d8c..f773411dc3 100644
--- a/engine/breaking_changes.md
+++ b/engine/breaking_changes.md
@@ -2,9 +2,7 @@
 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 a0d4868ce1..c472b18754 100644
--- a/engine/installation/linux/index.md
+++ b/engine/installation/linux/index.md
@@ -1,10 +1,6 @@
 ---
 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 96f08292a4..0fdbd30439 100644
--- a/engine/swarm/how-swarm-mode-works/pki.md
+++ b/engine/swarm/how-swarm-mode-works/pki.md
@@ -1,13 +1,6 @@
 ---
 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 a1e99ff6ac..d8cbc147ae 100644
--- a/engine/swarm/ingress.md
+++ b/engine/swarm/ingress.md
@@ -1,12 +1,6 @@
 ---
 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 5bff126373..17f0555630 100644
--- a/engine/swarm/networking.md
+++ b/engine/swarm/networking.md
@@ -1,10 +1,6 @@
 ---
 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 bf4e4fcba1..169ab03839 100644
--- a/engine/swarm/services.md
+++ b/engine/swarm/services.md
@@ -1,10 +1,6 @@
 ---
 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 717c0b22e6..9a92fed4ce 100644
--- a/engine/userguide/networking/overlay-security-model.md
+++ b/engine/userguide/networking/overlay-security-model.md
@@ -1,8 +1,6 @@
 ---
 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 d1dd634d0f..aee7135613 100644
--- a/ucp/release_notes.md
+++ b/ucp/release_notes.md
@@ -1,10 +1,7 @@
 ---
 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 fe449c0dde..bb8aef6b02 100644
--- a/ucp/support.md
+++ b/ucp/support.md
@@ -1,9 +1,7 @@
 ---
 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