diff --git a/src/app-auth/controllers/app-auth.controller.ts b/src/app-auth/controllers/app-auth.controller.ts
index b0f0fcd3..35df5fc9 100644
--- a/src/app-auth/controllers/app-auth.controller.ts
+++ b/src/app-auth/controllers/app-auth.controller.ts
@@ -38,7 +38,7 @@ import { TransformResponseInterceptor } from '../interceptors/transformResponse.
 import { AuthenticatedGuard } from 'src/org-user/guard/authenticated.guard';
 
 @UseFilters(AllExceptionsFilter)
-@ApiTags('Super Admin')
+@ApiTags('Application')
 @Controller('/api/v1/app')
 // @UseGuards(AuthenticatedGuard)
 export class AppAuthController {
diff --git a/src/app-oauth/app-oauth.controller.ts b/src/app-oauth/app-oauth.controller.ts
index 31ecf70a..8f48c39f 100644
--- a/src/app-oauth/app-oauth.controller.ts
+++ b/src/app-oauth/app-oauth.controller.ts
@@ -29,8 +29,8 @@ import {
 } from './dtos/generate-token.dto';
 
 @UseFilters(AllExceptionsFilter)
-@ApiTags('Super Admin')
-@Controller('app')
+@ApiTags('Application')
+@Controller('/api/v1/app')
 export class AppOauthController {
   constructor(private readonly appAuthService: AppAuthService) {}
 
diff --git a/src/main.ts b/src/main.ts
index 90304dd3..0e6c88bb 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -68,11 +68,14 @@ async function bootstrap() {
   if (!existDir(process.env.EDV_CONFIG_DIR)) {
     createDir(process.env.EDV_CONFIG_DIR);
   }
-  if (!existDir(process.env.EDV_DID_FILE_PATH)) {
-    store(kmsVaultWallet.didDocument, process.env.EDV_DID_FILE_PATH);
+  const EDV_DID_FILE_PATH = `${process.env.EDV_CONFIG_DIR}/edv-did.json`
+  if (!existDir(EDV_DID_FILE_PATH)) {
+    store(kmsVaultWallet.didDocument, EDV_DID_FILE_PATH);
   }
-  if (!existDir(process.env.EDV_KEY_FILE_PATH)) {
-    store(kmsVaultWallet.keys, process.env.EDV_KEY_FILE_PATH);
+
+  const EDV_KEY_FILE_PATH = `${process.env.EDV_CONFIG_DIR}/edv-keys.json`
+  if (!existDir(EDV_KEY_FILE_PATH)) {
+    store(kmsVaultWallet.keys, EDV_KEY_FILE_PATH);
   }
 
   const config = new ConfigService();
@@ -100,24 +103,24 @@ async function bootstrap() {
     // Swagger documentation setup
 
     const orgDocConfig = new DocumentBuilder()
-      .setTitle('Entity Studio SSI API Playground')
+      .setTitle('Entity Studio API')
       .setDescription('Open API Documentation of the Entity Studio')
       .setVersion('1.0')
       .build();
 
-    const tenantDocConfig = new DocumentBuilder()
-      .setTitle('Entity Studio SSI API Playground')
-      .setDescription('Open API Documentation of the Entity Studio')
-      .addBearerAuth(
-        {
-          type: 'http',
-          name: 'Authorization',
-          in: 'header',
-        },
-        'Authorization',
-      )
-      .setVersion('1.0')
-      .build();
+    // const tenantDocConfig = new DocumentBuilder()
+    //   .setTitle('Entity Studio SSI API Playground')
+    //   .setDescription('Open API Documentation of the Entity Studio')
+    //   .addBearerAuth(
+    //     {
+    //       type: 'http',
+    //       name: 'Authorization',
+    //       in: 'header',
+    //     },
+    //     'Authorization',
+    //   )
+    //   .setVersion('1.0')
+    //   .build();
 
     // const tenantDocuments = SwaggerModule.createDocument(app, tenantDocConfig, {
     //   include: [
diff --git a/src/user/controllers/user.controller.ts b/src/user/controllers/user.controller.ts
index 02f32d26..8886ccb5 100644
--- a/src/user/controllers/user.controller.ts
+++ b/src/user/controllers/user.controller.ts
@@ -35,7 +35,7 @@ import { AuthenticatedGuard } from 'src/org-user/guard/authenticated.guard';
 import { UserService } from '../services/user.service';
 
 @UseFilters(AllExceptionsFilter)
-@ApiTags('Super Admin')
+@ApiTags('Authentication')
 @Controller()
 export class UserController {
   constructor(private readonly userService: UserService) {}