diff --git a/GaugeChart/package.json b/GaugeChart/package.json
index b832b30..1ca4b84 100644
--- a/GaugeChart/package.json
+++ b/GaugeChart/package.json
@@ -31,11 +31,13 @@
   "perses": {
     "plugins": [
       {
-        "display": {
-          "name": "Gauge Chart"
-        },
-        "kind": "GaugeChart",
-        "pluginType": "Panel"
+        "kind": "Panel",
+        "spec": {
+          "name": "GaugeChart",
+          "display": {
+            "name": "Gauge Chart"
+          }
+        }
       }
     ]
   }
diff --git a/MarkdownChart/package.json b/MarkdownChart/package.json
index 355bf5a..c798465 100644
--- a/MarkdownChart/package.json
+++ b/MarkdownChart/package.json
@@ -33,11 +33,13 @@
   "perses": {
     "plugins": [
       {
-        "display": {
-          "name": "Markdown Chart"
-        },
-        "kind": "MarkdownChart",
-        "pluginType": "Panel"
+        "kind": "Panel",
+        "spec": {
+          "display": {
+            "name": "Markdown Chart"
+          },
+          "name": "MarkdownChart"
+        }
       }
     ]
   }
diff --git a/Prometheus/package.json b/Prometheus/package.json
index ab09d78..019ea87 100644
--- a/Prometheus/package.json
+++ b/Prometheus/package.json
@@ -33,39 +33,49 @@
   "perses": {
     "plugins": [
       {
-        "display": {
-          "name": "Prometheus Datasource"
-        },
-        "kind": "PrometheusDatasource",
-        "pluginType": "Datasource"
+        "kind": "Datasource",
+        "spec": {
+          "display": {
+            "name": "Prometheus Datasource"
+          },
+          "name": "PrometheusDatasource"
+        }
       },
       {
-        "display": {
-          "name": "Prometheus Time Series Query"
-        },
-        "kind": "PrometheusTimeSeriesQuery",
-        "pluginType": "TimeSeriesQuery"
+        "kind": "TimeSeriesQuery",
+        "spec": {
+          "display": {
+            "name": "Prometheus Time Series Query"
+          },
+          "name": "PrometheusTimeSeriesQuery"
+        }
       },
       {
-        "display": {
-          "name": "Prometheus Label Variable"
-        },
-        "kind": "PrometheusLabelValuesVariable",
-        "pluginType": "Variable"
+        "kind": "Variable",
+        "spec": {
+          "display": {
+            "name": "Prometheus Label Variable"
+          },
+          "name": "PrometheusLabelValuesVariable"
+        }
       },
       {
-        "display": {
-          "name": "Prometheus Names Variable"
-        },
-        "kind": "PrometheusLabelNamesVariable",
-        "pluginType": "Variable"
+        "kind": "Variable",
+        "spec": {
+          "display": {
+            "name": "Prometheus Names Variable"
+          },
+          "name": "PrometheusLabelNamesVariable"
+        }
       },
       {
-        "display": {
-          "name": "Prometheus PromQL Variable"
-        },
-        "kind": "PrometheusPromQLVariable",
-        "pluginType": "Variable"
+        "kind": "Variable",
+        "spec": {
+          "display": {
+            "name": "Prometheus PromQL Variable"
+          },
+          "name": "PrometheusPromQLVariable"
+        }
       }
     ]
   }
diff --git a/StatChart/package.json b/StatChart/package.json
index 4d12674..c04294e 100644
--- a/StatChart/package.json
+++ b/StatChart/package.json
@@ -31,11 +31,13 @@
   "perses": {
     "plugins": [
       {
-        "display": {
-          "name": "Stat Chart"
-        },
-        "kind": "StatChart",
-        "pluginType": "Panel"
+        "kind": "Panel",
+        "spec": {
+          "display": {
+            "name": "Stat Chart"
+          },
+          "name": "StatChart"
+        }
       }
     ]
   }
diff --git a/StaticListVariable/package.json b/StaticListVariable/package.json
index 8e2b854..2731ed5 100644
--- a/StaticListVariable/package.json
+++ b/StaticListVariable/package.json
@@ -32,11 +32,13 @@
   "perses": {
     "plugins": [
       {
-        "display": {
-          "name": "Static List Variable"
-        },
-        "kind": "StaticListVariable",
-        "pluginType": "Variable"
+        "kind": "Variable",
+        "spec": {
+          "display": {
+            "name": "Static List Variable"
+          },
+          "name": "StaticListVariable"
+        }
       }
     ]
   }
diff --git a/TimeSeriesChart/package.json b/TimeSeriesChart/package.json
index dada103..38cf43d 100644
--- a/TimeSeriesChart/package.json
+++ b/TimeSeriesChart/package.json
@@ -32,11 +32,13 @@
   "perses": {
     "plugins": [
       {
-        "display": {
-          "name": "Time Series Chart"
-        },
-        "kind": "TimeSeriesChart",
-        "pluginType": "Panel"
+        "kind": "Panel",
+        "spec": {
+          "display": {
+            "name": "Time Series Chart"
+          },
+          "name": "TimeSeriesChart"
+        }
       }
     ]
   }