diff --git a/azure-aro/specs/notification-channel.json.tpl b/azure-aro/specs/notification-channel.json.tpl
index f1db58e5..6f5ba36c 100644
--- a/azure-aro/specs/notification-channel.json.tpl
+++ b/azure-aro/specs/notification-channel.json.tpl
@@ -1,6 +1,7 @@
 {
   "nrn": "{{ env.Getenv "NRN" }}",
   "status": "active",
+  "description": "Channel to handle ARO Containers scopes",
   "type": "agent",
   "source": [
     "telemetry",
diff --git a/azure-aro/specs/service-spec.json.tpl b/azure-aro/specs/service-spec.json.tpl
index d18a2d7c..a3a495ac 100644
--- a/azure-aro/specs/service-spec.json.tpl
+++ b/azure-aro/specs/service-spec.json.tpl
@@ -476,7 +476,7 @@
          "cpu_millicores":{
             "type":"integer",
             "title":"CPU Millicores",
-            "default":500,
+            "default":100,
             "maximum":4000,
             "minimum":100,
             "description":"Amount of CPU to allocate (in millicores, 1000m = 1 CPU core)"
@@ -630,10 +630,10 @@
   },
   "name": "Containers",
   "selectors": {
-    "category": "any",
+    "category": "Scope",
     "imported": false,
-    "provider": "any",
-    "sub_category": "any"
+    "provider": "Agent",
+    "sub_category": "Containers"
   },
   "type": "scope",
   "use_default_actions": false,
diff --git a/azure/specs/notification-channel.json.tpl b/azure/specs/notification-channel.json.tpl
index f1db58e5..74be3439 100644
--- a/azure/specs/notification-channel.json.tpl
+++ b/azure/specs/notification-channel.json.tpl
@@ -1,6 +1,7 @@
 {
   "nrn": "{{ env.Getenv "NRN" }}",
   "status": "active",
+  "description": "Channel to handle Azure Containers scopes",
   "type": "agent",
   "source": [
     "telemetry",
diff --git a/azure/specs/service-spec.json.tpl b/azure/specs/service-spec.json.tpl
index ca47ae5d..562a1d9e 100644
--- a/azure/specs/service-spec.json.tpl
+++ b/azure/specs/service-spec.json.tpl
@@ -476,7 +476,7 @@
          "cpu_millicores":{
             "type":"integer",
             "title":"CPU Millicores",
-            "default":500,
+            "default":100,
             "maximum":4000,
             "minimum":100,
             "description":"Amount of CPU to allocate (in millicores, 1000m = 1 CPU core)"
@@ -630,10 +630,10 @@
   },
   "name": "Containers",
   "selectors": {
-    "category": "any",
+    "category": "Scope",
     "imported": false,
-    "provider": "any",
-    "sub_category": "any"
+    "provider": "Agent",
+    "sub_category": "Containers"
   },
   "type": "scope",
   "use_default_actions": false,
diff --git a/k8s/specs/notification-channel.json.tpl b/k8s/specs/notification-channel.json.tpl
index ee3c7986..30fad0e3 100644
--- a/k8s/specs/notification-channel.json.tpl
+++ b/k8s/specs/notification-channel.json.tpl
@@ -1,6 +1,7 @@
 {
   "nrn": "{{ env.Getenv "NRN" }}",
   "status": "active",
+  "description": "Channel to handle Containers scopes",
   "type": "agent",
   "source": [
     "telemetry",
diff --git a/k8s/specs/service-spec.json.tpl b/k8s/specs/service-spec.json.tpl
index ca47ae5d..562a1d9e 100644
--- a/k8s/specs/service-spec.json.tpl
+++ b/k8s/specs/service-spec.json.tpl
@@ -476,7 +476,7 @@
          "cpu_millicores":{
             "type":"integer",
             "title":"CPU Millicores",
-            "default":500,
+            "default":100,
             "maximum":4000,
             "minimum":100,
             "description":"Amount of CPU to allocate (in millicores, 1000m = 1 CPU core)"
@@ -630,10 +630,10 @@
   },
   "name": "Containers",
   "selectors": {
-    "category": "any",
+    "category": "Scope",
     "imported": false,
-    "provider": "any",
-    "sub_category": "any"
+    "provider": "Agent",
+    "sub_category": "Containers"
   },
   "type": "scope",
   "use_default_actions": false,
diff --git a/scheduled_task/specs/notification-channel.json.tpl b/scheduled_task/specs/notification-channel.json.tpl
index f1db58e5..080fdef7 100644
--- a/scheduled_task/specs/notification-channel.json.tpl
+++ b/scheduled_task/specs/notification-channel.json.tpl
@@ -1,6 +1,7 @@
 {
   "nrn": "{{ env.Getenv "NRN" }}",
   "status": "active",
+  "description": "Channel to handle Scheduled tasks scopes",
   "type": "agent",
   "source": [
     "telemetry",
diff --git a/scheduled_task/specs/service-spec.json.tpl b/scheduled_task/specs/service-spec.json.tpl
index f6ce2009..b5e07068 100644
--- a/scheduled_task/specs/service-spec.json.tpl
+++ b/scheduled_task/specs/service-spec.json.tpl
@@ -87,7 +87,7 @@
               "type": "number"
             }
           ],
-          "default": 500,
+          "default": 100,
           "description": "Amount of CPU to allocate (in millicores, 1000m = 1 CPU core)",
           "title": "CPU Millicores",
           "type": "integer"
@@ -285,10 +285,10 @@
   "dimensions": {},
   "name": "Scheduled task",
   "selectors": {
-    "category": "any",
+    "category": "Scope",
     "imported": false,
-    "provider": "any",
-    "sub_category": "any"
+    "provider": "Agent",
+    "sub_category": "Scheduled task"
   },
   "type": "scope",
   "use_default_actions": false,