diff --git a/CODEOWNERS b/CODEOWNERS
index 5fd4b0e1..f4f03549 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -5,3 +5,6 @@
 # Order is important: later rules override preceding rules
 
 * @mesosphere/sig-ksphere-catalog
+
+# Prometheus
+addons/prometheus/* @mesosphere/sig-ksphere-observability 
diff --git a/test/groups.yaml b/test/groups.yaml
index 097544fe..6b5c157f 100644
--- a/test/groups.yaml
+++ b/test/groups.yaml
@@ -109,11 +109,11 @@ aws:
 #
 # All Azure utility addons should be tested as a part of this group
 # ------------------------------------------------------------------------------
-azure:
-    - "defaultstorageclass-protection"
-    - "cert-manager"
-    - "azuredisk-csi-driver"
-    - "azurediskprovisioner"
+#azure:
+#    - "defaultstorageclass-protection"
+#    - "cert-manager"
+#    - "azuredisk-csi-driver"
+#    - "azurediskprovisioner"
 
 # ------------------------------------------------------------------------------
 # Disabled
@@ -125,6 +125,9 @@ disabled:
     # See: https://jira.mesosphere.com/browse/DCOS-61664
     - "nvidia"
     - "awsebsprovisioner"
+    # TODO: Azure not working in TC yet
+    - "azuredisk-csi-driver"
+    - "azurediskprovisioner"
     # TODO: Konvoy doesn't fully support GCP just yet
     - "gcpdisk-csi-driver"
     - "gcpdiskprovisioner"