diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70b4b770..838ece30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Change ownership from BigMac to Shield
+
 ## [3.24.0] - 2024-09-23
 
 ### Changed
diff --git a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/api-security.json b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/api-security.json
index 18dc4f49..176fb23c 100644
--- a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/api-security.json
+++ b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/api-security.json
@@ -945,7 +945,7 @@
   "refresh": "",
   "schemaVersion": 39,
   "tags": [
-    "owner:team-bigmac",
+    "owner:team-shield",
     "provider:aws",
     "provider:azure",
     "topic:management-cluster"
diff --git a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/certificate-requests.json b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/certificate-requests.json
index 8c122995..5ebdb1fc 100644
--- a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/certificate-requests.json
+++ b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/certificate-requests.json
@@ -207,7 +207,7 @@
   "schemaVersion": 36,
   "style": "dark",
   "tags": [
-    "owner:team-bigmac"
+    "owner:team-shield"
   ],
   "templating": {
     "list": [
diff --git a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/certificates.json b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/certificates.json
index 6cbb920e..fb11aaae 100644
--- a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/certificates.json
+++ b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/certificates.json
@@ -363,7 +363,7 @@
   ],
   "schemaVersion": 39,
   "tags": [
-    "owner:team-bigmac"
+    "owner:team-shield"
   ],
   "templating": {
     "list": [
diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/certificates-details.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/certificates-details.json
index 1bd58650..fbabc622 100644
--- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/certificates-details.json
+++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/certificates-details.json
@@ -177,7 +177,7 @@
   "schemaVersion": 36,
   "style": "dark",
   "tags": [
-    "owner:team-bigmac"
+    "owner:team-shield"
   ],
   "templating": {
     "list": [
diff --git a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/dex.json b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/dex.json
index e06b1227..8d90cce6 100644
--- a/helm/dashboards/charts/public_dashboards/dashboards/shared/public/dex.json
+++ b/helm/dashboards/charts/public_dashboards/dashboards/shared/public/dex.json
@@ -511,7 +511,7 @@
   "schemaVersion": 33,
   "style": "dark",
   "tags": [
-    "owner:team-bigmac",
+    "owner:team-shield",
     "provider:aws",
     "provider:azure",
     "topic:management-cluster",