diff --git a/.drone.star b/.drone.star
index 03852458f6..9cd488611c 100644
--- a/.drone.star
+++ b/.drone.star
@@ -1950,7 +1950,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on =
         "FRONTEND_SEARCH_MIN_LENGTH": "2",
         "OCIS_ASYNC_UPLOADS": True,
         "OCIS_EVENTS_ENABLE_TLS": False,
-        "MICRO_REGISTRY": "natsjs",
+        "MICRO_REGISTRY": "nats-js-kv",
         "MICRO_REGISTRY_ADDRESS": "127.0.0.1:9233",
     }
 
diff --git a/changelog/unreleased/natsjskv-registry-fix.md b/changelog/unreleased/natsjskv-registry-fix.md
new file mode 100644
index 0000000000..39a03dd07e
--- /dev/null
+++ b/changelog/unreleased/natsjskv-registry-fix.md
@@ -0,0 +1,5 @@
+Bugfix: Fix wrong naming in nats-js-kv registry
+
+Registers the registry under the correct name
+
+https://github.com/owncloud/ocis/pull/8140
diff --git a/ocis-pkg/natsjsregistry/registry.go b/ocis-pkg/natsjsregistry/registry.go
index d751229b14..8be5d02d82 100644
--- a/ocis-pkg/natsjsregistry/registry.go
+++ b/ocis-pkg/natsjsregistry/registry.go
@@ -14,7 +14,7 @@ import (
 	"go-micro.dev/v4/util/cmd"
 )
 
-var _registryName = "natsjs"
+var _registryName = "nats-js-kv"
 
 func init() {
 	cmd.DefaultRegistries[_registryName] = NewRegistry
diff --git a/ocis-pkg/registry/registry.go b/ocis-pkg/registry/registry.go
index 3da5ad0e81..0b6b3e71f0 100644
--- a/ocis-pkg/registry/registry.go
+++ b/ocis-pkg/registry/registry.go
@@ -66,13 +66,14 @@ func GetRegistry(opts ...Option) mRegistry.Registry {
 				mRegistry.Addrs(cfg.Addresses...),
 				natsjsregistry.Authenticate(cfg.Username, cfg.Password),
 			)
-		case "kubernetes":
-			_reg = kubernetesr.NewRegistry(
-				mRegistry.Addrs(cfg.Addresses...),
-			)
 		case "memory":
 			_reg = memr.NewRegistry()
 			cfg.DisableCache = true // no cache needed for in-memory registry
+		case "kubernetes":
+			fmt.Println("Attention: kubernetes registry is deprecated, use nats-js-kv instead")
+			_reg = kubernetesr.NewRegistry(
+				mRegistry.Addrs(cfg.Addresses...),
+			)
 		case "nats":
 			fmt.Println("Attention: nats registry is deprecated, use nats-js-kv instead")
 			_reg = natsr.NewRegistry(