diff --git a/config/events/register_agent_at_kas.yml b/config/events/register_agent_at_kas.yml
index 5c9eabfaa7b2435a57fd284de8df1dd6ebc9191e..8be4db6b3640471275a4bde0824ff3d7c8192fe7 100644
--- a/config/events/register_agent_at_kas.yml
+++ b/config/events/register_agent_at_kas.yml
@@ -1,5 +1,5 @@
 ---
-description: Agents send the register request to KAS periodically (default every 5 min). KAS registers the agent to keep track of connected agents.
+description: Gitlab Agent for Kubernetes (agentk) registered at KAS
 internal_events: true
 action: register_agent_at_kas
 identifiers:
diff --git a/config/events/register_agentw_at_kas.yml b/config/events/register_agentw_at_kas.yml
new file mode 100644
index 0000000000000000000000000000000000000000..5148273868d6f8ab4fa553f1c2c35f23f107cc2e
--- /dev/null
+++ b/config/events/register_agentw_at_kas.yml
@@ -0,0 +1,25 @@
+---
+description: GitLab Agent for Workspace (agentw) registered at KAS
+internal_events: true
+status: active
+action: register_agentw_at_kas
+identifiers:
+- project
+- namespace
+- user
+additional_properties:
+  label:
+    description: GitLab Agent version
+  property:
+    description: CPU architecture of the agent, e.g. x86_64
+  value:
+    description: GitLab Agent unique id
+product_group: environments
+product_categories:
+- continuous_delivery
+milestone: '18.2'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/194418
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/count_distinct_project_id_from_register_agentw_at_kas.yml b/config/metrics/counts_all/count_distinct_project_id_from_register_agentw_at_kas.yml
new file mode 100644
index 0000000000000000000000000000000000000000..21505e2eb3d426ab64361d8e73e81d99ee4a116d
--- /dev/null
+++ b/config/metrics/counts_all/count_distinct_project_id_from_register_agentw_at_kas.yml
@@ -0,0 +1,23 @@
+---
+key_path: redis_hll_counters.count_distinct_project_id_from_register_agentw_at_kas
+description: Count of unique projects that GitLab Agent for Workspace (agentw) was registered at KAS
+product_group: environments
+product_categories:
+- continuous_delivery
+performance_indicator_type: []
+value_type: number
+status: active
+milestone: '18.2'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/194418
+time_frame:
+- 28d
+- 7d
+data_source: internal_events
+data_category: optional
+tiers:
+- free
+- premium
+- ultimate
+events:
+- name: register_agentw_at_kas
+  unique: project.id
diff --git a/config/metrics/counts_all/count_total_register_agentw_at_kas.yml b/config/metrics/counts_all/count_total_register_agentw_at_kas.yml
new file mode 100644
index 0000000000000000000000000000000000000000..301004c1c6712fb34adde3351379710db47c5bf3
--- /dev/null
+++ b/config/metrics/counts_all/count_total_register_agentw_at_kas.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.count_total_register_agentw_at_kas
+description: Count of GitLab Agent for Workspace (agentw) registered at KAS
+product_group: environments
+product_categories:
+- continuous_delivery
+performance_indicator_type: []
+value_type: number
+status: active
+milestone: '18.2'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/194418
+time_frame:
+- 28d
+- 7d
+data_source: internal_events
+data_category: optional
+tiers:
+- free
+- premium
+- ultimate
+events:
+- name: register_agentw_at_kas