diff --git a/apps/server/src/app.ts b/apps/server/src/app.ts
index 41f4212c4..85706c38b 100644
--- a/apps/server/src/app.ts
+++ b/apps/server/src/app.ts
@@ -153,7 +153,7 @@ async function createApp() {
   injeca.setLogger(createLoggLogger(useLogger('injeca').useGlobalConfig()))
   const logger = useLogger('app').useGlobalConfig()
 
-  const otel = injeca.provide('otel', {
+  const otel = injeca.provide('libs:otel', {
     dependsOn: { env: parsedEnv, lifecycle },
     build: ({ dependsOn }) => {
       const o = initOtel(dependsOn.env)
@@ -166,8 +166,8 @@ async function createApp() {
     },
   })
 
-  const db = injeca.provide('services:db', {
-    dependsOn: { env: parsedEnv, lifecycle },
+  const db = injeca.provide('datastore:db', {
+    dependsOn: { env: parsedEnv },
     build: async ({ dependsOn }) => {
       const { db: dbInstance, pool } = createDrizzle(dependsOn.env.DATABASE_URL)
       await dbInstance.execute('SELECT 1')
@@ -180,6 +180,21 @@ async function createApp() {
     },
   })
 
+  const redis = injeca.provide('datastore:redis', {
+    dependsOn: { env: parsedEnv },
+    build: async ({ dependsOn }) => {
+      const redisInstance = createRedis(dependsOn.env.REDIS_URL)
+      await redisInstance.connect()
+      logger.log('Connected to Redis')
+      return redisInstance
+    },
+  })
+
+  const configKV = injeca.provide('datastore:configKV', {
+    dependsOn: { redis },
+    build: ({ dependsOn }) => createConfigKVService(dependsOn.redis),
+  })
+
   const auth = injeca.provide('services:auth', {
     dependsOn: { db, env: parsedEnv },
     build: ({ dependsOn }) => createAuth(dependsOn.db, dependsOn.env),
@@ -200,21 +215,6 @@ async function createApp() {
     build: ({ dependsOn }) => createChatService(dependsOn.db),
   })
 
-  const redis = injeca.provide('services:redis', {
-    dependsOn: { env: parsedEnv },
-    build: async ({ dependsOn }) => {
-      const redisInstance = createRedis(dependsOn.env.REDIS_URL)
-      await redisInstance.connect()
-      logger.log('Connected to Redis')
-      return redisInstance
-    },
-  })
-
-  const configKV = injeca.provide('services:configKV', {
-    dependsOn: { redis },
-    build: ({ dependsOn }) => createConfigKVService(dependsOn.redis),
-  })
-
   const stripeService = injeca.provide('services:stripe', {
     dependsOn: { db },
     build: ({ dependsOn }) => createStripeService(dependsOn.db),