diff --git a/clickhouse/cue.mod/module.cue b/clickhouse/cue.mod/module.cue
index 3eed7c558..a5b19d41f 100644
--- a/clickhouse/cue.mod/module.cue
+++ b/clickhouse/cue.mod/module.cue
@@ -7,7 +7,11 @@ source: {
 }
 deps: {
 	"github.com/perses/shared/cue@v0": {
-		v:       "v0.53.1"
+		v:       "v0.54.0-beta.8"
+		default: true
+	}
+	"github.com/perses/spec/cue@v0": {
+		v:       "v0.2.0-beta.6"
 		default: true
 	}
 }
diff --git a/clickhouse/schemas/datasources/click-house-datasource/click-house-datasource.cue b/clickhouse/schemas/datasources/click-house-datasource/click-house-datasource.cue
index 0e82bdb9a..709efd5d7 100644
--- a/clickhouse/schemas/datasources/click-house-datasource/click-house-datasource.cue
+++ b/clickhouse/schemas/datasources/click-house-datasource/click-house-datasource.cue
@@ -15,14 +15,14 @@ package model
 
 import (
 	"github.com/perses/shared/cue/common"
-	commonProxy "github.com/perses/shared/cue/common/proxy"
+	"github.com/perses/spec/cue/datasource"
 )
 
 #kind: "ClickHouseDatasource"
 
 kind: #kind
 spec: {
-	commonProxy.#baseHTTPDatasourceSpec
+	datasource.#HTTPDatasourceSpec
 }
 
 #selector: common.#datasourceSelector & {_kind: #kind}
diff --git a/greptimedb/cue.mod/module.cue b/greptimedb/cue.mod/module.cue
index 7970fdb25..e14cf9919 100644
--- a/greptimedb/cue.mod/module.cue
+++ b/greptimedb/cue.mod/module.cue
@@ -7,7 +7,11 @@ source: {
 }
 deps: {
 	"github.com/perses/shared/cue@v0": {
-		v:       "v0.53.1"
+		v:       "v0.54.0-beta.8"
+		default: true
+	}
+	"github.com/perses/spec/cue@v0": {
+		v:       "v0.2.0-beta.6"
 		default: true
 	}
 }
diff --git a/greptimedb/schemas/datasources/greptimedb-datasource/greptimedb-datasource.cue b/greptimedb/schemas/datasources/greptimedb-datasource/greptimedb-datasource.cue
index 39c0a7943..f9de73319 100644
--- a/greptimedb/schemas/datasources/greptimedb-datasource/greptimedb-datasource.cue
+++ b/greptimedb/schemas/datasources/greptimedb-datasource/greptimedb-datasource.cue
@@ -15,14 +15,14 @@ package model
 
 import (
 	"github.com/perses/shared/cue/common"
-	commonProxy "github.com/perses/shared/cue/common/proxy"
+	"github.com/perses/spec/cue/datasource"
 )
 
 #kind: "GreptimeDBDatasource"
 
 kind: #kind
 spec: {
-	commonProxy.#baseHTTPDatasourceSpec
+	datasource.#HTTPDatasourceSpec
 
 	// headers are forwarded on GreptimeDB SQL API requests (e.g. Authorization).
 	// Used with directUrl when the Perses server is not proxying traffic; the host app may inject
diff --git a/jaeger/cue.mod/module.cue b/jaeger/cue.mod/module.cue
index dfa141576..24b1bfec1 100644
--- a/jaeger/cue.mod/module.cue
+++ b/jaeger/cue.mod/module.cue
@@ -7,7 +7,11 @@ source: {
 }
 deps: {
 	"github.com/perses/shared/cue@v0": {
-		v:       "v0.53.1"
+		v:       "v0.54.0-beta.8"
+		default: true
+	}
+	"github.com/perses/spec/cue@v0": {
+		v:       "v0.2.0-beta.6"
 		default: true
 	}
 }
diff --git a/jaeger/schemas/datasource/jaeger.cue b/jaeger/schemas/datasource/jaeger.cue
index fc3715e52..44017e2d9 100644
--- a/jaeger/schemas/datasource/jaeger.cue
+++ b/jaeger/schemas/datasource/jaeger.cue
@@ -15,14 +15,14 @@ package model
 
 import (
 	"github.com/perses/shared/cue/common"
-	commonProxy "github.com/perses/shared/cue/common/proxy"
+	"github.com/perses/spec/cue/datasource"
 )
 
 #kind: "JaegerDatasource"
 
 kind: #kind
 spec: {
-	commonProxy.#baseHTTPDatasourceSpec
+	datasource.#HTTPDatasourceSpec
 }
 
 #selector: common.#datasourceSelector & {_kind: #kind}
diff --git a/loki/cue.mod/module.cue b/loki/cue.mod/module.cue
index c052b0d34..a9e2ad3a1 100644
--- a/loki/cue.mod/module.cue
+++ b/loki/cue.mod/module.cue
@@ -7,7 +7,11 @@ source: {
 }
 deps: {
 	"github.com/perses/shared/cue@v0": {
-		v:       "v0.53.1"
+		v:       "v0.54.0-beta.8"
+		default: true
+	}
+	"github.com/perses/spec/cue@v0": {
+		v:       "v0.2.0-beta.6"
 		default: true
 	}
 }
diff --git a/loki/schemas/datasources/loki.cue b/loki/schemas/datasources/loki.cue
index 3b90237f5..0680c45d8 100644
--- a/loki/schemas/datasources/loki.cue
+++ b/loki/schemas/datasources/loki.cue
@@ -15,14 +15,14 @@ package model
 
 import (
 	"github.com/perses/shared/cue/common"
-	commonProxy "github.com/perses/shared/cue/common/proxy"
+	"github.com/perses/spec/cue/datasource"
 )
 
 #kind: "LokiDatasource"
 
 kind: #kind
 spec: {
-	commonProxy.#baseHTTPDatasourceSpec
+	datasource.#HTTPDatasourceSpec
 }
 
 #selector: common.#datasourceSelector & {_kind: #kind}
diff --git a/prometheus/cue.mod/module.cue b/prometheus/cue.mod/module.cue
index eee859882..692cd569b 100644
--- a/prometheus/cue.mod/module.cue
+++ b/prometheus/cue.mod/module.cue
@@ -7,11 +7,15 @@ source: {
 }
 deps: {
 	"github.com/perses/perses/cue@v0": {
-		v:       "v0.53.0"
+		v:       "v0.54.0-beta.2"
 		default: true
 	}
 	"github.com/perses/shared/cue@v0": {
-		v:       "v0.53.1"
+		v:       "v0.54.0-beta.8"
+		default: true
+	}
+	"github.com/perses/spec/cue@v0": {
+		v:       "v0.2.0-beta.6"
 		default: true
 	}
 }
diff --git a/prometheus/schemas/datasource/prometheus.cue b/prometheus/schemas/datasource/prometheus.cue
index 6479d5b2d..6cb6e7047 100644
--- a/prometheus/schemas/datasource/prometheus.cue
+++ b/prometheus/schemas/datasource/prometheus.cue
@@ -15,12 +15,12 @@ package model
 
 import (
 	"github.com/perses/shared/cue/common"
-	commonProxy "github.com/perses/shared/cue/common/proxy"
+	"github.com/perses/spec/cue/datasource"
 )
 
 kind: #kind
 spec: {
-	commonProxy.#baseHTTPDatasourceSpec
+	datasource.#HTTPDatasourceSpec
 	scrapeInterval?: =~#durationRegex
 	queryParams?: {[string]: string}
 }
diff --git a/pyroscope/cue.mod/module.cue b/pyroscope/cue.mod/module.cue
index 80457cb27..230c30ebb 100644
--- a/pyroscope/cue.mod/module.cue
+++ b/pyroscope/cue.mod/module.cue
@@ -7,7 +7,11 @@ source: {
 }
 deps: {
 	"github.com/perses/shared/cue@v0": {
-		v:       "v0.53.1"
+		v:       "v0.54.0-beta.8"
+		default: true
+	}
+	"github.com/perses/spec/cue@v0": {
+		v:       "v0.2.0-beta.6"
 		default: true
 	}
 }
diff --git a/pyroscope/schemas/datasource/pyroscope.cue b/pyroscope/schemas/datasource/pyroscope.cue
index ecac8107d..0d00e782f 100644
--- a/pyroscope/schemas/datasource/pyroscope.cue
+++ b/pyroscope/schemas/datasource/pyroscope.cue
@@ -15,14 +15,14 @@ package model
 
 import (
 	"github.com/perses/shared/cue/common"
-	commonProxy "github.com/perses/shared/cue/common/proxy"
+	"github.com/perses/spec/cue/datasource"
 )
 
 #kind: "PyroscopeDatasource"
 
 kind: #kind
 spec: {
-	commonProxy.#baseHTTPDatasourceSpec
+	datasource.#HTTPDatasourceSpec
 }
 
 #selector: common.#datasourceSelector & {_kind: #kind}
diff --git a/splunk/cue.mod/module.cue b/splunk/cue.mod/module.cue
index dc8f7998e..ee9eae914 100644
--- a/splunk/cue.mod/module.cue
+++ b/splunk/cue.mod/module.cue
@@ -7,7 +7,11 @@ source: {
 }
 deps: {
 	"github.com/perses/shared/cue@v0": {
-		v:       "v0.53.1"
+		v:       "v0.54.0-beta.8"
+		default: true
+	}
+	"github.com/perses/spec/cue@v0": {
+		v:       "v0.2.0-beta.6"
 		default: true
 	}
 }
diff --git a/splunk/schemas/datasources/splunk.cue b/splunk/schemas/datasources/splunk.cue
index 8eaab18c8..0f38432de 100644
--- a/splunk/schemas/datasources/splunk.cue
+++ b/splunk/schemas/datasources/splunk.cue
@@ -15,14 +15,14 @@ package model
 
 import (
 	"github.com/perses/shared/cue/common"
-	commonProxy "github.com/perses/shared/cue/common/proxy"
+	"github.com/perses/spec/cue/datasource"
 )
 
 #kind: "SplunkDatasource"
 
 kind: #kind
 spec: {
-	commonProxy.#baseHTTPDatasourceSpec
+	datasource.#HTTPDatasourceSpec
 }
 
 #selector: common.#datasourceSelector & {_kind: #kind}
diff --git a/tempo/cue.mod/module.cue b/tempo/cue.mod/module.cue
index 22ee2b1ca..11f55dba5 100644
--- a/tempo/cue.mod/module.cue
+++ b/tempo/cue.mod/module.cue
@@ -7,7 +7,11 @@ source: {
 }
 deps: {
 	"github.com/perses/shared/cue@v0": {
-		v:       "v0.53.1"
+		v:       "v0.54.0-beta.8"
+		default: true
+	}
+	"github.com/perses/spec/cue@v0": {
+		v:       "v0.2.0-beta.6"
 		default: true
 	}
 }
diff --git a/tempo/schemas/datasource/tempo.cue b/tempo/schemas/datasource/tempo.cue
index d62041f1b..348b232d5 100644
--- a/tempo/schemas/datasource/tempo.cue
+++ b/tempo/schemas/datasource/tempo.cue
@@ -15,14 +15,14 @@ package model
 
 import (
 	"github.com/perses/shared/cue/common"
-	commonProxy "github.com/perses/shared/cue/common/proxy"
+	"github.com/perses/spec/cue/datasource"
 )
 
 #kind: "TempoDatasource"
 
 kind: #kind
 spec: {
-	commonProxy.#baseHTTPDatasourceSpec
+	datasource.#HTTPDatasourceSpec
 }
 
 #selector: common.#datasourceSelector & {_kind: #kind}
diff --git a/victorialogs/cue.mod/module.cue b/victorialogs/cue.mod/module.cue
index e2825716b..43c3e4f47 100644
--- a/victorialogs/cue.mod/module.cue
+++ b/victorialogs/cue.mod/module.cue
@@ -7,7 +7,11 @@ source: {
 }
 deps: {
 	"github.com/perses/shared/cue@v0": {
-		v:       "v0.53.1"
+		v:       "v0.54.0-beta.8"
+		default: true
+	}
+	"github.com/perses/spec/cue@v0": {
+		v:       "v0.2.0-beta.6"
 		default: true
 	}
 }
diff --git a/victorialogs/schemas/datasources/victorialogs.cue b/victorialogs/schemas/datasources/victorialogs.cue
index ff0c25998..5aab48759 100644
--- a/victorialogs/schemas/datasources/victorialogs.cue
+++ b/victorialogs/schemas/datasources/victorialogs.cue
@@ -15,14 +15,14 @@ package model
 
 import (
 	"github.com/perses/shared/cue/common"
-	commonProxy "github.com/perses/shared/cue/common/proxy"
+	"github.com/perses/spec/cue/datasource"
 )
 
 #kind: "VictoriaLogsDatasource"
 
 kind: #kind
 spec: {
-	commonProxy.#baseHTTPDatasourceSpec
+	datasource.#HTTPDatasourceSpec
 }
 
 #selector: common.#datasourceSelector & {_kind: #kind}