diff --git a/_data/glossary/daemonset.yaml b/_data/glossary/daemonset.yaml
index 0c84d01b19..cb3374037d 100644
--- a/_data/glossary/daemonset.yaml
+++ b/_data/glossary/daemonset.yaml
@@ -3,6 +3,7 @@ name: DaemonSet
 full-link: /docs/concepts/workloads/controllers/daemonset
 tags:
 - fundamental
+- core-object
 - workload
 short-description: >
   Ensures a copy of a {% glossary_tooltip text="Pod" term_id="pod" %} is running across a set of nodes in a {% glossary_tooltip text="cluster" term_id="cluster" %}.
diff --git a/_data/glossary/job.yaml b/_data/glossary/job.yaml
index c868a68941..ec32a36943 100644
--- a/_data/glossary/job.yaml
+++ b/_data/glossary/job.yaml
@@ -2,7 +2,9 @@ id: job
 name: Job
 full-link: /docs/concepts/workloads/controllers/jobs-run-to-completion
 tags:
+- fundamental
 - core-object
+- workload
 short-description: >
   A finite or batch task that runs to completion.
 long-description: >
diff --git a/_data/glossary/replica-set.yml b/_data/glossary/replica-set.yml
index 74d987b588..e239a438b7 100644
--- a/_data/glossary/replica-set.yml
+++ b/_data/glossary/replica-set.yml
@@ -4,8 +4,9 @@ full-link: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/
 related:
 - replication-controller
 tags:
+- fundamental
 - core-object
-- architecture
+- workload
 short-description: >
   ReplicaSet is the next-generation Replication Controller.
 long-description: >
diff --git a/_data/glossary/replication-controller.yaml b/_data/glossary/replication-controller.yaml
index 6009b49c8b..04b071a8e4 100644
--- a/_data/glossary/replication-controller.yaml
+++ b/_data/glossary/replication-controller.yaml
@@ -1,7 +1,8 @@
 id: replication-controller
 name: Replication Controller
 tags:
-- fundamental
+- workload
+- core-object
 short-description: >
   Kubernetes service that ensures a specific number of instances of a pod are always running.
 long-description: >
diff --git a/_data/glossary/statefulset.yml b/_data/glossary/statefulset.yml
index 4fdbd5ce12..542523f5df 100644
--- a/_data/glossary/statefulset.yml
+++ b/_data/glossary/statefulset.yml
@@ -5,6 +5,7 @@ related:
 - deployment
 - pod
 tags:
+- fundamental
 - core-object
 - workload
 - storage