diff --git a/pkg/models/datasource.go b/pkg/models/datasource.go
index c3b47fb21e8..a5812987e53 100644
--- a/pkg/models/datasource.go
+++ b/pkg/models/datasource.go
@@ -18,6 +18,7 @@ const (
 	DS_ACCESS_DIRECT  = "direct"
 	DS_ACCESS_PROXY   = "proxy"
 	DS_ES_OPEN_DISTRO = "grafana-es-open-distro-datasource"
+	DS_ES_OPENSEARCH  = "grafana-opensearch-datasource"
 )
 
 var (
diff --git a/pkg/models/datasource_cache.go b/pkg/models/datasource_cache.go
index 3a793787dc1..54d82348168 100644
--- a/pkg/models/datasource_cache.go
+++ b/pkg/models/datasource_cache.go
@@ -282,7 +282,7 @@ func ClearDSDecryptionCache() {
 
 func awsServiceNamespace(dsType string) string {
 	switch dsType {
-	case DS_ES, DS_ES_OPEN_DISTRO:
+	case DS_ES, DS_ES_OPEN_DISTRO, DS_ES_OPENSEARCH:
 		return "es"
 	case DS_PROMETHEUS:
 		return "aps"