diff --git a/Makefile b/Makefile
index 9aaaa8f90..e5c7af429 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ else
 	ACTIVATE := $(VENV_DIR)/bin/activate
 endif
 
-WFTMPLS := $(wildcard workflows/*/workflowtemplates/*.yaml)
+WFTMPLS := $(wildcard components/*-workflows/*/workflowtemplates/*.yaml)
 
 .PHONY: help
 help: ## Displays this help message
@@ -31,6 +31,8 @@ $(ACTIVATE): requirements-docs.txt
 .PHONY: wftmpls
 wftmpls: $(WFTMPLS) $(ACTIVATE)
 	@mkdir -p docs/workflows
+	@$(PYTHON) scripts/argo-workflows-to-mkdocs.py components/global-workflows docs/workflows
+	@$(PYTHON) scripts/argo-workflows-to-mkdocs.py components/site-workflows docs/workflows
 	@$(PYTHON) scripts/argo-workflows-to-mkdocs.py workflows docs/workflows
 
 .PHONY: docs
diff --git a/apps/global/global-workflows.yaml b/apps/global/global-workflows.yaml
new file mode 100644
index 000000000..87fb0b82a
--- /dev/null
+++ b/apps/global/global-workflows.yaml
@@ -0,0 +1,8 @@
+---
+component: global-workflows
+componentNamespace: nautobot
+sources:
+  - ref: understack
+    path: 'components/global-workflows'
+  - ref: deploy
+    path: '{{.name}}/manifests/global-workflows'
diff --git a/apps/global/nautobot-workflows.yaml b/apps/global/nautobot-workflows.yaml
deleted file mode 100644
index 28977c000..000000000
--- a/apps/global/nautobot-workflows.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-component: nautobot-workflows
-componentNamespace: nautobot
-sources:
-  - ref: understack
-    path: 'workflows/nautobot'
diff --git a/apps/site/argo-events-workflows.yaml b/apps/site/argo-events-workflows.yaml
index bf5b87c75..652a28f38 100644
--- a/apps/site/argo-events-workflows.yaml
+++ b/apps/site/argo-events-workflows.yaml
@@ -4,3 +4,5 @@ componentNamespace: argo-events
 sources:
   - ref: understack
     path: 'workflows/argo-events'
+  - ref: deploy
+    path: '{{.name}}/manifests/argo-events-workflows'
diff --git a/apps/site/openstack-workflows.yaml b/apps/site/openstack-workflows.yaml
deleted file mode 100644
index 0fd861952..000000000
--- a/apps/site/openstack-workflows.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-component: openstack-workflows
-componentNamespace: openstack
-sources:
-  - ref: understack
-    path: 'workflows/openstack'
diff --git a/apps/site/site-workflows.yaml b/apps/site/site-workflows.yaml
new file mode 100644
index 000000000..5db520d53
--- /dev/null
+++ b/apps/site/site-workflows.yaml
@@ -0,0 +1,8 @@
+---
+component: site-workflows
+componentNamespace: openstack
+sources:
+  - ref: understack
+    path: 'components/site-workflows'
+  - ref: deploy
+    path: '{{.name}}/manifests/site-workflows'
diff --git a/workflows/nautobot/eventbus/eventbus-default.yaml b/components/global-workflows/eventbus/eventbus-default.yaml
similarity index 100%
rename from workflows/nautobot/eventbus/eventbus-default.yaml
rename to components/global-workflows/eventbus/eventbus-default.yaml
diff --git a/workflows/nautobot/eventbus/poddisruptionbudget-eventbus-default-pdb.yaml b/components/global-workflows/eventbus/poddisruptionbudget-eventbus-default-pdb.yaml
similarity index 100%
rename from workflows/nautobot/eventbus/poddisruptionbudget-eventbus-default-pdb.yaml
rename to components/global-workflows/eventbus/poddisruptionbudget-eventbus-default-pdb.yaml
diff --git a/workflows/nautobot/eventsources/k8s-secret-nautobot-token.yaml b/components/global-workflows/eventsources/k8s-secret-nautobot-token.yaml
similarity index 100%
rename from workflows/nautobot/eventsources/k8s-secret-nautobot-token.yaml
rename to components/global-workflows/eventsources/k8s-secret-nautobot-token.yaml
diff --git a/workflows/nautobot/kustomization.yaml b/components/global-workflows/kustomization.yaml
similarity index 94%
rename from workflows/nautobot/kustomization.yaml
rename to components/global-workflows/kustomization.yaml
index a38fd1d9f..01354d26d 100644
--- a/workflows/nautobot/kustomization.yaml
+++ b/components/global-workflows/kustomization.yaml
@@ -1,8 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-namespace: nautobot
-
 resources:
   - eventbus/eventbus-default.yaml
   - eventbus/poddisruptionbudget-eventbus-default-pdb.yaml
diff --git a/workflows/nautobot/sensors/k8s-nautobot-secret.yaml b/components/global-workflows/sensors/k8s-nautobot-secret.yaml
similarity index 100%
rename from workflows/nautobot/sensors/k8s-nautobot-secret.yaml
rename to components/global-workflows/sensors/k8s-nautobot-secret.yaml
diff --git a/workflows/nautobot/serviceaccounts/k8s-job-create.yaml b/components/global-workflows/serviceaccounts/k8s-job-create.yaml
similarity index 100%
rename from workflows/nautobot/serviceaccounts/k8s-job-create.yaml
rename to components/global-workflows/serviceaccounts/k8s-job-create.yaml
diff --git a/workflows/nautobot/serviceaccounts/k8s-secret-events-nautobot.yaml b/components/global-workflows/serviceaccounts/k8s-secret-events-nautobot.yaml
similarity index 100%
rename from workflows/nautobot/serviceaccounts/k8s-secret-events-nautobot.yaml
rename to components/global-workflows/serviceaccounts/k8s-secret-events-nautobot.yaml
diff --git a/workflows/openstack/eventbus/eventbus-default.yaml b/components/site-workflows/eventbus/eventbus-default.yaml
similarity index 100%
rename from workflows/openstack/eventbus/eventbus-default.yaml
rename to components/site-workflows/eventbus/eventbus-default.yaml
diff --git a/workflows/openstack/eventbus/poddisruptionbudget-eventbus-default-pdb.yaml b/components/site-workflows/eventbus/poddisruptionbudget-eventbus-default-pdb.yaml
similarity index 100%
rename from workflows/openstack/eventbus/poddisruptionbudget-eventbus-default-pdb.yaml
rename to components/site-workflows/eventbus/poddisruptionbudget-eventbus-default-pdb.yaml
diff --git a/workflows/openstack/eventsources/eventsource-k8s-openstack-neutron.yaml b/components/site-workflows/eventsources/eventsource-k8s-openstack-neutron.yaml
similarity index 100%
rename from workflows/openstack/eventsources/eventsource-k8s-openstack-neutron.yaml
rename to components/site-workflows/eventsources/eventsource-k8s-openstack-neutron.yaml
diff --git a/workflows/openstack/eventsources/eventsource-k8s-openstack-secrets.yaml b/components/site-workflows/eventsources/eventsource-k8s-openstack-secrets.yaml
similarity index 100%
rename from workflows/openstack/eventsources/eventsource-k8s-openstack-secrets.yaml
rename to components/site-workflows/eventsources/eventsource-k8s-openstack-secrets.yaml
diff --git a/workflows/openstack/eventsources/eventsource-openstack-ironic.yaml b/components/site-workflows/eventsources/eventsource-openstack-ironic.yaml
similarity index 100%
rename from workflows/openstack/eventsources/eventsource-openstack-ironic.yaml
rename to components/site-workflows/eventsources/eventsource-openstack-ironic.yaml
diff --git a/workflows/openstack/eventsources/eventsource-openstack-keystone.yaml b/components/site-workflows/eventsources/eventsource-openstack-keystone.yaml
similarity index 100%
rename from workflows/openstack/eventsources/eventsource-openstack-keystone.yaml
rename to components/site-workflows/eventsources/eventsource-openstack-keystone.yaml
diff --git a/workflows/openstack/eventsources/eventsource-openstack-neutron.yaml b/components/site-workflows/eventsources/eventsource-openstack-neutron.yaml
similarity index 100%
rename from workflows/openstack/eventsources/eventsource-openstack-neutron.yaml
rename to components/site-workflows/eventsources/eventsource-openstack-neutron.yaml
diff --git a/workflows/openstack/eventsources/rabbitmq-user-argo-ironic.yaml b/components/site-workflows/eventsources/rabbitmq-user-argo-ironic.yaml
similarity index 100%
rename from workflows/openstack/eventsources/rabbitmq-user-argo-ironic.yaml
rename to components/site-workflows/eventsources/rabbitmq-user-argo-ironic.yaml
diff --git a/workflows/openstack/eventsources/rabbitmq-user-argo-keystone.yaml b/components/site-workflows/eventsources/rabbitmq-user-argo-keystone.yaml
similarity index 100%
rename from workflows/openstack/eventsources/rabbitmq-user-argo-keystone.yaml
rename to components/site-workflows/eventsources/rabbitmq-user-argo-keystone.yaml
diff --git a/workflows/openstack/eventsources/rabbitmq-user-argo-neutron.yaml b/components/site-workflows/eventsources/rabbitmq-user-argo-neutron.yaml
similarity index 100%
rename from workflows/openstack/eventsources/rabbitmq-user-argo-neutron.yaml
rename to components/site-workflows/eventsources/rabbitmq-user-argo-neutron.yaml
diff --git a/workflows/openstack/kustomization.yaml b/components/site-workflows/kustomization.yaml
similarity index 98%
rename from workflows/openstack/kustomization.yaml
rename to components/site-workflows/kustomization.yaml
index b80903042..2d23b5606 100644
--- a/workflows/openstack/kustomization.yaml
+++ b/components/site-workflows/kustomization.yaml
@@ -1,8 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-namespace: openstack
-
 resources:
   - eventbus/eventbus-default.yaml
   - eventbus/poddisruptionbudget-eventbus-default-pdb.yaml
diff --git a/workflows/openstack/secrets/nautobot-token.yaml b/components/site-workflows/secrets/nautobot-token.yaml
similarity index 100%
rename from workflows/openstack/secrets/nautobot-token.yaml
rename to components/site-workflows/secrets/nautobot-token.yaml
diff --git a/workflows/openstack/secrets/openstack-svc-acct.yaml b/components/site-workflows/secrets/openstack-svc-acct.yaml
similarity index 100%
rename from workflows/openstack/secrets/openstack-svc-acct.yaml
rename to components/site-workflows/secrets/openstack-svc-acct.yaml
diff --git a/workflows/openstack/sensors/sensor-ironic-node-port.yaml b/components/site-workflows/sensors/sensor-ironic-node-port.yaml
similarity index 100%
rename from workflows/openstack/sensors/sensor-ironic-node-port.yaml
rename to components/site-workflows/sensors/sensor-ironic-node-port.yaml
diff --git a/workflows/openstack/sensors/sensor-ironic-node-update.yaml b/components/site-workflows/sensors/sensor-ironic-node-update.yaml
similarity index 100%
rename from workflows/openstack/sensors/sensor-ironic-node-update.yaml
rename to components/site-workflows/sensors/sensor-ironic-node-update.yaml
diff --git a/workflows/openstack/sensors/sensor-ironic-oslo-event.yaml b/components/site-workflows/sensors/sensor-ironic-oslo-event.yaml
similarity index 100%
rename from workflows/openstack/sensors/sensor-ironic-oslo-event.yaml
rename to components/site-workflows/sensors/sensor-ironic-oslo-event.yaml
diff --git a/workflows/openstack/sensors/sensor-ironic-reclean.yaml b/components/site-workflows/sensors/sensor-ironic-reclean.yaml
similarity index 100%
rename from workflows/openstack/sensors/sensor-ironic-reclean.yaml
rename to components/site-workflows/sensors/sensor-ironic-reclean.yaml
diff --git a/workflows/openstack/sensors/sensor-k8s-neutron-deployment.yaml b/components/site-workflows/sensors/sensor-k8s-neutron-deployment.yaml
similarity index 100%
rename from workflows/openstack/sensors/sensor-k8s-neutron-deployment.yaml
rename to components/site-workflows/sensors/sensor-k8s-neutron-deployment.yaml
diff --git a/workflows/openstack/sensors/sensor-keystone-event-project.yaml b/components/site-workflows/sensors/sensor-keystone-event-project.yaml
similarity index 96%
rename from workflows/openstack/sensors/sensor-keystone-event-project.yaml
rename to components/site-workflows/sensors/sensor-keystone-event-project.yaml
index 1d362700b..60e8330aa 100644
--- a/workflows/openstack/sensors/sensor-keystone-event-project.yaml
+++ b/components/site-workflows/sensors/sensor-keystone-event-project.yaml
@@ -3,7 +3,6 @@ apiVersion: argoproj.io/v1alpha1
 kind: Sensor
 metadata:
   name: keystone-event-project
-  namespace: argo-events
   annotations:
     workflows.argoproj.io/title: CRUD Nautobot Tenants from Keystone Projects
     workflows.argoproj.io/description: |+
@@ -24,7 +23,7 @@ metadata:
       -p event_type identity.project.created -p project_uuid=00000000-0000-0000-0000-000000000000
       ```
 
-      Defined in `workflows/openstack/sensor-keystone-event-project.yaml`
+      Defined in `components/site-workflows/sensors/sensor-keystone-event-project.yaml`
 spec:
   dependencies:
   - eventName: notifications
diff --git a/workflows/openstack/sensors/sensor-keystone-integration-reader-add.yaml b/components/site-workflows/sensors/sensor-keystone-integration-reader-add.yaml
similarity index 100%
rename from workflows/openstack/sensors/sensor-keystone-integration-reader-add.yaml
rename to components/site-workflows/sensors/sensor-keystone-integration-reader-add.yaml
diff --git a/workflows/openstack/sensors/sensor-keystone-integration-reader-rm.yaml b/components/site-workflows/sensors/sensor-keystone-integration-reader-rm.yaml
similarity index 100%
rename from workflows/openstack/sensors/sensor-keystone-integration-reader-rm.yaml
rename to components/site-workflows/sensors/sensor-keystone-integration-reader-rm.yaml
diff --git a/workflows/openstack/sensors/sensor-keystone-oslo-event.yaml b/components/site-workflows/sensors/sensor-keystone-oslo-event.yaml
similarity index 100%
rename from workflows/openstack/sensors/sensor-keystone-oslo-event.yaml
rename to components/site-workflows/sensors/sensor-keystone-oslo-event.yaml
diff --git a/workflows/openstack/sensors/sensor-neutron-event-network-segment-range.yaml b/components/site-workflows/sensors/sensor-neutron-event-network-segment-range.yaml
similarity index 97%
rename from workflows/openstack/sensors/sensor-neutron-event-network-segment-range.yaml
rename to components/site-workflows/sensors/sensor-neutron-event-network-segment-range.yaml
index 1eaa77f07..f47703daf 100644
--- a/workflows/openstack/sensors/sensor-neutron-event-network-segment-range.yaml
+++ b/components/site-workflows/sensors/sensor-neutron-event-network-segment-range.yaml
@@ -3,7 +3,6 @@ apiVersion: argoproj.io/v1alpha1
 kind: Sensor
 metadata:
   name: neutron-event-network-segment-range
-  namespace: argo-events
   annotations:
     workflows.argoproj.io/title: Add/edit Nautobot UCVNIGroup range field on Neutron network-segment-range operations
     workflows.argoproj.io/description: |+
@@ -18,7 +17,7 @@ metadata:
       -p event_type network_segment_range.create.end -p segment_min_range=1800 segment_max_range=3799
       ```
 
-      Defined in `workflows/openstack/sensor-neutron-event-network-segment-range.yaml`
+      Defined in `components/site-workflows/sensors/sensor-neutron-event-network-segment-range.yaml`
 spec:
   dependencies:
   - eventName: notifications
diff --git a/workflows/openstack/sensors/sensor-neutron-olso-event.yaml b/components/site-workflows/sensors/sensor-neutron-olso-event.yaml
similarity index 92%
rename from workflows/openstack/sensors/sensor-neutron-olso-event.yaml
rename to components/site-workflows/sensors/sensor-neutron-olso-event.yaml
index f858e2aa5..dd1a8b060 100644
--- a/workflows/openstack/sensors/sensor-neutron-olso-event.yaml
+++ b/components/site-workflows/sensors/sensor-neutron-olso-event.yaml
@@ -3,7 +3,6 @@ apiVersion: argoproj.io/v1alpha1
 kind: Sensor
 metadata:
   name: neutron-oslo-event
-  namespace: argo-events
   annotations:
     workflows.argoproj.io/title: Add/edit Nautobot objects according to Neutron events
     workflows.argoproj.io/description: |+
@@ -11,9 +10,9 @@ metadata:
 
       - network create/update/delete
 
-      Submits argo-events using workflowtemplate/openstack-oslo-event
+      Submits workflow using workflowtemplate/openstack-oslo-event
 
-      Defined in `workflows/openstack/sensor-neutron-oslo-event.yaml`
+      Defined in `components/site-workflows/sensors/sensor-neutron-oslo-event.yaml`
 spec:
   dependencies:
   - eventName: notifications
diff --git a/workflows/openstack/serviceaccounts/serviceaccount-k8s-openstack-events-secrets.yaml b/components/site-workflows/serviceaccounts/serviceaccount-k8s-openstack-events-secrets.yaml
similarity index 100%
rename from workflows/openstack/serviceaccounts/serviceaccount-k8s-openstack-events-secrets.yaml
rename to components/site-workflows/serviceaccounts/serviceaccount-k8s-openstack-events-secrets.yaml
diff --git a/workflows/openstack/serviceaccounts/serviceaccount-k8s-openstack-events.yaml b/components/site-workflows/serviceaccounts/serviceaccount-k8s-openstack-events.yaml
similarity index 100%
rename from workflows/openstack/serviceaccounts/serviceaccount-k8s-openstack-events.yaml
rename to components/site-workflows/serviceaccounts/serviceaccount-k8s-openstack-events.yaml
diff --git a/workflows/openstack/serviceaccounts/serviceaccount-sensor-submit-workflow.yaml b/components/site-workflows/serviceaccounts/serviceaccount-sensor-submit-workflow.yaml
similarity index 100%
rename from workflows/openstack/serviceaccounts/serviceaccount-sensor-submit-workflow.yaml
rename to components/site-workflows/serviceaccounts/serviceaccount-sensor-submit-workflow.yaml
diff --git a/workflows/argo-events/kustomization.yaml b/workflows/argo-events/kustomization.yaml
index 8eccd7c74..fe81cf73f 100644
--- a/workflows/argo-events/kustomization.yaml
+++ b/workflows/argo-events/kustomization.yaml
@@ -1,9 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-# this is where our workflows currently run
-namespace: argo-events
-
 resources:
   - eventbus/eventbus-default.yaml
   - eventbus/poddisruptionbudget-eventbus-default-pdb.yaml
diff --git a/workflows/kustomization.yaml b/workflows/kustomization.yaml
deleted file mode 100644
index 610bf888a..000000000
--- a/workflows/kustomization.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-  - openstack
-  - argo-events
-  - nautobot