diff --git a/client/src/components/loginprompt.vue b/client/src/components/loginprompt.vue
index 72493d84f..55c14d362 100644
--- a/client/src/components/loginprompt.vue
+++ b/client/src/components/loginprompt.vue
@@ -17,6 +17,18 @@
             max-width="100"
             class="mx-auto"
         ></v-img>
+
+
+        <!-- Show info panel if domain is demo.kubero.dev -->
+        <v-alert
+            v-if="isDemoDomain"
+            type="info"
+            border="start"
+            class="mt-5"
+        >
+            User: <b>demo/reader</b><br>
+            Pass: <b>123456</b>
+        </v-alert>
         <div v-if="authMethods.local" class="py-5">
             <v-alert
                 v-show="error"
@@ -28,11 +40,13 @@
             </v-alert>
             <form v-on:submit="login">
                 <v-text-field
+                    v-model="username"
                     label="username"
                     name="username"
                     required
                 ></v-text-field>
                 <v-text-field
+                    v-model="password"
                     label="password"
                     type="password"
                     name="password"
@@ -83,7 +97,6 @@
 </template>
 
 <script lang="ts">
-import router from "../router"
 import axios from "axios"
 import { defineComponent } from 'vue'
 
@@ -95,12 +108,29 @@ export default defineComponent({
     data: () => ({
         error: false,
         errorshake: false,
+        username: '',
+        password: '',
         authMethods : {
             "local": false,
             "github": false,
             "oauth2": false
         }
     }),
+    computed: {
+        isDemoDomain(): boolean {
+            const demoDomains = [
+                'demo.kubero.dev',
+                //'kubero.localhost',
+                'localhost'
+            ];
+            const demoDomain = demoDomains.includes(window.location.hostname)
+            if (demoDomain) {
+                this.username = 'demo';
+                this.password = '123456';
+            }
+            return demoDomain;
+        }
+    },
     mounted() {
         this.getAuthMethods();
     },
diff --git a/server/.env.template b/server/.env.template
index a93d8903c..ef526a847 100644
--- a/server/.env.template
+++ b/server/.env.template
@@ -29,7 +29,9 @@ KUBERO_SESSION_KEY=randomString
 KUBERO_CLUSTERISSUER=letsencrypt-prod
 KUBERO_BUILD_REGISTRY=kubero-registry-yourdomain.com/something
 
-KUBERO_PROMETHEUS_ENDPOINT=http://prometheus.localhost
+# KUBERO_PROMETHEUS_ENDPOINT=http://kubero-prometheus-server # within cluster
+KUBERO_PROMETHEUS_ENDPOINT=http:/127.0.0.1:8080 # for local development
+# kubectl port-forward svc/kubero-prometheus-server 8080:80 -n kubero
 
 KUBERO_AUDIT=false
 KUBERO_AUDIT_DB_PATH=./db
diff --git a/server/src/auth/permissions.guard.ts b/server/src/auth/permissions.guard.ts
index 49ae0617b..0b297c55f 100644
--- a/server/src/auth/permissions.guard.ts
+++ b/server/src/auth/permissions.guard.ts
@@ -11,6 +11,16 @@ export class PermissionsGuard implements CanActivate {
       context.getHandler(),
       context.getClass(),
     ]);
+    /* Disabling for RBAC
+    if (
+      !process.env.KUBERO_USERS &&
+      !process.env.GITHUB_CLIENT_SECRET &&
+      !process.env.OAUTH2_CLIENT_SECRET
+    ) {
+      return true;
+    }
+    */
+
     if (!requiredPermissions || requiredPermissions.length === 0) {
       return true;
     }
diff --git a/server/src/auth/strategies/jwt.guard.ts b/server/src/auth/strategies/jwt.guard.ts
index 5d30033d6..ef03fff08 100644
--- a/server/src/auth/strategies/jwt.guard.ts
+++ b/server/src/auth/strategies/jwt.guard.ts
@@ -19,6 +19,8 @@ export class JwtAuthGuard extends AuthGuard('jwt') {
 
   handleRequest(err, user, info) {
     // Disabling authentication when no auth method is defined
+
+    /* Disabling for RBAC
     if (
       !process.env.KUBERO_USERS &&
       !process.env.GITHUB_CLIENT_SECRET &&
@@ -26,6 +28,7 @@ export class JwtAuthGuard extends AuthGuard('jwt') {
     ) {
       return true;
     }
+    */
 
     if (err || !user) {
       //this.logger.debug('JwtAuthGuard.handleRequest Error', err, user, info);
diff --git a/server/src/common/guards/readonly.guard.ts b/server/src/common/guards/readonly.guard.ts
index c55eca5a3..fc1654056 100644
--- a/server/src/common/guards/readonly.guard.ts
+++ b/server/src/common/guards/readonly.guard.ts
@@ -6,6 +6,7 @@ import {
   Logger,
 } from '@nestjs/common';
 
+/* DEPRECATED: This guard is deprecated and will be removed in future versions in favour of Kubero roles*/
 @Injectable()
 export class ReadonlyGuard implements CanActivate {
   private logger = new Logger(ReadonlyGuard.name);
@@ -14,6 +15,9 @@ export class ReadonlyGuard implements CanActivate {
       this.logger.warn(
         'Kubero is in read-only mode, write operations are blocked',
       );
+      this.logger.warn(
+        'KUBERO_READONLY is deprecated! Use Kubero\'s RBAC feature instead.',
+      );
       throw new HttpException('Kubero is in read-only mode', 202);
     }
     return true;
diff --git a/server/src/deployments/deployments.service.spec.ts.old b/server/src/deployments/deployments.service.spec.ts.old
new file mode 100644
index 000000000..0968ab0b7
--- /dev/null
+++ b/server/src/deployments/deployments.service.spec.ts.old
@@ -0,0 +1,20 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { DeploymentsController } from './deployments.controller';
+import { DeploymentsService } from './deployments.service';
+
+describe('DeploymentsService', () => {
+  let service: DeploymentsService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      controllers: [DeploymentsController],
+      providers: [{ provide: DeploymentsService, useValue: {} }],
+    }).compile();
+
+    service = module.get<DeploymentsService>(DeploymentsService);
+  });
+
+  it('should be defined', () => {
+    expect(service).toBeDefined();
+  });
+});
diff --git a/server/src/groups/groups.controller.ts b/server/src/groups/groups.controller.ts
index 436d90547..33b7195aa 100644
--- a/server/src/groups/groups.controller.ts
+++ b/server/src/groups/groups.controller.ts
@@ -19,6 +19,7 @@ import { OKDTO } from '../common/dto/ok.dto';
 import { GroupsService } from './groups.service';
 import { PermissionsGuard } from '../auth/permissions.guard';
 import { Permissions } from '../auth/permissions.decorator';
+import { ReadonlyGuard } from '../common/guards/readonly.guard';
 
 @Controller({ path: 'api/groups', version: '1' })
 export class GroupsController {
@@ -44,7 +45,7 @@ export class GroupsController {
   }
 
   @Post('/')
-  @UseGuards(JwtAuthGuard, PermissionsGuard)
+  @UseGuards(JwtAuthGuard, PermissionsGuard, ReadonlyGuard)
   @Permissions('user:write')
   @ApiBearerAuth('bearerAuth')
   @ApiForbiddenResponse({
@@ -66,7 +67,7 @@ export class GroupsController {
   }
 
   @Delete('/:id')
-  @UseGuards(JwtAuthGuard, PermissionsGuard)
+  @UseGuards(JwtAuthGuard, PermissionsGuard, ReadonlyGuard)
   @Permissions('user:write')
   @ApiBearerAuth('bearerAuth')
   @ApiForbiddenResponse({
@@ -88,7 +89,7 @@ export class GroupsController {
   }
 
   @Put('/:id')
-  @UseGuards(JwtAuthGuard, PermissionsGuard)
+  @UseGuards(JwtAuthGuard, PermissionsGuard, ReadonlyGuard)
   @Permissions('user:write')
   @ApiBearerAuth('bearerAuth')
   @ApiForbiddenResponse({
diff --git a/server/src/roles/roles.controller.ts b/server/src/roles/roles.controller.ts
index 3cd25705c..564d0fd45 100644
--- a/server/src/roles/roles.controller.ts
+++ b/server/src/roles/roles.controller.ts
@@ -19,6 +19,7 @@ import { OKDTO } from '../common/dto/ok.dto';
 import { RolesService } from './roles.service';
 import { PermissionsGuard } from '../auth/permissions.guard';
 import { Permissions } from '../auth/permissions.decorator';
+import { ReadonlyGuard } from '../common/guards/readonly.guard';
 
 @Controller({ path: 'api/roles', version: '1' })
 export class RolesController {
@@ -44,7 +45,7 @@ export class RolesController {
   }
 
   @Post('/')
-  @UseGuards(JwtAuthGuard, PermissionsGuard)
+  @UseGuards(JwtAuthGuard, PermissionsGuard, ReadonlyGuard)
   @Permissions('user:write')
   @ApiBearerAuth('bearerAuth')
   @ApiForbiddenResponse({
@@ -63,7 +64,7 @@ export class RolesController {
   }
 
   @Delete('/:roleId')
-  @UseGuards(JwtAuthGuard, PermissionsGuard)
+  @UseGuards(JwtAuthGuard, PermissionsGuard, ReadonlyGuard)
   @Permissions('user:write')
   @ApiBearerAuth('bearerAuth')
   @ApiForbiddenResponse({
@@ -82,7 +83,7 @@ export class RolesController {
   }
 
   @Put('/:roleId')
-  @UseGuards(JwtAuthGuard, PermissionsGuard)
+  @UseGuards(JwtAuthGuard, PermissionsGuard, ReadonlyGuard)
   @Permissions('user:write')
   @ApiBearerAuth('bearerAuth')
   @ApiForbiddenResponse({
diff --git a/server/src/token/token.controller.ts b/server/src/token/token.controller.ts
index c0b89b85b..6d0284f9a 100644
--- a/server/src/token/token.controller.ts
+++ b/server/src/token/token.controller.ts
@@ -22,7 +22,7 @@ import { OKDTO } from '../common/dto/ok.dto';
 import { TokenService } from './token.service';
 import { PermissionsGuard } from '../auth/permissions.guard';
 import { Permissions } from '../auth/permissions.decorator';
-
+import { ReadonlyGuard } from '../common/guards/readonly.guard';
 
 @Controller({ path: 'api/tokens', version: '1' })
 export class TokenController {
@@ -69,7 +69,7 @@ export class TokenController {
     }
 */
   @Post('/my')
-  @UseGuards(JwtAuthGuard, PermissionsGuard)
+  @UseGuards(JwtAuthGuard, PermissionsGuard, ReadonlyGuard)
   @Permissions('token:ok', 'token:write')
   @ApiBearerAuth('bearerAuth')
   @ApiForbiddenResponse({
@@ -107,7 +107,7 @@ export class TokenController {
   }
 
   @Delete('/:id')
-  @UseGuards(JwtAuthGuard, PermissionsGuard)
+  @UseGuards(JwtAuthGuard, PermissionsGuard, ReadonlyGuard)
   @Permissions('token:ok', 'token:write')
   @ApiBearerAuth('bearerAuth')
   @ApiForbiddenResponse({
@@ -154,7 +154,7 @@ export class TokenController {
   }
 
   @Delete('/my/:id')
-  @UseGuards(JwtAuthGuard, PermissionsGuard)
+  @UseGuards(JwtAuthGuard, PermissionsGuard, ReadonlyGuard)
   @Permissions('token:ok', 'token:write')
   @ApiBearerAuth('bearerAuth')
   @ApiForbiddenResponse({
diff --git a/server/src/users/users.controller.ts b/server/src/users/users.controller.ts
index 4b5c18377..b5556568a 100644
--- a/server/src/users/users.controller.ts
+++ b/server/src/users/users.controller.ts
@@ -26,6 +26,7 @@ import { GetAllUsersDTO } from './dto/users.dto';
 import { FileInterceptor } from '@nestjs/platform-express';
 import { PermissionsGuard } from '../auth/permissions.guard';
 import { Permissions } from '../auth/permissions.decorator';
+import { ReadonlyGuard } from '../common/guards/readonly.guard';
 
 @Controller({ path: 'api/users', version: '1' })
 export class UsersController {
@@ -110,7 +111,7 @@ export class UsersController {
 
   @Get('/count')
   @UseGuards(JwtAuthGuard, PermissionsGuard)
-  @Permissions('user:read', 'user:write')
+  @Permissions('user:write')
   @ApiBearerAuth('bearerAuth')
   @ApiForbiddenResponse({
     description: 'Error: Unauthorized',
@@ -128,7 +129,7 @@ export class UsersController {
   }
 
   @Put('/:id')
-  @UseGuards(JwtAuthGuard, PermissionsGuard)
+  @UseGuards(JwtAuthGuard, PermissionsGuard, ReadonlyGuard)
   @Permissions('user:write')
   @ApiBearerAuth('bearerAuth')
   @ApiForbiddenResponse({
@@ -147,7 +148,7 @@ export class UsersController {
   }
 
   @Delete('/:id')
-  @UseGuards(JwtAuthGuard, PermissionsGuard)
+  @UseGuards(JwtAuthGuard, PermissionsGuard, ReadonlyGuard)
   @Permissions('user:write')
   @ApiBearerAuth('bearerAuth')
   @ApiForbiddenResponse({
@@ -166,7 +167,7 @@ export class UsersController {
   }
 
   @Put('/:id/password/')
-  @UseGuards(JwtAuthGuard, PermissionsGuard)
+  @UseGuards(JwtAuthGuard, PermissionsGuard, ReadonlyGuard)
   @Permissions('user:write')
   @ApiBearerAuth('bearerAuth')
   @ApiForbiddenResponse({
@@ -198,7 +199,7 @@ export class UsersController {
   }
 
   @Put('/update-my-password')
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, ReadonlyGuard)
   @ApiBearerAuth('bearerAuth')
   @ApiForbiddenResponse({
     description: 'Error: Unauthorized',
@@ -230,7 +231,8 @@ export class UsersController {
   }
 
   @Post('/')
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, PermissionsGuard, ReadonlyGuard)
+  @Permissions('user:write')
   @ApiBearerAuth('bearerAuth')
   @ApiForbiddenResponse({
     description: 'Error: Unauthorized',
@@ -274,7 +276,7 @@ export class UsersController {
   }
 
   @Post('/profile/avatar')
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, ReadonlyGuard)
   @UseInterceptors(FileInterceptor('avatar'))
   @ApiBearerAuth('bearerAuth')
   @ApiForbiddenResponse({
@@ -305,39 +307,4 @@ export class UsersController {
     }
     return this.usersService.updateAvatar(user.userId, file);
   }
-  /*
-  @Get('/profile/avatar')
-  @UseGuards(JwtAuthGuard)
-  @ApiBearerAuth('bearerAuth')
-  @ApiForbiddenResponse({
-    description: 'Error: Unauthorized',
-    type: OKDTO,
-    isArray: false,
-  })
-  @ApiOkResponse({
-    description: 'Get current User avatar',
-    type: GetAllUsersDTO,
-    isArray: false,
-  })
-  @ApiOperation({ summary: 'Get current User avatar' })
-  async getProfileAvatar(@Request() req: any, @Response() res: ResType) {
-    const user = req.user;
-    const avatarImage = await this.usersService.getAvatar(user.userId);
-
-    if (!avatarImage) {
-      throw new HttpException('No avatar image found', HttpStatus.NOT_FOUND);
-    }
-
-    // Parse data URL: data:[<mediatype>][;base64],<data>
-    const matches = avatarImage.match(/^data:(.+);base64,(.+)$/);
-    if (!matches || matches.length !== 3) {
-      throw new HttpException('Invalid avatar image format', HttpStatus.INTERNAL_SERVER_ERROR);
-    }
-    const contentType = matches[1];
-    const imageBuffer = Buffer.from(matches[2], 'base64');
-    res.setHeader('Content-Type', contentType);
-    res.setHeader('Content-Length', imageBuffer.length);
-    return res.end(imageBuffer);
-  }
-*/
 }