diff --git a/pkg/registry/apis/datasource/converter.go b/pkg/registry/apis/datasource/converter.go
index 02494fcce72..ab9cc369420 100644
--- a/pkg/registry/apis/datasource/converter.go
+++ b/pkg/registry/apis/datasource/converter.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/grafana/authlib/types"
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
-	"github.com/grafana/grafana/pkg/apis/datasource/v0alpha1"
 	datasourceV0 "github.com/grafana/grafana/pkg/apis/datasource/v0alpha1"
 	secretV0 "github.com/grafana/grafana/pkg/apis/secret/v0alpha1"
 	"github.com/grafana/grafana/pkg/components/simplejson"
@@ -35,7 +34,7 @@ func (r *converter) asDataSource(ds *datasources.DataSource) (*datasourceV0.Data
 		},
 		Spec: datasourceV0.DataSourceSpec{
 			Title:           ds.Name,
-			Access:          v0alpha1.DsAccess(ds.Access),
+			Access:          datasourceV0.DsAccess(ds.Access),
 			URL:             ds.URL,
 			User:            ds.User,
 			Database:        ds.Database,
diff --git a/pkg/registry/apis/query/connections.go b/pkg/registry/apis/query/connections.go
index b89d359f195..0bf8533613f 100644
--- a/pkg/registry/apis/query/connections.go
+++ b/pkg/registry/apis/query/connections.go
@@ -12,7 +12,6 @@ import (
 
 	authlib "github.com/grafana/authlib/types"
 	"github.com/grafana/grafana/pkg/apimachinery/utils"
-	query "github.com/grafana/grafana/pkg/apis/query/v0alpha1"
 	queryV0 "github.com/grafana/grafana/pkg/apis/query/v0alpha1"
 	gapiutil "github.com/grafana/grafana/pkg/services/apiserver/utils"
 	"github.com/grafana/grafana/pkg/services/datasources"
@@ -40,7 +39,7 @@ type connectionAccess struct {
 }
 
 func (s *connectionAccess) New() runtime.Object {
-	return query.ConnectionResourceInfo.NewFunc()
+	return queryV0.ConnectionResourceInfo.NewFunc()
 }
 
 func (s *connectionAccess) Destroy() {}
@@ -50,20 +49,20 @@ func (s *connectionAccess) NamespaceScoped() bool {
 }
 
 func (s *connectionAccess) GetSingularName() string {
-	return query.ConnectionResourceInfo.GetSingularName()
+	return queryV0.ConnectionResourceInfo.GetSingularName()
 }
 
 func (s *connectionAccess) ShortNames() []string {
-	return query.ConnectionResourceInfo.GetShortNames()
+	return queryV0.ConnectionResourceInfo.GetShortNames()
 }
 
 func (s *connectionAccess) NewList() runtime.Object {
-	return query.ConnectionResourceInfo.NewListFunc()
+	return queryV0.ConnectionResourceInfo.NewListFunc()
 }
 
 func (s *connectionAccess) ConvertToTable(ctx context.Context, object runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) {
 	if s.tableConverter == nil {
-		s.tableConverter = query.ConnectionResourceInfo.TableConverter()
+		s.tableConverter = queryV0.ConnectionResourceInfo.TableConverter()
 	}
 	return s.tableConverter.ConvertToTable(ctx, object, tableOptions)
 }