diff --git a/configs/1-1-localhost-windows-system.json b/configs/1-1-localhost-windows-system.json
index f61b7fef0..4f904283f 100644
--- a/configs/1-1-localhost-windows-system.json
+++ b/configs/1-1-localhost-windows-system.json
@@ -12,6 +12,8 @@
       "description": "Windows Machine",
       "hint": "Select your localhost OS.",
       "supportedOs": ["Windows"],
+      "productTags": [],
+      "filterTags": [],
       "datasources": [
         {
           "name": "System",
@@ -26,7 +28,7 @@
                 "receivers": ["filelog","windowseventlog_application","windowseventlog_security","windowseventlog_system"],
                 "processors": ["resourcedetection_system"]
 				      },
-              "params": 
+              "params":
               [
                 {
                   "type": "string-list",
diff --git a/configs/1-2-localhost-linux-system.json b/configs/1-2-localhost-linux-system.json
index ca1f0c01b..6144c28fb 100644
--- a/configs/1-2-localhost-linux-system.json
+++ b/configs/1-2-localhost-linux-system.json
@@ -12,6 +12,8 @@
       "description": "Linux Machine",
       "hint": "Select your localhost OS.",
       "supportedOs": ["Linux"],
+      "productTags": [],
+      "filterTags": [],
       "datasources": [
         {
           "name": "System",
diff --git a/configs/1-3-localhost-mac-system.json b/configs/1-3-localhost-mac-system.json
index d83083e88..b3b094c38 100644
--- a/configs/1-3-localhost-mac-system.json
+++ b/configs/1-3-localhost-mac-system.json
@@ -12,6 +12,8 @@
       "description": "Mac Machine",
       "hint": "Select your localhost OS.",
       "supportedOs": ["Mac"],
+      "productTags": [],
+      "filterTags": [],
       "datasources": [
         {
           "name": "System",
diff --git a/configs/2-1-k8s-eks.json b/configs/2-1-k8s-eks.json
index 2ec977ef8..c40dfcf86 100644
--- a/configs/2-1-k8s-eks.json
+++ b/configs/2-1-k8s-eks.json
@@ -13,6 +13,8 @@
       "description": "AWS Kubernetes",
       "hint": "Select your cloud Kubernetes service.",
       "supportedOs": ["Helm", "Mac", "Windows", "Linux"],
+      "productTags": [],
+      "filterTags": [],
       "capabilities": ["SPM"],
       "datasources": [
         {
diff --git a/configs/2-2-k8s-aks.json b/configs/2-2-k8s-aks.json
index 0f2dc649e..8a5a57727 100644
--- a/configs/2-2-k8s-aks.json
+++ b/configs/2-2-k8s-aks.json
@@ -11,6 +11,8 @@
       "label": "AKS",
       "description": "Azure Kubernetes",
       "supportedOs": ["Helm", "Mac", "Windows", "Linux"],
+      "productTags": [],
+      "filterTags": [],
       "capabilities": ["SPM"],
       "datasources": [
         {
diff --git a/configs/2-3-k8s-gke.json b/configs/2-3-k8s-gke.json
index fe97c30a2..ecf67fea8 100644
--- a/configs/2-3-k8s-gke.json
+++ b/configs/2-3-k8s-gke.json
@@ -13,6 +13,8 @@
       "description": "GCP Kubernetes",
       "hint": "Select your cloud Kubernetes service.",
       "supportedOs": ["Helm", "Mac", "Windows", "Linux"],
+      "productTags": [],
+      "filterTags": [],
       "capabilities": ["SPM"],
       "datasources": [
         {
diff --git a/configs/2-4-k8s-digitalocean.json b/configs/2-4-k8s-digitalocean.json
index 2c4f3b82b..06ff9d435 100644
--- a/configs/2-4-k8s-digitalocean.json
+++ b/configs/2-4-k8s-digitalocean.json
@@ -13,6 +13,8 @@
       "description": "Managed Kubernetes",
       "hint": "Select your cloud Kubernetes service.",
       "supportedOs": ["Helm", "Mac", "Windows", "Linux"],
+      "productTags": [],
+      "filterTags": [],
       "capabilities": ["SPM"],
       "datasources": [
         {
diff --git a/configs/3-1-aws-cw.json b/configs/3-1-aws-cw.json
index 1a713cee6..50413651c 100644
--- a/configs/3-1-aws-cw.json
+++ b/configs/3-1-aws-cw.json
@@ -12,6 +12,8 @@
        "description": "via Cloudwatch",
        "hint": "Cloudwatch logs to ship to Logz.io",
        "supportedOs": ["AWS_Cloudformation"],
+       "productTags": [],
+      "filterTags": [],
        "integrationTemplate": "firehose-logs/0.0.2/sam-template.yaml&param_logzioType=agent-logzio-firehose&param_logzioListener=https://aws-firehose-logs-<<LOGZIO_LISTENER_ADDRESS>>",
        "datasources": [
          {
@@ -86,7 +88,7 @@
                     { "label": "RDS", "value": "rds" }
                   ]
                 },
-                { 
+                {
                   "type": "string-list",
                   "name": "param_customLogGroups",
                   "label": "Custom Log Groups",
@@ -102,4 +104,3 @@
      }
    ]
  }
- 
\ No newline at end of file
diff --git a/configs/3-2-aws-metric-stream.json b/configs/3-2-aws-metric-stream.json
index 7dd5c1b23..cdd45d4c9 100644
--- a/configs/3-2-aws-metric-stream.json
+++ b/configs/3-2-aws-metric-stream.json
@@ -12,6 +12,8 @@
        "description": "via Cloudwatch",
        "hint": "AWS metrics to ship to Logz.io",
        "supportedOs": ["AWS_Cloudformation"],
+       "productTags": [],
+       "filterTags": [],
        "integrationTemplate": "metric-stream-helpers/aws/1.2.4/sam-template.yaml&param_logzioDestination=https://listener-aws-metrics-stream-<<LOGZIO_ACCOUNT_REGION_CODE>>.logz.io/&param_logzioListener=https://<<LOGZIO_LISTENER_ADDRESS>>:8053",
        "datasources": [
          {
@@ -210,4 +212,3 @@
      }
    ]
  }
- 
\ No newline at end of file
diff --git a/configs/3-3-aws-ec2-linux-system.json b/configs/3-3-aws-ec2-linux-system.json
index f231240bd..c609a9a42 100644
--- a/configs/3-3-aws-ec2-linux-system.json
+++ b/configs/3-3-aws-ec2-linux-system.json
@@ -12,6 +12,8 @@
        "description": "Linux Logs & Metrics",
        "hint": "EC2 with Linux.",
        "supportedOs": ["Linux"],
+       "productTags": [],
+       "filterTags": [],
        "datasources": [
          {
            "name": "System",
@@ -57,4 +59,3 @@
      }
    ]
  }
- 
\ No newline at end of file
diff --git a/configs/4-1-gcp-logs.json b/configs/4-1-gcp-logs.json
index b601e339b..280ef72d4 100644
--- a/configs/4-1-gcp-logs.json
+++ b/configs/4-1-gcp-logs.json
@@ -11,6 +11,8 @@
             "description": "Cloud Logging",
             "hint": "Logging from GCP services.",
             "supportedOs": ["GCP"],
+            "productTags": [],
+            "filterTags": [],
             "integrationTemplate": "https://ssh.cloud.google.com/cloudshell/editor?cloudshell_git_repo=https://github.com/logzio/logzio-google-pubsub",
             "datasources": [
                 {
diff --git a/configs/4-2-gcp-metrics.json b/configs/4-2-gcp-metrics.json
index 9e4a310e6..c82f8b17f 100644
--- a/configs/4-2-gcp-metrics.json
+++ b/configs/4-2-gcp-metrics.json
@@ -11,6 +11,8 @@
             "description": "Cloud Monitoring",
             "hint": "Metrics from GCP services.",
             "supportedOs": ["GCP"],
+            "productTags": [],
+            "filterTags": [],
             "integrationTemplate": "https://ssh.cloud.google.com/cloudshell/editor?cloudshell_git_repo=https://github.com/logzio/logzio-google-metrics",
             "datasources": [
                 {
diff --git a/configs/5-1-fetcher-azure.json b/configs/5-1-fetcher-azure.json
index 3f6645440..eab729346 100644
--- a/configs/5-1-fetcher-azure.json
+++ b/configs/5-1-fetcher-azure.json
@@ -11,6 +11,8 @@
       "supportedOs": [
         "Fetcher"
       ],
+      "productTags": [],
+      "filterTags": [],
       "integrationTemplate": "https://ssh.cloud.google.com/cloudshell/editor?cloudshell_git_repo=https://github.com/logzio/logzio-google-metrics",
       "datasources": [
         {
diff --git a/configs/5-2-fetcher-azure-logs.json b/configs/5-2-fetcher-azure-logs.json
index ab8a8fbd3..1f94e2bd0 100644
--- a/configs/5-2-fetcher-azure-logs.json
+++ b/configs/5-2-fetcher-azure-logs.json
@@ -11,6 +11,8 @@
       "supportedOs": [
         "Fetcher"
       ],
+      "productTags": [],
+      "filterTags": [],
       "datasources": [
         {
           "name": "azure-monitor-logs",