diff --git a/.github/commands.json b/.github/commands.json
index 9a6cc66fb79..2195d461d01 100644
--- a/.github/commands.json
+++ b/.github/commands.json
@@ -371,14 +371,6 @@
       "url": "https://github.com/orgs/grafana/projects/56"
     }
   },
-  {
-    "type": "label",
-    "name": "area/panel/icon",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
   {
     "type": "label",
     "name": "area/panel/piechart",
@@ -440,10 +432,26 @@
     "name": "area/panel/table",
     "action": "addToProject",
     "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/72"
+      "url": "https://github.com/orgs/grafana/projects/56"
     }
   },
-   {
+  {
+    "type": "label",
+    "name": "area/tooltip",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/56"
+    }
+  },
+  {
+    "type": "label",
+    "name": "area/legend",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/56"
+    }
+  },
+  {
     "type": "label",
     "name": "grafana program",
     "action": "addToProject",
@@ -451,4 +459,4 @@
       "url": "https://github.com/orgs/grafana/projects/471"
     }
   }
-]
+]
\ No newline at end of file
diff --git a/.github/pr-commands.json b/.github/pr-commands.json
index 0e4f0da1150..b22d83dc536 100644
--- a/.github/pr-commands.json
+++ b/.github/pr-commands.json
@@ -216,223 +216,95 @@
     "action": "updateLabel",
     "addLabel": "area/panel/candlestick"
   },
-  {
-    "type": "label",
-    "name": "area/panel/candlestick",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
   {
     "type": "changedfiles",
     "matches": ["public/app/plugins/panel/canvas/**/*", "/public/app/features/canvas/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/canvas"
   },
-  {
-    "type": "label",
-    "name": "area/panel/canvas",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
   {
     "type": "changedfiles",
     "matches": ["public/app/plugins/panel/barchart/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/barchart"
   },
-  {
-    "type": "label",
-    "name": "area/panel/barchart",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
   {
     "type": "changedfiles",
     "matches": ["public/app/plugins/panel/geomap/**/*", "/public/app/features/geo/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/geomap"
   },
-  {
-    "type": "label",
-    "name": "area/panel/geomap",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
   {
     "type": "changedfiles",
     "matches": ["public/app/plugins/panel/graph/**/*", "/packages/grafana-ui/src/components/Graph/**/*", "/packages/grafana-ui/src/components/GraphNG/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/graph"
   },
-  {
-    "type": "label",
-    "name": "area/panel/graph",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
   {
     "type": "changedfiles",
     "matches": ["public/app/plugins/panel/heatmap/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/heatmap"
   },
-  {
-    "type": "label",
-    "name": "area/panel/heatmap",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
   {
     "type": "changedfiles",
     "matches": ["public/app/plugins/panel/histogram/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/histogram"
   },
-  {
-    "type": "label",
-    "name": "area/panel/histogram",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
   {
     "type": "changedfiles",
     "matches": ["public/app/plugins/panel/state-timeline/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/state-timeline"
   },
-  {
-    "type": "label",
-    "name": "area/panel/state-timeline",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
   {
     "type": "changedfiles",
     "matches": ["public/app/plugins/panel/status-history/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/status-history"
   },
-  {
-    "type": "label",
-    "name": "area/panel/status-history",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
   {
     "type": "changedfiles",
     "matches": ["public/app/plugins/panel/timeseries/**/*", "/packages/grafana-ui/src/components/TimeSeries/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/timeseries"
   },
-  {
-    "type": "label",
-    "name": "area/panel/timeseries",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
   {
     "type": "changedfiles",
     "matches": ["public/app/plugins/panel/xychart/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/xychart"
   },
-  {
-    "type": "label",
-    "name": "area/panel/xychart",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
   {
     "type": "changedfiles",
     "matches": ["public/app/plugins/panel/trend/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/trend"
   },
-  {
-    "type": "label",
-    "name": "area/panel/trend",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
   {
     "type": "changedfiles",
     "matches": ["/packages/grafana-ui/src/components/VizLegend/**/*"],
     "action": "updateLabel",
     "addLabel": "area/legend"
   },
-  {
-    "type": "label",
-    "name": "area/legend",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
   {
     "type": "changedfiles",
     "matches": ["/packages/grafana-ui/src/components/VizTooltip/**/*", "public/app/feature/visualization/data-hover/**/*" ],
     "action": "updateLabel",
     "addLabel": "area/tooltip"
   },
-  {
-    "type": "label",
-    "name": "area/tooltip",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
   {
     "type": "changedfiles",
     "matches": ["public/app/plugins/panel/gauge/**/*", "/packages/grafana-ui/src/components/Gauge/**/*"],
     "action": "updateLabel",
     "addLabel": "area/panel/gauge"
   },
-  {
-    "type": "label",
-    "name": "area/panel/gauge",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
   {
     "type": "changedfiles",
     "matches": ["public/app/plugins/panel/bargauge/**/*", "/packages/grafana-ui/src/components/BarGauge/**/*"],
     "action": "updateLabel",
-    "addLabel": "area/panel/gauge"
-  },
-  {
-    "type": "label",
-    "name": "area/panel/bargauge",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
+    "addLabel": "area/panel/bargauge"
   },
   {
     "type": "changedfiles",
@@ -440,14 +312,6 @@
     "action": "updateLabel",
     "addLabel": "area/panel/stat"
   },
-  {
-    "type": "label",
-    "name": "area/panel/stat",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
-  },
   {
     "type": "changedfiles",
     "matches": ["public/app/plugins/panel/piechart/**/*"],
@@ -455,11 +319,9 @@
     "addLabel": "area/panel/piechart"
   },
   {
-    "type": "label",
-    "name": "area/panel/piechart",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/56"
-    }
+    "type": "changedfiles",
+    "matches": ["public/app/plugins/panel/table/**/*", "/packages/grafana-ui/src/components/Table/**/*"],
+    "action": "updateLabel",
+    "addLabel": "area/panel/table"
   }
-]
+]
\ No newline at end of file