From 5ad1f60d1de1be1cd6a3da0445a3613778347af7 Mon Sep 17 00:00:00 2001
From: lubnar <rlu7rng@bosch.com>
Date: Mon, 28 Oct 2024 14:23:12 +0100
Subject: [PATCH] Update package names

---
 .dockerignore                                 |   1 +
 .github/workflows/build-onyx.yml              |   2 +-
 .../{qg-api-service => }/.dockerignore        |   0
 qg-api-service/api-commons-lib/package.json   |   2 +-
 .../api-keycloak-auth-lib/package.json        |   2 +-
 qg-api-service/package-lock.json              |  10 ++
 qg-api-service/package.json                   |   2 +-
 qg-api-service/qg-api-service/Dockerfile      | 130 ++++-----------
 .../qg-api-service/Dockerfile_original        | 150 ++++++++++++++++++
 .../integration-tests/mocks/keycloak.ts       |   2 +-
 .../integration-tests/util/nest-util.ts       |   2 +-
 qg-api-service/qg-api-service/package.json    |   4 +-
 .../qg-api-service/src/app.module.ts          |   2 +-
 .../src/gp-services/test-services.ts          |   4 +-
 .../src/guards/keycloak-auth.guard.spec.ts    |   2 +-
 .../src/guards/keycloak-auth.guard.ts         |   2 +-
 .../src/guards/roles.guard.spec.ts            |   2 +-
 .../qg-api-service/src/guards/roles.guard.ts  |   2 +-
 .../src/keycloak/local.keycloak.module.ts     |   2 +-
 .../configs/configs.controller.files.spec.ts  |   2 +-
 .../configs/configs.controller.spec.ts        |   2 +-
 .../namespace/configs/configs.controller.ts   |   2 +-
 .../src/namespace/configs/configs.service.ts  |   2 +-
 .../configs/excel-transformer.service.ts      |   2 +-
 .../namespace/configs/generator.service.ts    |   2 +-
 .../explanations/explanations.controller.ts   |   2 +-
 .../findings/finding.controller.spec.ts       |   2 +-
 .../namespace/findings/finding.controller.ts  |   2 +-
 .../findings/finding.service.spec.ts          |   2 +-
 .../src/namespace/findings/finding.service.ts |   2 +-
 .../metrics/metric.controller.spec.ts         |   2 +-
 .../namespace/metrics/metric.controller.ts    |   2 +-
 .../namespace/metrics/metric.service.spec.ts  |   2 +-
 .../src/namespace/metrics/metric.service.ts   |   2 +-
 .../src/namespace/module.utils.ts             |   2 +-
 .../src/namespace/namespace.module.ts         |   2 +-
 .../namespace/namespace-access.guard.spec.ts  |   4 +-
 .../namespace/namespace-access.guard.ts       |   2 +-
 .../namespace-local-id.service.spec.ts        |   2 +-
 .../namespace/namespace.controller.ts         |   4 +-
 .../namespace/namespace.service.spec.ts       |   2 +-
 .../namespace/namespace/namespace.service.ts  |   2 +-
 .../approvals/approvals.controller.ts         |   2 +-
 .../releases/approvals/approvals.module.ts    |   2 +-
 .../releases/approvals/approvals.service.ts   |   2 +-
 .../releases/approvals/approvals.util.ts      |   2 +-
 .../releases/comments/comments.controller.ts  |   2 +-
 .../releases/comments/comments.module.ts      |   2 +-
 .../comments/comments.service.spec.ts         |   2 +-
 .../releases/comments/comments.service.ts     |   2 +-
 .../releases/comments/comments.utils.ts       |   2 +-
 .../releases/history.service.spec.ts          |   2 +-
 .../src/namespace/releases/history.service.ts |   2 +-
 .../src/namespace/releases/history.utils.ts   |   2 +-
 .../overrides/overrides.controllers.ts        |   2 +-
 .../releases/overrides/overrides.module.ts    |   2 +-
 .../releases/releases.controller.spec.ts      |   2 +-
 .../namespace/releases/releases.controller.ts |   2 +-
 .../src/namespace/releases/releases.module.ts |   2 +-
 .../namespace/releases/releases.service.ts    |   2 +-
 .../src/namespace/releases/releases.utils.ts  |   2 +-
 .../releases/tasks/tasks.controller.ts        |   2 +-
 .../namespace/releases/tasks/tasks.module.ts  |   2 +-
 .../namespace/releases/tasks/tasks.service.ts |   2 +-
 .../namespace/releases/tasks/tasks.utils.ts   |   2 +-
 .../src/namespace/run/clean-test-data.spec.ts |   2 +-
 .../src/namespace/run/clean-test-data.ts      |   2 +-
 .../src/namespace/run/run.controller.spec.ts  |   2 +-
 .../src/namespace/run/run.controller.ts       |   2 +-
 .../src/namespace/run/run.service.spec.ts     |   4 +-
 .../src/namespace/run/run.service.ts          |   2 +-
 .../secret/secret.controller.spec.ts          |   2 +-
 .../src/namespace/secret/secret.controller.ts |   2 +-
 .../src/namespace/secret/secret.service.ts    |   2 +-
 .../subscription.controller.spec.ts           |   2 +-
 .../subscriptions/subscription.controller.ts  |   4 +-
 .../src/namespace/users/users.controller.ts   |   2 +-
 .../src/namespace/users/users.module.ts       |   2 +-
 .../src/namespace/users/users.service.spec.ts |   4 +-
 .../src/namespace/users/users.service.ts      |   4 +-
 .../src/namespace/users/users.utils.ts        |   2 +-
 .../namespace/workflow/minio.service.spec.ts  |   2 +-
 .../src/namespace/workflow/minio.service.ts   |   2 +-
 .../workflow/workflow-argo.service.spec.ts    |   2 +-
 .../workflow/workflow-finished-service.ts     |   2 +-
 .../notification.service.spec.ts              |   2 +-
 .../src/notifications/notification.service.ts |   2 +-
 .../service/authinfo/auth-info.controller.ts  |   2 +-
 .../src/service/service.module.ts             |   2 +-
 .../src/service/version/version.controller.ts |   2 +-
 .../interactive.login.guard.ts                |   2 +-
 .../long.running.strategy.ts                  |   2 +-
 .../long.running.token.cache.spec.ts          |   2 +-
 .../long.running.token.cache.ts               |   2 +-
 .../long.running.token.controller.ts          |   2 +-
 .../long.running.token.module.ts              |   2 +-
 .../long.running.token.service.ts             |   2 +-
 .../long.running.token.utils.ts               |   2 +-
 .../user-profile/user-profile.controller.ts   |   4 +-
 99 files changed, 291 insertions(+), 206 deletions(-)
 create mode 100644 .dockerignore
 rename qg-api-service/{qg-api-service => }/.dockerignore (100%)
 create mode 100644 qg-api-service/qg-api-service/Dockerfile_original

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..600e365e
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+**/node_modules
\ No newline at end of file
diff --git a/.github/workflows/build-onyx.yml b/.github/workflows/build-onyx.yml
index d1d1f0eb..4258a829 100644
--- a/.github/workflows/build-onyx.yml
+++ b/.github/workflows/build-onyx.yml
@@ -170,7 +170,7 @@ jobs:
           pull: true
           push: false
           build-args: |
-            BASE_IMAGE_WORKFLOW_NAME=${{ env.BASE_IMAGE_UBUNTU_NAME }}
+            BASE_IMAGE_WORKFLOW_NAME=node:22-alpine
           tags: ${{ env.BASE_TAG }},${{ env.BASE_TAG_LATEST }}
           context: .
           target: development
diff --git a/qg-api-service/qg-api-service/.dockerignore b/qg-api-service/.dockerignore
similarity index 100%
rename from qg-api-service/qg-api-service/.dockerignore
rename to qg-api-service/.dockerignore
diff --git a/qg-api-service/api-commons-lib/package.json b/qg-api-service/api-commons-lib/package.json
index c24fbf7d..afc36c4a 100644
--- a/qg-api-service/api-commons-lib/package.json
+++ b/qg-api-service/api-commons-lib/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "api-commons-lib",
+  "name": "@B-S-F/api-commons-lib",
   "version": "0.7.0",
   "description": "YAKU API commons lib containing functionality that can be used across YAKU API projects",
   "main": "dist/index.js",
diff --git a/qg-api-service/api-keycloak-auth-lib/package.json b/qg-api-service/api-keycloak-auth-lib/package.json
index fa62d331..a7713d12 100644
--- a/qg-api-service/api-keycloak-auth-lib/package.json
+++ b/qg-api-service/api-keycloak-auth-lib/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "api-keycloak-auth-lib",
+  "name": "@B-S-F/api-keycloak-auth-lib",
   "version": "0.9.0",
   "description": "YAKU API Keycloak Auth lib containing functionality that can be used across YAKU API projects",
   "main": "dist/index.js",
diff --git a/qg-api-service/package-lock.json b/qg-api-service/package-lock.json
index a0d83256..d7e9074b 100644
--- a/qg-api-service/package-lock.json
+++ b/qg-api-service/package-lock.json
@@ -28,6 +28,7 @@
       }
     },
     "api-commons-lib": {
+      "name": "@B-S-F/api-commons-lib",
       "version": "0.7.0",
       "license": "ISC",
       "dependencies": {
@@ -82,6 +83,7 @@
       }
     },
     "api-keycloak-auth-lib": {
+      "name": "@B-S-F/api-keycloak-auth-lib",
       "version": "0.9.0",
       "dependencies": {
         "@nestjs/common": "^10.3.8",
@@ -277,6 +279,14 @@
         "node": ">=18"
       }
     },
+    "node_modules/@B-S-F/api-commons-lib": {
+      "resolved": "api-commons-lib",
+      "link": true
+    },
+    "node_modules/@B-S-F/api-keycloak-auth-lib": {
+      "resolved": "api-keycloak-auth-lib",
+      "link": true
+    },
     "node_modules/@B-S-F/qg-api-service": {
       "resolved": "qg-api-service",
       "link": true
diff --git a/qg-api-service/package.json b/qg-api-service/package.json
index 87da1a55..6d74b621 100644
--- a/qg-api-service/package.json
+++ b/qg-api-service/package.json
@@ -16,7 +16,7 @@
     "build": "npx turbo run build --continue --cache-dir=.turbo",
     "lint": "npx turbo run lint --cache-dir=.turbo",
     "lint-staged": "npx lint-staged",
-    "prepare": "cd ../ && husky install ./qg-api-service/.husky",
+    "prepare": "if [ -z \"$SKIP_HUSKY\" ]; then cd .. && husky install ./qg-api-service/.husky ; fi",
     "format": "npx turbo run format --cache-dir=.turbo",
     "test:cov": "npx turbo run test:cov --cache-dir=.turbo"
   },
diff --git a/qg-api-service/qg-api-service/Dockerfile b/qg-api-service/qg-api-service/Dockerfile
index f3363736..0c5a03c0 100644
--- a/qg-api-service/qg-api-service/Dockerfile
+++ b/qg-api-service/qg-api-service/Dockerfile
@@ -2,103 +2,41 @@
 # BUILD FOR LOCAL DEVELOPMENT
 ###################
 
-ARG BASE_IMAGE_NODEJS_NAME
+ARG BASE_IMAGE_NODEJS_NAME=node:22-alpine
 
 FROM ${BASE_IMAGE_NODEJS_NAME} As development
 
-ARG GROUP_NAME=qguser
-ARG GROUP_ID=1000
-ARG USERNAME=qguser
-ARG USER_ID=1001
-ARG USER_HOME=/home/qguser
-
-LABEL maintainer="Neutrinos GROW/PAT"
-LABEL description="YAKU core-api docker image based on Ubuntu-nodejs"
-
-ENV APP_GROUP_NAME=${GROUP_NAME} \
-    APP_GROUP_ID=${GROUP_ID} \
-    APP_USER_NAME=${USERNAME} \
-    APP_USER_ID=${USER_ID} \
-    APP_USER_HOME=${USER_HOME} \
-    PATH=$PATH:$APP_USER_HOME/node_modules/.bin \
-    NODE_ENV=development
-
-# no upgrade, only update - core image must be up-to-date!
-RUN set -uex \
-    && umask 0027 \
-    && /etc/init.d/setup-user.sh \
-    && chown -R ${APP_USER_ID} ${USER_HOME} \
-    && chown -R ${APP_USER_ID} /etc/ssl/node
-
-RUN cp /etc/ssl/certs/ca-certificates.crt /etc/ssl/trusted
-
-# switch to app user
-USER ${APP_USER_ID}
-WORKDIR ${APP_USER_HOME}/app
-
-COPY --chown=${USERNAME}:${USERNAME} package*.json ./
-
-RUN --mount=type=secret,id=npmrc,target=${USER_HOME}/.npmrc,uid=${USER_ID} npm install
-
-COPY --chown=${USERNAME}:${USERNAME} . .
+WORKDIR /app
+COPY . ./
+RUN npm ci -ws --include-workspace-root
 
 ###################
 # BUILD FOR PRODUCTION
 ###################
 
-ARG BASE_IMAGE_NODEJS_NAME
+ARG BASE_IMAGE_NODEJS_NAME=node:22-alpine
 
 FROM ${BASE_IMAGE_NODEJS_NAME}  As build
 
-ARG GROUP_NAME=qguser
-ARG GROUP_ID=1000
-ARG USERNAME=qguser
-ARG USER_ID=1001
-ARG USER_HOME=/home/qguser
-
-
-LABEL maintainer="Neutrinos GROW/PAT"
-LABEL description="YAKU core-api docker image based on Ubuntu-nodejs"
-
-ENV APP_GROUP_NAME=${GROUP_NAME} \
-    APP_GROUP_ID=${GROUP_ID} \
-    APP_USER_NAME=${USERNAME} \
-    APP_USER_ID=${USER_ID} \
-    APP_USER_HOME=${USER_HOME} \
-    PATH=$PATH:$APP_USER_HOME/node_modules/.bin \
-    NODE_ENV=development
-
-# no upgrade, only update - core image must be up-to-date!
-RUN set -uex \
-    && umask 0027 \
-    && /etc/init.d/setup-user.sh \
-    && chown -R ${APP_USER_ID} ${USER_HOME} \
-    && chown -R ${APP_USER_ID} /etc/ssl/node
-
-RUN cp /etc/ssl/certs/ca-certificates.crt /etc/ssl/trusted
+ENV PATH=$PATH:/app/node_modules/.bin \
+    NODE_ENV=development \
+    SKIP_HUSKY=1
 
-RUN apt update -y && apt-get install -y zip
+RUN apk --no-cache add zip
+WORKDIR /app
 
-
-WORKDIR ${APP_USER_HOME}/app
-
-COPY --from=development ${APP_USER_HOME}/app/node_modules ./node_modules
+COPY --from=development /app/node_modules ./node_modules
 COPY . .
 
 RUN npm config set ignore-scripts false
-RUN --mount=type=secret,id=npmrc,target=${APP_USER_HOME}/.npmrc,uid=${APP_USER_ID} npm run build
-RUN --mount=type=secret,id=npmrc,target=${APP_USER_HOME}/.npmrc,uid=${APP_USER_ID} npm install --omit=dev && npm cache clean --force
-
-RUN chown -R ${APP_USER_ID} ${APP_USER_HOME}/app
-
-# switch to app user
-USER ${APP_USER_ID}
+RUN npm run build
+RUN npm ci -ws --include-workspace-root --omit=dev && npm cache clean --force
 
 ###################
 # PRODUCTION
 ###################
 
-ARG BASE_IMAGE_NODEJS_NAME
+ARG BASE_IMAGE_NODEJS_NAME=node:22-alpine
 
 FROM ${BASE_IMAGE_NODEJS_NAME} AS production
 
@@ -114,37 +52,23 @@ ENV PORT=8080
 LABEL maintainer="Neutrinos GROW/PAT"
 LABEL description="YAKU core-api docker image based on Ubuntu-nodejs"
 
-ENV APP_GROUP_NAME=${GROUP_NAME} \
-    APP_GROUP_ID=${GROUP_ID} \
-    APP_USER_NAME=${USERNAME} \
-    APP_USER_ID=${USER_ID} \
-    APP_USER_HOME=${USER_HOME} \
-    PATH=$PATH:$APP_USER_HOME/node_modules/.bin
+ENV PATH=$PATH:/node_modules/.bin
 
-# no upgrade, only update - core image must be up-to-date!
-RUN set -uex \
-    && umask 0027 \
-    && /etc/init.d/setup-user.sh \
-    && chown -R ${APP_USER_ID} ${APP_USER_HOME} \
-    && chown -R ${APP_USER_ID} /etc/ssl/node
 
-RUN cp /etc/ssl/certs/ca-certificates.crt /etc/ssl/trusted
+RUN mkdir /data
 
-RUN mkdir /data && chown -R ${APP_USER_ID}:${APP_USER_ID} /data
+WORKDIR /app
 
-
-WORKDIR ${APP_USER_HOME}/app
-
-
-COPY examples ./examples
-COPY --from=build  ${APP_USER_HOME}/app/node_modules ./node_modules
-COPY --from=build  ${APP_USER_HOME}/app/dist ./dist
-COPY --from=build  ${APP_USER_HOME}/app/package.json ./package.json
+COPY qg-api-service/examples ./qg-api-service/examples
+COPY --from=build  /app/node_modules ./node_modules
+COPY --from=build  /app/qg-api-service/dist ./qg-api-service/dist
+COPY --from=build  /app/api-commons-lib/dist ./api-commons-lib/dist
+COPY --from=build  /app/api-keycloak-auth-lib/dist ./api-keycloak-auth-lib/dist
+COPY --from=build  /app/qg-api-service/node_modules ./qg-api-service/node_modules
+COPY --from=build  /app/api-commons-lib/node_modules ./api-commons-lib/node_modules
+COPY --from=build  /app/api-keycloak-auth-lib/node_modules ./api-keycloak-auth-lib/node_modules
+COPY --from=build  /app/qg-api-service/package.json ./qg-api-service/package.json
 
 EXPOSE ${PORT}
 
-RUN chown -R ${APP_USER_ID}:${APP_USER_ID} ${USER_HOME}/app
-# switch to app user
-USER ${APP_USER_ID}
-
-CMD [ "node", "dist/main.js" ]
\ No newline at end of file
+CMD [ "node", "qg-api-service/dist/main.js" ]
\ No newline at end of file
diff --git a/qg-api-service/qg-api-service/Dockerfile_original b/qg-api-service/qg-api-service/Dockerfile_original
new file mode 100644
index 00000000..f3363736
--- /dev/null
+++ b/qg-api-service/qg-api-service/Dockerfile_original
@@ -0,0 +1,150 @@
+###################
+# BUILD FOR LOCAL DEVELOPMENT
+###################
+
+ARG BASE_IMAGE_NODEJS_NAME
+
+FROM ${BASE_IMAGE_NODEJS_NAME} As development
+
+ARG GROUP_NAME=qguser
+ARG GROUP_ID=1000
+ARG USERNAME=qguser
+ARG USER_ID=1001
+ARG USER_HOME=/home/qguser
+
+LABEL maintainer="Neutrinos GROW/PAT"
+LABEL description="YAKU core-api docker image based on Ubuntu-nodejs"
+
+ENV APP_GROUP_NAME=${GROUP_NAME} \
+    APP_GROUP_ID=${GROUP_ID} \
+    APP_USER_NAME=${USERNAME} \
+    APP_USER_ID=${USER_ID} \
+    APP_USER_HOME=${USER_HOME} \
+    PATH=$PATH:$APP_USER_HOME/node_modules/.bin \
+    NODE_ENV=development
+
+# no upgrade, only update - core image must be up-to-date!
+RUN set -uex \
+    && umask 0027 \
+    && /etc/init.d/setup-user.sh \
+    && chown -R ${APP_USER_ID} ${USER_HOME} \
+    && chown -R ${APP_USER_ID} /etc/ssl/node
+
+RUN cp /etc/ssl/certs/ca-certificates.crt /etc/ssl/trusted
+
+# switch to app user
+USER ${APP_USER_ID}
+WORKDIR ${APP_USER_HOME}/app
+
+COPY --chown=${USERNAME}:${USERNAME} package*.json ./
+
+RUN --mount=type=secret,id=npmrc,target=${USER_HOME}/.npmrc,uid=${USER_ID} npm install
+
+COPY --chown=${USERNAME}:${USERNAME} . .
+
+###################
+# BUILD FOR PRODUCTION
+###################
+
+ARG BASE_IMAGE_NODEJS_NAME
+
+FROM ${BASE_IMAGE_NODEJS_NAME}  As build
+
+ARG GROUP_NAME=qguser
+ARG GROUP_ID=1000
+ARG USERNAME=qguser
+ARG USER_ID=1001
+ARG USER_HOME=/home/qguser
+
+
+LABEL maintainer="Neutrinos GROW/PAT"
+LABEL description="YAKU core-api docker image based on Ubuntu-nodejs"
+
+ENV APP_GROUP_NAME=${GROUP_NAME} \
+    APP_GROUP_ID=${GROUP_ID} \
+    APP_USER_NAME=${USERNAME} \
+    APP_USER_ID=${USER_ID} \
+    APP_USER_HOME=${USER_HOME} \
+    PATH=$PATH:$APP_USER_HOME/node_modules/.bin \
+    NODE_ENV=development
+
+# no upgrade, only update - core image must be up-to-date!
+RUN set -uex \
+    && umask 0027 \
+    && /etc/init.d/setup-user.sh \
+    && chown -R ${APP_USER_ID} ${USER_HOME} \
+    && chown -R ${APP_USER_ID} /etc/ssl/node
+
+RUN cp /etc/ssl/certs/ca-certificates.crt /etc/ssl/trusted
+
+RUN apt update -y && apt-get install -y zip
+
+
+WORKDIR ${APP_USER_HOME}/app
+
+COPY --from=development ${APP_USER_HOME}/app/node_modules ./node_modules
+COPY . .
+
+RUN npm config set ignore-scripts false
+RUN --mount=type=secret,id=npmrc,target=${APP_USER_HOME}/.npmrc,uid=${APP_USER_ID} npm run build
+RUN --mount=type=secret,id=npmrc,target=${APP_USER_HOME}/.npmrc,uid=${APP_USER_ID} npm install --omit=dev && npm cache clean --force
+
+RUN chown -R ${APP_USER_ID} ${APP_USER_HOME}/app
+
+# switch to app user
+USER ${APP_USER_ID}
+
+###################
+# PRODUCTION
+###################
+
+ARG BASE_IMAGE_NODEJS_NAME
+
+FROM ${BASE_IMAGE_NODEJS_NAME} AS production
+
+ARG GROUP_NAME=qguser
+ARG GROUP_ID=1000
+ARG USERNAME=qguser
+ARG USER_ID=1001
+ARG USER_HOME=/home/qguser
+ARG VERSION=latest
+ENV IMAGE_VERSION=$VERSION
+ENV PORT=8080
+
+LABEL maintainer="Neutrinos GROW/PAT"
+LABEL description="YAKU core-api docker image based on Ubuntu-nodejs"
+
+ENV APP_GROUP_NAME=${GROUP_NAME} \
+    APP_GROUP_ID=${GROUP_ID} \
+    APP_USER_NAME=${USERNAME} \
+    APP_USER_ID=${USER_ID} \
+    APP_USER_HOME=${USER_HOME} \
+    PATH=$PATH:$APP_USER_HOME/node_modules/.bin
+
+# no upgrade, only update - core image must be up-to-date!
+RUN set -uex \
+    && umask 0027 \
+    && /etc/init.d/setup-user.sh \
+    && chown -R ${APP_USER_ID} ${APP_USER_HOME} \
+    && chown -R ${APP_USER_ID} /etc/ssl/node
+
+RUN cp /etc/ssl/certs/ca-certificates.crt /etc/ssl/trusted
+
+RUN mkdir /data && chown -R ${APP_USER_ID}:${APP_USER_ID} /data
+
+
+WORKDIR ${APP_USER_HOME}/app
+
+
+COPY examples ./examples
+COPY --from=build  ${APP_USER_HOME}/app/node_modules ./node_modules
+COPY --from=build  ${APP_USER_HOME}/app/dist ./dist
+COPY --from=build  ${APP_USER_HOME}/app/package.json ./package.json
+
+EXPOSE ${PORT}
+
+RUN chown -R ${APP_USER_ID}:${APP_USER_ID} ${USER_HOME}/app
+# switch to app user
+USER ${APP_USER_ID}
+
+CMD [ "node", "dist/main.js" ]
\ No newline at end of file
diff --git a/qg-api-service/qg-api-service/integration-tests/mocks/keycloak.ts b/qg-api-service/qg-api-service/integration-tests/mocks/keycloak.ts
index 659452a9..06d0c46c 100644
--- a/qg-api-service/qg-api-service/integration-tests/mocks/keycloak.ts
+++ b/qg-api-service/qg-api-service/integration-tests/mocks/keycloak.ts
@@ -3,7 +3,7 @@ import {
   KeyCloakUser,
   KeyCloakUserOfRole,
   MissingUserError,
-} from 'api-keycloak-auth-lib'
+} from '@B-S-F/api-keycloak-auth-lib'
 import { Injectable } from '@nestjs/common'
 import { KEYCLOAK_ADMIN_ROLE } from '../../src/guards/roles.guard'
 
diff --git a/qg-api-service/qg-api-service/integration-tests/util/nest-util.ts b/qg-api-service/qg-api-service/integration-tests/util/nest-util.ts
index 55d18869..9339856a 100644
--- a/qg-api-service/qg-api-service/integration-tests/util/nest-util.ts
+++ b/qg-api-service/qg-api-service/integration-tests/util/nest-util.ts
@@ -3,7 +3,7 @@ import {
   KeyCloakService,
   KeyCloakStrategy,
   KeyCloakUser,
-} from 'api-keycloak-auth-lib'
+} from '@B-S-F/api-keycloak-auth-lib'
 import { INestApplication } from '@nestjs/common'
 import { RouterModule } from '@nestjs/core'
 import { APP_GUARD, APP_INTERCEPTOR } from '@nestjs/core/constants'
diff --git a/qg-api-service/qg-api-service/package.json b/qg-api-service/qg-api-service/package.json
index dd32bbd5..131af66b 100644
--- a/qg-api-service/qg-api-service/package.json
+++ b/qg-api-service/qg-api-service/package.json
@@ -36,8 +36,8 @@
     "migration:revert": "npm run build && npm run typeorm -- migration:revert -d src/database/ormconfig.ts"
   },
   "dependencies": {
-    "api-commons-lib": "0.7.0",
-    "api-keycloak-auth-lib": "0.9.0",
+    "@B-S-F/api-commons-lib": "0.7.0",
+    "@B-S-F/api-keycloak-auth-lib": "0.9.0",
     "@nestjs/common": "^10.3.8",
     "@nestjs/core": "^10.3.8",
     "@nestjs/jwt": "^10.2.0",
diff --git a/qg-api-service/qg-api-service/src/app.module.ts b/qg-api-service/qg-api-service/src/app.module.ts
index e59b2fb8..d51da91e 100644
--- a/qg-api-service/qg-api-service/src/app.module.ts
+++ b/qg-api-service/qg-api-service/src/app.module.ts
@@ -1,4 +1,4 @@
-import { KeyCloakStrategy } from 'api-keycloak-auth-lib'
+import { KeyCloakStrategy } from '@B-S-F/api-keycloak-auth-lib'
 import { Module } from '@nestjs/common'
 import { APP_GUARD, APP_INTERCEPTOR, RouterModule } from '@nestjs/core'
 import { ScheduleModule } from '@nestjs/schedule'
diff --git a/qg-api-service/qg-api-service/src/gp-services/test-services.ts b/qg-api-service/qg-api-service/src/gp-services/test-services.ts
index 44d0cafc..e1e1aa19 100644
--- a/qg-api-service/qg-api-service/src/gp-services/test-services.ts
+++ b/qg-api-service/qg-api-service/src/gp-services/test-services.ts
@@ -1,5 +1,5 @@
-import { testingNamespaceId } from 'api-commons-lib'
-import { KeyCloakUser } from 'api-keycloak-auth-lib'
+import { testingNamespaceId } from '@B-S-F/api-commons-lib'
+import { KeyCloakUser } from '@B-S-F/api-keycloak-auth-lib'
 
 export const testUser: KeyCloakUser = {
   id: 1,
diff --git a/qg-api-service/qg-api-service/src/guards/keycloak-auth.guard.spec.ts b/qg-api-service/qg-api-service/src/guards/keycloak-auth.guard.spec.ts
index d7f8faaa..9d117d2a 100644
--- a/qg-api-service/qg-api-service/src/guards/keycloak-auth.guard.spec.ts
+++ b/qg-api-service/qg-api-service/src/guards/keycloak-auth.guard.spec.ts
@@ -1,4 +1,4 @@
-import { IsPublicAPI } from 'api-commons-lib'
+import { IsPublicAPI } from '@B-S-F/api-commons-lib'
 import { Controller, ExecutionContext } from '@nestjs/common'
 import { Reflector } from '@nestjs/core'
 import { Test, TestingModule } from '@nestjs/testing'
diff --git a/qg-api-service/qg-api-service/src/guards/keycloak-auth.guard.ts b/qg-api-service/qg-api-service/src/guards/keycloak-auth.guard.ts
index e2896591..483151a7 100644
--- a/qg-api-service/qg-api-service/src/guards/keycloak-auth.guard.ts
+++ b/qg-api-service/qg-api-service/src/guards/keycloak-auth.guard.ts
@@ -1,4 +1,4 @@
-import { KEYCLOAK_STRATEGY_NAME } from 'api-keycloak-auth-lib'
+import { KEYCLOAK_STRATEGY_NAME } from '@B-S-F/api-keycloak-auth-lib'
 import {
   ExecutionContext,
   Inject,
diff --git a/qg-api-service/qg-api-service/src/guards/roles.guard.spec.ts b/qg-api-service/qg-api-service/src/guards/roles.guard.spec.ts
index 28bec38f..8517acb9 100644
--- a/qg-api-service/qg-api-service/src/guards/roles.guard.spec.ts
+++ b/qg-api-service/qg-api-service/src/guards/roles.guard.spec.ts
@@ -1,4 +1,4 @@
-import { KeyCloakUser } from 'api-keycloak-auth-lib'
+import { KeyCloakUser } from '@B-S-F/api-keycloak-auth-lib'
 import { Controller } from '@nestjs/common'
 import { Reflector } from '@nestjs/core'
 import { Test, TestingModule } from '@nestjs/testing'
diff --git a/qg-api-service/qg-api-service/src/guards/roles.guard.ts b/qg-api-service/qg-api-service/src/guards/roles.guard.ts
index 41e914dd..4bdc349a 100644
--- a/qg-api-service/qg-api-service/src/guards/roles.guard.ts
+++ b/qg-api-service/qg-api-service/src/guards/roles.guard.ts
@@ -1,4 +1,4 @@
-import { KeyCloakUser } from 'api-keycloak-auth-lib'
+import { KeyCloakUser } from '@B-S-F/api-keycloak-auth-lib'
 import {
   CanActivate,
   ExecutionContext,
diff --git a/qg-api-service/qg-api-service/src/keycloak/local.keycloak.module.ts b/qg-api-service/qg-api-service/src/keycloak/local.keycloak.module.ts
index 1624631a..e499e4b0 100644
--- a/qg-api-service/qg-api-service/src/keycloak/local.keycloak.module.ts
+++ b/qg-api-service/qg-api-service/src/keycloak/local.keycloak.module.ts
@@ -1,7 +1,7 @@
 import {
   KeyCloakConfig,
   KeyCloakService,
-} from 'api-keycloak-auth-lib'
+} from '@B-S-F/api-keycloak-auth-lib'
 import { Module } from '@nestjs/common'
 import { LoggerModule } from 'nestjs-pino'
 import {
diff --git a/qg-api-service/qg-api-service/src/namespace/configs/configs.controller.files.spec.ts b/qg-api-service/qg-api-service/src/namespace/configs/configs.controller.files.spec.ts
index ada9ea4d..22364dcc 100644
--- a/qg-api-service/qg-api-service/src/namespace/configs/configs.controller.files.spec.ts
+++ b/qg-api-service/qg-api-service/src/namespace/configs/configs.controller.files.spec.ts
@@ -4,7 +4,7 @@ import {
   createMockResponse,
   streamToString,
   testingNamespaceId,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import { BadRequestException, NotFoundException } from '@nestjs/common'
 import { Test, TestingModule } from '@nestjs/testing'
 import { readFile } from 'fs/promises'
diff --git a/qg-api-service/qg-api-service/src/namespace/configs/configs.controller.spec.ts b/qg-api-service/qg-api-service/src/namespace/configs/configs.controller.spec.ts
index d1b3c840..cb42941b 100644
--- a/qg-api-service/qg-api-service/src/namespace/configs/configs.controller.spec.ts
+++ b/qg-api-service/qg-api-service/src/namespace/configs/configs.controller.spec.ts
@@ -9,7 +9,7 @@ import {
   createMockResponse,
   namespaceUrl,
   testingNamespaceId,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import { BadRequestException, NotFoundException } from '@nestjs/common'
 import { Test, TestingModule } from '@nestjs/testing'
 import { JsonValidatorService } from '../../gp-services/json-validator.service'
diff --git a/qg-api-service/qg-api-service/src/namespace/configs/configs.controller.ts b/qg-api-service/qg-api-service/src/namespace/configs/configs.controller.ts
index 7832bf6d..0015189f 100644
--- a/qg-api-service/qg-api-service/src/namespace/configs/configs.controller.ts
+++ b/qg-api-service/qg-api-service/src/namespace/configs/configs.controller.ts
@@ -9,7 +9,7 @@ import {
   validateBody,
   validateId,
   validateName,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import {
   BadRequestException,
   Body,
diff --git a/qg-api-service/qg-api-service/src/namespace/configs/configs.service.ts b/qg-api-service/qg-api-service/src/namespace/configs/configs.service.ts
index 107159a4..fd9576e4 100644
--- a/qg-api-service/qg-api-service/src/namespace/configs/configs.service.ts
+++ b/qg-api-service/qg-api-service/src/namespace/configs/configs.service.ts
@@ -2,7 +2,7 @@ import {
   EntityList,
   ListQueryHandler,
   decodeBufferToUTF8EncodedString,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import {
   BadRequestException,
   Inject,
diff --git a/qg-api-service/qg-api-service/src/namespace/configs/excel-transformer.service.ts b/qg-api-service/qg-api-service/src/namespace/configs/excel-transformer.service.ts
index a3411b5e..7aacb32d 100644
--- a/qg-api-service/qg-api-service/src/namespace/configs/excel-transformer.service.ts
+++ b/qg-api-service/qg-api-service/src/namespace/configs/excel-transformer.service.ts
@@ -1,4 +1,4 @@
-import { decodeBufferToUTF8EncodedString } from 'api-commons-lib'
+import { decodeBufferToUTF8EncodedString } from '@B-S-F/api-commons-lib'
 import { BadRequestException, Injectable } from '@nestjs/common'
 import * as xlsx from 'node-xlsx'
 import * as YAML from 'yaml'
diff --git a/qg-api-service/qg-api-service/src/namespace/configs/generator.service.ts b/qg-api-service/qg-api-service/src/namespace/configs/generator.service.ts
index a2aeef5a..bc051371 100644
--- a/qg-api-service/qg-api-service/src/namespace/configs/generator.service.ts
+++ b/qg-api-service/qg-api-service/src/namespace/configs/generator.service.ts
@@ -1,4 +1,4 @@
-import { decodeBufferToUTF8EncodedString } from 'api-commons-lib'
+import { decodeBufferToUTF8EncodedString } from '@B-S-F/api-commons-lib'
 import { BadRequestException, Injectable } from '@nestjs/common'
 import * as YAML from 'yaml'
 import { ZodError, z } from 'zod'
diff --git a/qg-api-service/qg-api-service/src/namespace/explanations/explanations.controller.ts b/qg-api-service/qg-api-service/src/namespace/explanations/explanations.controller.ts
index 0ee8c57b..411718c5 100644
--- a/qg-api-service/qg-api-service/src/namespace/explanations/explanations.controller.ts
+++ b/qg-api-service/qg-api-service/src/namespace/explanations/explanations.controller.ts
@@ -12,7 +12,7 @@ import {
 } from '@nestjs/swagger'
 import { ExplanationsService } from './explanations.service'
 import { ENABLE_EXPLANATIONS_FEATURE } from './../../config'
-import { validateId } from 'api-commons-lib'
+import { validateId } from '@B-S-F/api-commons-lib'
 
 class ExplanationsQueryOptions {
   @ApiProperty({
diff --git a/qg-api-service/qg-api-service/src/namespace/findings/finding.controller.spec.ts b/qg-api-service/qg-api-service/src/namespace/findings/finding.controller.spec.ts
index 4de3da61..26806907 100644
--- a/qg-api-service/qg-api-service/src/namespace/findings/finding.controller.spec.ts
+++ b/qg-api-service/qg-api-service/src/namespace/findings/finding.controller.spec.ts
@@ -9,7 +9,7 @@ import { MetricService } from '../metrics/metric.service'
 import {
   UrlHandlerFactory,
   UrlProtocolConfig,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import { UsersService } from '../users/users.service'
 describe('FindingController', () => {
   let findingController: FindingController
diff --git a/qg-api-service/qg-api-service/src/namespace/findings/finding.controller.ts b/qg-api-service/qg-api-service/src/namespace/findings/finding.controller.ts
index 6f9e4a58..2639c343 100644
--- a/qg-api-service/qg-api-service/src/namespace/findings/finding.controller.ts
+++ b/qg-api-service/qg-api-service/src/namespace/findings/finding.controller.ts
@@ -41,7 +41,7 @@ import {
   PaginatedData,
   toListQueryOptions,
   queryOptionsSchema,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 
 export class GetListFindingsDTO extends PaginatedData {
   @ApiProperty({
diff --git a/qg-api-service/qg-api-service/src/namespace/findings/finding.service.spec.ts b/qg-api-service/qg-api-service/src/namespace/findings/finding.service.spec.ts
index 8b8e7674..b133507f 100644
--- a/qg-api-service/qg-api-service/src/namespace/findings/finding.service.spec.ts
+++ b/qg-api-service/qg-api-service/src/namespace/findings/finding.service.spec.ts
@@ -21,7 +21,7 @@ import { HashFields } from './utils/interfaces/findingsInterfaces'
 import * as functions from './utils/functions'
 import { Metric } from '../metrics/entity/metric.entity'
 import { MetricService } from '../metrics/metric.service'
-import { EntityList } from 'api-commons-lib'
+import { EntityList } from '@B-S-F/api-commons-lib'
 import { RunStatus } from '../run/run.entity'
 import { SYSTEM_USER, UsersService } from '../users/users.service'
 import { UserInNamespaceDto } from '../users/users.utils'
diff --git a/qg-api-service/qg-api-service/src/namespace/findings/finding.service.ts b/qg-api-service/qg-api-service/src/namespace/findings/finding.service.ts
index 5afe779c..b3809efe 100644
--- a/qg-api-service/qg-api-service/src/namespace/findings/finding.service.ts
+++ b/qg-api-service/qg-api-service/src/namespace/findings/finding.service.ts
@@ -27,7 +27,7 @@ import {
   FilterOption,
   ListQueryHandler,
   SortOrder,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import { RunStatus } from '../run/run.entity'
 import { CreateMetricDTO } from '../metrics/dto/createMetric.dto'
 import { UpdateFindingDTO as UpdateFindingMetricDTO } from '../metrics/dto/updateFinding.dto'
diff --git a/qg-api-service/qg-api-service/src/namespace/metrics/metric.controller.spec.ts b/qg-api-service/qg-api-service/src/namespace/metrics/metric.controller.spec.ts
index 564fbe4c..67f413c6 100644
--- a/qg-api-service/qg-api-service/src/namespace/metrics/metric.controller.spec.ts
+++ b/qg-api-service/qg-api-service/src/namespace/metrics/metric.controller.spec.ts
@@ -4,7 +4,7 @@ import {
   UrlHandlerFactory,
   UrlProtocolConfig,
   createMockResponse,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import { MetricService } from './metric.service'
 import { getFindingsDTOFixtures } from './utils/fixture/data.fixture'
 
diff --git a/qg-api-service/qg-api-service/src/namespace/metrics/metric.controller.ts b/qg-api-service/qg-api-service/src/namespace/metrics/metric.controller.ts
index 4e3a6141..11ad0e3a 100644
--- a/qg-api-service/qg-api-service/src/namespace/metrics/metric.controller.ts
+++ b/qg-api-service/qg-api-service/src/namespace/metrics/metric.controller.ts
@@ -23,7 +23,7 @@ import {
   validateDate,
   PaginatedData,
   toListQueryOptions,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import { Logger, PinoLogger, InjectPinoLogger } from 'nestjs-pino'
 
 const allowedSortProperties = ['count', 'runId', 'configId', 'diff', 'datetime']
diff --git a/qg-api-service/qg-api-service/src/namespace/metrics/metric.service.spec.ts b/qg-api-service/qg-api-service/src/namespace/metrics/metric.service.spec.ts
index 1075dd13..c96b9a94 100644
--- a/qg-api-service/qg-api-service/src/namespace/metrics/metric.service.spec.ts
+++ b/qg-api-service/qg-api-service/src/namespace/metrics/metric.service.spec.ts
@@ -3,7 +3,7 @@ import { BadRequestException, NotFoundException } from '@nestjs/common'
 import { getRepositoryToken } from '@nestjs/typeorm'
 import { Repository } from 'typeorm'
 import { LoggerModule, PinoLogger, Logger } from 'nestjs-pino'
-import { ListQueryHandler, SortOrder } from 'api-commons-lib'
+import { ListQueryHandler, SortOrder } from '@B-S-F/api-commons-lib'
 import { Metric } from './entity/metric.entity'
 import { GetMetricDTO } from './dto/getMetric.dto'
 import { ServiceType } from './utils/enums/serviceType.enum'
diff --git a/qg-api-service/qg-api-service/src/namespace/metrics/metric.service.ts b/qg-api-service/qg-api-service/src/namespace/metrics/metric.service.ts
index 593499c5..1f86cf35 100644
--- a/qg-api-service/qg-api-service/src/namespace/metrics/metric.service.ts
+++ b/qg-api-service/qg-api-service/src/namespace/metrics/metric.service.ts
@@ -13,7 +13,7 @@ import { Metric } from './entity/metric.entity'
 import { StatusType } from '../findings/utils/enums/statusType.enum'
 import { ServiceType } from './utils/enums/serviceType.enum'
 import { Logger, PinoLogger, InjectPinoLogger } from 'nestjs-pino'
-import { ListQueryHandler } from 'api-commons-lib'
+import { ListQueryHandler } from '@B-S-F/api-commons-lib'
 
 @Injectable()
 export class MetricService {
diff --git a/qg-api-service/qg-api-service/src/namespace/module.utils.ts b/qg-api-service/qg-api-service/src/namespace/module.utils.ts
index 47426893..b82b1bc4 100644
--- a/qg-api-service/qg-api-service/src/namespace/module.utils.ts
+++ b/qg-api-service/qg-api-service/src/namespace/module.utils.ts
@@ -1,4 +1,4 @@
-import { KeyCloakUser } from 'api-keycloak-auth-lib'
+import { KeyCloakUser } from '@B-S-F/api-keycloak-auth-lib'
 import { InternalServerErrorException } from '@nestjs/common'
 import { Request } from 'express'
 /**
diff --git a/qg-api-service/qg-api-service/src/namespace/namespace.module.ts b/qg-api-service/qg-api-service/src/namespace/namespace.module.ts
index 25927514..7733b808 100644
--- a/qg-api-service/qg-api-service/src/namespace/namespace.module.ts
+++ b/qg-api-service/qg-api-service/src/namespace/namespace.module.ts
@@ -1,7 +1,7 @@
 import {
   UrlHandlerFactory,
   UrlProtocolConfig,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common'
 import { APP_GUARD } from '@nestjs/core'
 import { TypeOrmModule } from '@nestjs/typeorm'
diff --git a/qg-api-service/qg-api-service/src/namespace/namespace/namespace-access.guard.spec.ts b/qg-api-service/qg-api-service/src/namespace/namespace/namespace-access.guard.spec.ts
index 8fdbb7f0..1d687648 100644
--- a/qg-api-service/qg-api-service/src/namespace/namespace/namespace-access.guard.spec.ts
+++ b/qg-api-service/qg-api-service/src/namespace/namespace/namespace-access.guard.spec.ts
@@ -1,6 +1,6 @@
 import { BadRequestException } from '@nestjs/common'
 import { Test, TestingModule } from '@nestjs/testing'
-import { testingNamespaceId } from 'api-commons-lib'
+import { testingNamespaceId } from '@B-S-F/api-commons-lib'
 import { NamespaceAccessGuard } from './namespace-access.guard'
 import {
   KEYCLOAK_ADMIN_ROLE,
@@ -9,7 +9,7 @@ import {
 import {
   KeyCloakNamespace,
   KeyCloakUser,
-} from 'api-keycloak-auth-lib'
+} from '@B-S-F/api-keycloak-auth-lib'
 
 describe('NamespaceAccessGuard', () => {
   let testee: NamespaceAccessGuard
diff --git a/qg-api-service/qg-api-service/src/namespace/namespace/namespace-access.guard.ts b/qg-api-service/qg-api-service/src/namespace/namespace/namespace-access.guard.ts
index 027e3ee8..5d07611c 100644
--- a/qg-api-service/qg-api-service/src/namespace/namespace/namespace-access.guard.ts
+++ b/qg-api-service/qg-api-service/src/namespace/namespace/namespace-access.guard.ts
@@ -1,4 +1,4 @@
-import { validateId } from 'api-commons-lib'
+import { validateId } from '@B-S-F/api-commons-lib'
 import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common'
 import { ADMIN_ROLE, NAMESPACE_ACCESS_ROLE } from '../../guards/roles.guard'
 
diff --git a/qg-api-service/qg-api-service/src/namespace/namespace/namespace-local-id.service.spec.ts b/qg-api-service/qg-api-service/src/namespace/namespace/namespace-local-id.service.spec.ts
index 149ba963..daabf8b3 100644
--- a/qg-api-service/qg-api-service/src/namespace/namespace/namespace-local-id.service.spec.ts
+++ b/qg-api-service/qg-api-service/src/namespace/namespace/namespace-local-id.service.spec.ts
@@ -1,7 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing'
 import { getRepositoryToken } from '@nestjs/typeorm'
 import { Repository } from 'typeorm'
-import { testingNamespaceId } from 'api-commons-lib'
+import { testingNamespaceId } from '@B-S-F/api-commons-lib'
 import {
   NamespaceLocalIdService,
   NamespaceSequenceConfig,
diff --git a/qg-api-service/qg-api-service/src/namespace/namespace/namespace.controller.ts b/qg-api-service/qg-api-service/src/namespace/namespace/namespace.controller.ts
index 61578397..acae9151 100644
--- a/qg-api-service/qg-api-service/src/namespace/namespace/namespace.controller.ts
+++ b/qg-api-service/qg-api-service/src/namespace/namespace/namespace.controller.ts
@@ -1,8 +1,8 @@
-import { validateBody, validateId } from 'api-commons-lib'
+import { validateBody, validateId } from '@B-S-F/api-commons-lib'
 import {
   KeyCloakNamespace,
   KeyCloakUser,
-} from 'api-keycloak-auth-lib'
+} from '@B-S-F/api-keycloak-auth-lib'
 import {
   BadRequestException,
   Body,
diff --git a/qg-api-service/qg-api-service/src/namespace/namespace/namespace.service.spec.ts b/qg-api-service/qg-api-service/src/namespace/namespace/namespace.service.spec.ts
index 6d1d8e6b..6a7c92d9 100644
--- a/qg-api-service/qg-api-service/src/namespace/namespace/namespace.service.spec.ts
+++ b/qg-api-service/qg-api-service/src/namespace/namespace/namespace.service.spec.ts
@@ -1,7 +1,7 @@
 import {
   KeyCloakNamespace,
   KeyCloakUser,
-} from 'api-keycloak-auth-lib'
+} from '@B-S-F/api-keycloak-auth-lib'
 import { BadRequestException, NotFoundException } from '@nestjs/common'
 import { Test, TestingModule } from '@nestjs/testing'
 import { getRepositoryToken } from '@nestjs/typeorm'
diff --git a/qg-api-service/qg-api-service/src/namespace/namespace/namespace.service.ts b/qg-api-service/qg-api-service/src/namespace/namespace/namespace.service.ts
index c334f7b6..248d46bc 100644
--- a/qg-api-service/qg-api-service/src/namespace/namespace/namespace.service.ts
+++ b/qg-api-service/qg-api-service/src/namespace/namespace/namespace.service.ts
@@ -1,4 +1,4 @@
-import { KeyCloakUser } from 'api-keycloak-auth-lib'
+import { KeyCloakUser } from '@B-S-F/api-keycloak-auth-lib'
 import {
   BadRequestException,
   Inject,
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/approvals/approvals.controller.ts b/qg-api-service/qg-api-service/src/namespace/releases/approvals/approvals.controller.ts
index 4c3890ce..3462d04a 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/approvals/approvals.controller.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/approvals/approvals.controller.ts
@@ -6,7 +6,7 @@ import {
   toListQueryOptions,
   validateBody,
   validateId,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import {
   BadRequestException,
   Body,
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/approvals/approvals.module.ts b/qg-api-service/qg-api-service/src/namespace/releases/approvals/approvals.module.ts
index b02066d4..a1583fe9 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/approvals/approvals.module.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/approvals/approvals.module.ts
@@ -1,7 +1,7 @@
 import {
   UrlHandlerFactory,
   UrlProtocolConfig,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import { Module } from '@nestjs/common'
 import { TypeOrmModule } from '@nestjs/typeorm'
 import { SERVICE_PROTOCOL } from '../../../config'
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/approvals/approvals.service.ts b/qg-api-service/qg-api-service/src/namespace/releases/approvals/approvals.service.ts
index c1c775ae..13869ac1 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/approvals/approvals.service.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/approvals/approvals.service.ts
@@ -1,4 +1,4 @@
-import { EntityList, ListQueryHandler } from 'api-commons-lib'
+import { EntityList, ListQueryHandler } from '@B-S-F/api-commons-lib'
 import {
   BadRequestException,
   Inject,
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/approvals/approvals.util.ts b/qg-api-service/qg-api-service/src/namespace/releases/approvals/approvals.util.ts
index ee46484a..ddd20e58 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/approvals/approvals.util.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/approvals/approvals.util.ts
@@ -1,4 +1,4 @@
-import { PaginatedData } from 'api-commons-lib'
+import { PaginatedData } from '@B-S-F/api-commons-lib'
 import { ApiProperty } from '@nestjs/swagger'
 import { UserInNamespaceDto } from '../../../namespace/users/users.utils'
 import { z } from 'zod'
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/comments/comments.controller.ts b/qg-api-service/qg-api-service/src/namespace/releases/comments/comments.controller.ts
index a54f6ea1..4b70d74b 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/comments/comments.controller.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/comments/comments.controller.ts
@@ -6,7 +6,7 @@ import {
   UrlHandlerFactory,
   validateBody,
   validateId,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import {
   Body,
   Controller,
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/comments/comments.module.ts b/qg-api-service/qg-api-service/src/namespace/releases/comments/comments.module.ts
index 99f5f8ec..66f671ef 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/comments/comments.module.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/comments/comments.module.ts
@@ -1,7 +1,7 @@
 import {
   UrlHandlerFactory,
   UrlProtocolConfig,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import { Module } from '@nestjs/common'
 import { TypeOrmModule } from '@nestjs/typeorm'
 import { SERVICE_PROTOCOL } from '../../../config'
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/comments/comments.service.spec.ts b/qg-api-service/qg-api-service/src/namespace/releases/comments/comments.service.spec.ts
index e375cbc9..6695a6b8 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/comments/comments.service.spec.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/comments/comments.service.spec.ts
@@ -1,4 +1,4 @@
-import { EntityList } from 'api-commons-lib'
+import { EntityList } from '@B-S-F/api-commons-lib'
 import { Test } from '@nestjs/testing'
 import { getRepositoryToken } from '@nestjs/typeorm'
 import { LoggerModule } from 'nestjs-pino'
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/comments/comments.service.ts b/qg-api-service/qg-api-service/src/namespace/releases/comments/comments.service.ts
index 5d582854..89909efc 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/comments/comments.service.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/comments/comments.service.ts
@@ -2,7 +2,7 @@ import {
   EntityList,
   ListQueryHandler,
   SortOrder,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import { Inject, Injectable, NotFoundException } from '@nestjs/common'
 import { InjectRepository } from '@nestjs/typeorm'
 import { InjectPinoLogger, PinoLogger } from 'nestjs-pino'
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/comments/comments.utils.ts b/qg-api-service/qg-api-service/src/namespace/releases/comments/comments.utils.ts
index dc270bee..ea043de3 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/comments/comments.utils.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/comments/comments.utils.ts
@@ -1,7 +1,7 @@
 import {
   PaginatedData,
   PaginationQueryOptions,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'
 import { z } from 'zod'
 import { UserInNamespaceDto } from '../../../namespace/users/users.utils'
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/history.service.spec.ts b/qg-api-service/qg-api-service/src/namespace/releases/history.service.spec.ts
index 45252959..a7a1b16b 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/history.service.spec.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/history.service.spec.ts
@@ -1,4 +1,4 @@
-import { SortOrder } from 'api-commons-lib'
+import { SortOrder } from '@B-S-F/api-commons-lib'
 import { Test, TestingModule } from '@nestjs/testing'
 import { getRepositoryToken } from '@nestjs/typeorm'
 import { Repository } from 'typeorm'
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/history.service.ts b/qg-api-service/qg-api-service/src/namespace/releases/history.service.ts
index 4c848ac8..ce9746fe 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/history.service.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/history.service.ts
@@ -1,4 +1,4 @@
-import { SortOrder, UrlHandler } from 'api-commons-lib'
+import { SortOrder, UrlHandler } from '@B-S-F/api-commons-lib'
 import { Inject } from '@nestjs/common'
 import { InjectRepository } from '@nestjs/typeorm'
 import { QueryRunner, Repository } from 'typeorm'
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/history.utils.ts b/qg-api-service/qg-api-service/src/namespace/releases/history.utils.ts
index d4d7d3b5..486ce300 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/history.utils.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/history.utils.ts
@@ -1,4 +1,4 @@
-import { SortOrder } from 'api-commons-lib'
+import { SortOrder } from '@B-S-F/api-commons-lib'
 import { ApiExtraModels, ApiProperty, getSchemaPath } from '@nestjs/swagger'
 import { z } from 'zod'
 import { UserInNamespaceDto } from '../users/users.utils'
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/overrides/overrides.controllers.ts b/qg-api-service/qg-api-service/src/namespace/releases/overrides/overrides.controllers.ts
index d0037b15..a06f98f2 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/overrides/overrides.controllers.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/overrides/overrides.controllers.ts
@@ -2,7 +2,7 @@ import {
   UrlHandlerFactory,
   validateId,
   validateBody,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import {
   Controller,
   Inject,
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/overrides/overrides.module.ts b/qg-api-service/qg-api-service/src/namespace/releases/overrides/overrides.module.ts
index d807a91c..12b554c0 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/overrides/overrides.module.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/overrides/overrides.module.ts
@@ -1,7 +1,7 @@
 import {
   UrlHandlerFactory,
   UrlProtocolConfig,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import { Module } from '@nestjs/common'
 import { TypeOrmModule } from '@nestjs/typeorm'
 import { SERVICE_PROTOCOL } from '../../../config'
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/releases.controller.spec.ts b/qg-api-service/qg-api-service/src/namespace/releases/releases.controller.spec.ts
index c3a61bef..0a5c8bab 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/releases.controller.spec.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/releases.controller.spec.ts
@@ -5,7 +5,7 @@ import {
   UrlHandlerFactory,
   UrlProtocolConfig,
   createMockResponse,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import {
   BadRequestException,
   InternalServerErrorException,
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/releases.controller.ts b/qg-api-service/qg-api-service/src/namespace/releases/releases.controller.ts
index 94dabe93..068bfd02 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/releases.controller.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/releases.controller.ts
@@ -6,7 +6,7 @@ import {
   UrlHandlerFactory,
   validateBody,
   validateId,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import {
   Body,
   Controller,
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/releases.module.ts b/qg-api-service/qg-api-service/src/namespace/releases/releases.module.ts
index 2c29f263..4677793d 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/releases.module.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/releases.module.ts
@@ -1,7 +1,7 @@
 import {
   UrlHandlerFactory,
   UrlProtocolConfig,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import { Module } from '@nestjs/common'
 import { TypeOrmModule } from '@nestjs/typeorm'
 import { SERVICE_PROTOCOL } from '../../config'
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/releases.service.ts b/qg-api-service/qg-api-service/src/namespace/releases/releases.service.ts
index bd7f69dd..45c95d32 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/releases.service.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/releases.service.ts
@@ -1,4 +1,4 @@
-import { EntityList, ListQueryHandler } from 'api-commons-lib'
+import { EntityList, ListQueryHandler } from '@B-S-F/api-commons-lib'
 import { Inject, Injectable, NotFoundException } from '@nestjs/common'
 import { InjectRepository } from '@nestjs/typeorm'
 import { In, LessThan, QueryRunner, Repository } from 'typeorm'
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/releases.utils.ts b/qg-api-service/qg-api-service/src/namespace/releases/releases.utils.ts
index 7d2610a6..69467c00 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/releases.utils.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/releases.utils.ts
@@ -1,4 +1,4 @@
-import { PaginatedData } from 'api-commons-lib'
+import { PaginatedData } from '@B-S-F/api-commons-lib'
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'
 import { z } from 'zod'
 import { UserInNamespaceDto } from '../users/users.utils'
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/tasks/tasks.controller.ts b/qg-api-service/qg-api-service/src/namespace/releases/tasks/tasks.controller.ts
index 333049b6..c37cbe0d 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/tasks/tasks.controller.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/tasks/tasks.controller.ts
@@ -3,7 +3,7 @@ import {
   UrlHandlerFactory,
   validateBody,
   validateId,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import {
   Body,
   Controller,
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/tasks/tasks.module.ts b/qg-api-service/qg-api-service/src/namespace/releases/tasks/tasks.module.ts
index 7f7f23df..9ea201d6 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/tasks/tasks.module.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/tasks/tasks.module.ts
@@ -1,7 +1,7 @@
 import {
   UrlHandlerFactory,
   UrlProtocolConfig,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import { Module } from '@nestjs/common'
 import { TypeOrmModule } from '@nestjs/typeorm'
 import { SERVICE_PROTOCOL } from '../../../config'
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/tasks/tasks.service.ts b/qg-api-service/qg-api-service/src/namespace/releases/tasks/tasks.service.ts
index 56195bd2..3faa116c 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/tasks/tasks.service.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/tasks/tasks.service.ts
@@ -1,4 +1,4 @@
-import { EntityList, ListQueryHandler } from 'api-commons-lib'
+import { EntityList, ListQueryHandler } from '@B-S-F/api-commons-lib'
 import {
   BadRequestException,
   Inject,
diff --git a/qg-api-service/qg-api-service/src/namespace/releases/tasks/tasks.utils.ts b/qg-api-service/qg-api-service/src/namespace/releases/tasks/tasks.utils.ts
index d6e811b1..a4f9d07f 100644
--- a/qg-api-service/qg-api-service/src/namespace/releases/tasks/tasks.utils.ts
+++ b/qg-api-service/qg-api-service/src/namespace/releases/tasks/tasks.utils.ts
@@ -3,7 +3,7 @@ import {
   PaginationQueryOptions,
   SortOrder,
   UrlHandler,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'
 import { z } from 'zod'
 import { UserInNamespaceDto } from '../../../namespace/users/users.utils'
diff --git a/qg-api-service/qg-api-service/src/namespace/run/clean-test-data.spec.ts b/qg-api-service/qg-api-service/src/namespace/run/clean-test-data.spec.ts
index d4efb115..9cbc171c 100644
--- a/qg-api-service/qg-api-service/src/namespace/run/clean-test-data.spec.ts
+++ b/qg-api-service/qg-api-service/src/namespace/run/clean-test-data.spec.ts
@@ -1,4 +1,4 @@
-import { EntityList, ListQueryHandler } from 'api-commons-lib'
+import { EntityList, ListQueryHandler } from '@B-S-F/api-commons-lib'
 import { Test, TestingModule } from '@nestjs/testing'
 import { ConfigEntity } from '../configs/config.entity'
 import { ConfigsService } from '../configs/configs.service'
diff --git a/qg-api-service/qg-api-service/src/namespace/run/clean-test-data.ts b/qg-api-service/qg-api-service/src/namespace/run/clean-test-data.ts
index 7ca8cd81..2b8ce6b2 100644
--- a/qg-api-service/qg-api-service/src/namespace/run/clean-test-data.ts
+++ b/qg-api-service/qg-api-service/src/namespace/run/clean-test-data.ts
@@ -1,4 +1,4 @@
-import { ListQueryHandler, SortOrder } from 'api-commons-lib'
+import { ListQueryHandler, SortOrder } from '@B-S-F/api-commons-lib'
 import { Inject, Injectable, Logger } from '@nestjs/common'
 import { Timeout } from '@nestjs/schedule'
 import { ConfigEntity } from '../configs/config.entity'
diff --git a/qg-api-service/qg-api-service/src/namespace/run/run.controller.spec.ts b/qg-api-service/qg-api-service/src/namespace/run/run.controller.spec.ts
index 44b23cf5..11a4f0a2 100644
--- a/qg-api-service/qg-api-service/src/namespace/run/run.controller.spec.ts
+++ b/qg-api-service/qg-api-service/src/namespace/run/run.controller.spec.ts
@@ -11,7 +11,7 @@ import {
   createMockResponse,
   namespaceUrl,
   testingNamespaceId,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import {
   BadRequestException,
   HttpStatus,
diff --git a/qg-api-service/qg-api-service/src/namespace/run/run.controller.ts b/qg-api-service/qg-api-service/src/namespace/run/run.controller.ts
index 8d03583b..9b3f6e23 100644
--- a/qg-api-service/qg-api-service/src/namespace/run/run.controller.ts
+++ b/qg-api-service/qg-api-service/src/namespace/run/run.controller.ts
@@ -9,7 +9,7 @@ import {
   toListQueryOptions,
   validateBody,
   validateId,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import {
   Body,
   Controller,
diff --git a/qg-api-service/qg-api-service/src/namespace/run/run.service.spec.ts b/qg-api-service/qg-api-service/src/namespace/run/run.service.spec.ts
index 09b9a6eb..c58fae5c 100644
--- a/qg-api-service/qg-api-service/src/namespace/run/run.service.spec.ts
+++ b/qg-api-service/qg-api-service/src/namespace/run/run.service.spec.ts
@@ -1,4 +1,4 @@
-import { streamToString } from 'api-commons-lib'
+import { streamToString } from '@B-S-F/api-commons-lib'
 import { BadRequestException, NotFoundException } from '@nestjs/common'
 import { Test, TestingModule } from '@nestjs/testing'
 import { getRepositoryToken } from '@nestjs/typeorm'
@@ -14,7 +14,7 @@ import {
   SaveOptions,
   SelectQueryBuilder,
 } from 'typeorm'
-import { testingNamespaceId } from 'api-commons-lib'
+import { testingNamespaceId } from '@B-S-F/api-commons-lib'
 import { ConfigEntity } from '../configs/config.entity'
 import { ConfigsService } from '../configs/configs.service'
 import { RequestUser } from '../module.utils'
diff --git a/qg-api-service/qg-api-service/src/namespace/run/run.service.ts b/qg-api-service/qg-api-service/src/namespace/run/run.service.ts
index d3c3dd78..1589fc9b 100644
--- a/qg-api-service/qg-api-service/src/namespace/run/run.service.ts
+++ b/qg-api-service/qg-api-service/src/namespace/run/run.service.ts
@@ -2,7 +2,7 @@ import {
   EntityList,
   FilterOption,
   ListQueryHandler,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import {
   BadRequestException,
   Inject,
diff --git a/qg-api-service/qg-api-service/src/namespace/secret/secret.controller.spec.ts b/qg-api-service/qg-api-service/src/namespace/secret/secret.controller.spec.ts
index a1737c28..e55ed9c4 100644
--- a/qg-api-service/qg-api-service/src/namespace/secret/secret.controller.spec.ts
+++ b/qg-api-service/qg-api-service/src/namespace/secret/secret.controller.spec.ts
@@ -5,7 +5,7 @@ import {
   toListQueryOptions,
   createMockResponse,
   namespaceUrl,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import { BadRequestException, NotFoundException } from '@nestjs/common'
 import { Test, TestingModule } from '@nestjs/testing'
 import { Response } from 'express'
diff --git a/qg-api-service/qg-api-service/src/namespace/secret/secret.controller.ts b/qg-api-service/qg-api-service/src/namespace/secret/secret.controller.ts
index 0372b7a7..235968f0 100644
--- a/qg-api-service/qg-api-service/src/namespace/secret/secret.controller.ts
+++ b/qg-api-service/qg-api-service/src/namespace/secret/secret.controller.ts
@@ -8,7 +8,7 @@ import {
   validateBody,
   validateName,
   validateId,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import {
   Body,
   Controller,
diff --git a/qg-api-service/qg-api-service/src/namespace/secret/secret.service.ts b/qg-api-service/qg-api-service/src/namespace/secret/secret.service.ts
index b4d4ded8..88c16bb5 100644
--- a/qg-api-service/qg-api-service/src/namespace/secret/secret.service.ts
+++ b/qg-api-service/qg-api-service/src/namespace/secret/secret.service.ts
@@ -1,4 +1,4 @@
-import { EntityList, ListQueryHandler } from 'api-commons-lib'
+import { EntityList, ListQueryHandler } from '@B-S-F/api-commons-lib'
 import {
   BadRequestException,
   Inject,
diff --git a/qg-api-service/qg-api-service/src/namespace/subscriptions/subscription.controller.spec.ts b/qg-api-service/qg-api-service/src/namespace/subscriptions/subscription.controller.spec.ts
index 3fd9c94d..d6d8c289 100644
--- a/qg-api-service/qg-api-service/src/namespace/subscriptions/subscription.controller.spec.ts
+++ b/qg-api-service/qg-api-service/src/namespace/subscriptions/subscription.controller.spec.ts
@@ -4,7 +4,7 @@ import { Repository } from 'typeorm'
 import { SubscriptionController } from './subscription.controller'
 import { SubscriptionService } from './subscription.service'
 import { SubscriptionEntity } from './entity/subscription.entity'
-import { KeyCloakUser } from 'api-keycloak-auth-lib'
+import { KeyCloakUser } from '@B-S-F/api-keycloak-auth-lib'
 import { SubscriptionOperation, SubscriptionPostDto } from './subscription.dto'
 import { Logger, LoggerModule, PinoLogger } from 'nestjs-pino'
 import { UsersModule } from '../users/users.module'
diff --git a/qg-api-service/qg-api-service/src/namespace/subscriptions/subscription.controller.ts b/qg-api-service/qg-api-service/src/namespace/subscriptions/subscription.controller.ts
index 88d85a65..ee277270 100644
--- a/qg-api-service/qg-api-service/src/namespace/subscriptions/subscription.controller.ts
+++ b/qg-api-service/qg-api-service/src/namespace/subscriptions/subscription.controller.ts
@@ -20,10 +20,10 @@ import {
   HttpCode,
   Get,
 } from '@nestjs/common'
-import { validateBody } from 'api-commons-lib'
+import { validateBody } from '@B-S-F/api-commons-lib'
 import { SubscriptionService } from './subscription.service'
 import { z } from 'zod'
-import { KeyCloakUser } from 'api-keycloak-auth-lib'
+import { KeyCloakUser } from '@B-S-F/api-keycloak-auth-lib'
 import { Request } from 'express'
 import {
   SubscriptionDto,
diff --git a/qg-api-service/qg-api-service/src/namespace/users/users.controller.ts b/qg-api-service/qg-api-service/src/namespace/users/users.controller.ts
index af034059..50750c8e 100644
--- a/qg-api-service/qg-api-service/src/namespace/users/users.controller.ts
+++ b/qg-api-service/qg-api-service/src/namespace/users/users.controller.ts
@@ -3,7 +3,7 @@ import {
   ListQueryHandler,
   toListQueryOptions,
   UrlHandlerFactory,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import { Controller, Get, Inject, Param, Query, Res } from '@nestjs/common'
 import {
   ApiBearerAuth,
diff --git a/qg-api-service/qg-api-service/src/namespace/users/users.module.ts b/qg-api-service/qg-api-service/src/namespace/users/users.module.ts
index 5e7b5a2d..165bd3db 100644
--- a/qg-api-service/qg-api-service/src/namespace/users/users.module.ts
+++ b/qg-api-service/qg-api-service/src/namespace/users/users.module.ts
@@ -1,7 +1,7 @@
 import {
   UrlHandlerFactory,
   UrlProtocolConfig,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import { Module } from '@nestjs/common'
 import { SERVICE_PROTOCOL } from '../../config'
 import { UsersController } from './users.controller'
diff --git a/qg-api-service/qg-api-service/src/namespace/users/users.service.spec.ts b/qg-api-service/qg-api-service/src/namespace/users/users.service.spec.ts
index 3de6b511..813e7775 100644
--- a/qg-api-service/qg-api-service/src/namespace/users/users.service.spec.ts
+++ b/qg-api-service/qg-api-service/src/namespace/users/users.service.spec.ts
@@ -1,9 +1,9 @@
-import { SortOrder } from 'api-commons-lib'
+import { SortOrder } from '@B-S-F/api-commons-lib'
 import {
   KeyCloakService,
   KeyCloakUserOfRole,
   MissingUserError,
-} from 'api-keycloak-auth-lib'
+} from '@B-S-F/api-keycloak-auth-lib'
 import { Test, TestingModule } from '@nestjs/testing'
 import { LoggerModule } from 'nestjs-pino'
 import { LocalKeyCloakModule } from '../../keycloak/local.keycloak.module'
diff --git a/qg-api-service/qg-api-service/src/namespace/users/users.service.ts b/qg-api-service/qg-api-service/src/namespace/users/users.service.ts
index b758f9dc..19b50895 100644
--- a/qg-api-service/qg-api-service/src/namespace/users/users.service.ts
+++ b/qg-api-service/qg-api-service/src/namespace/users/users.service.ts
@@ -1,9 +1,9 @@
-import { EntityList, SortOrder } from 'api-commons-lib'
+import { EntityList, SortOrder } from '@B-S-F/api-commons-lib'
 import {
   KeyCloakService,
   KeyCloakUserOfRole,
   MissingUserError,
-} from 'api-keycloak-auth-lib'
+} from '@B-S-F/api-keycloak-auth-lib'
 import {
   Inject,
   Injectable,
diff --git a/qg-api-service/qg-api-service/src/namespace/users/users.utils.ts b/qg-api-service/qg-api-service/src/namespace/users/users.utils.ts
index af96d21e..be69cb47 100644
--- a/qg-api-service/qg-api-service/src/namespace/users/users.utils.ts
+++ b/qg-api-service/qg-api-service/src/namespace/users/users.utils.ts
@@ -2,7 +2,7 @@ import {
   PaginatedData,
   PaginationQueryOptions,
   SortOrder,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'
 import { z } from 'zod'
 
diff --git a/qg-api-service/qg-api-service/src/namespace/workflow/minio.service.spec.ts b/qg-api-service/qg-api-service/src/namespace/workflow/minio.service.spec.ts
index 7edd32d6..74647dd1 100644
--- a/qg-api-service/qg-api-service/src/namespace/workflow/minio.service.spec.ts
+++ b/qg-api-service/qg-api-service/src/namespace/workflow/minio.service.spec.ts
@@ -1,4 +1,4 @@
-import { streamToString } from 'api-commons-lib'
+import { streamToString } from '@B-S-F/api-commons-lib'
 import { NotFoundException } from '@nestjs/common'
 import { Test, TestingModule } from '@nestjs/testing'
 import { randomUUID } from 'crypto'
diff --git a/qg-api-service/qg-api-service/src/namespace/workflow/minio.service.ts b/qg-api-service/qg-api-service/src/namespace/workflow/minio.service.ts
index 0c28d23a..af061c0d 100644
--- a/qg-api-service/qg-api-service/src/namespace/workflow/minio.service.ts
+++ b/qg-api-service/qg-api-service/src/namespace/workflow/minio.service.ts
@@ -1,4 +1,4 @@
-import { streamToString } from 'api-commons-lib'
+import { streamToString } from '@B-S-F/api-commons-lib'
 import { Inject, Injectable, NotFoundException } from '@nestjs/common'
 import * as Minio from 'minio'
 import { InjectPinoLogger, PinoLogger } from 'nestjs-pino'
diff --git a/qg-api-service/qg-api-service/src/namespace/workflow/workflow-argo.service.spec.ts b/qg-api-service/qg-api-service/src/namespace/workflow/workflow-argo.service.spec.ts
index 73652b7f..0801ea06 100644
--- a/qg-api-service/qg-api-service/src/namespace/workflow/workflow-argo.service.spec.ts
+++ b/qg-api-service/qg-api-service/src/namespace/workflow/workflow-argo.service.spec.ts
@@ -1,4 +1,4 @@
-import { streamToString } from 'api-commons-lib'
+import { streamToString } from '@B-S-F/api-commons-lib'
 import { Test, TestingModule } from '@nestjs/testing'
 import { getRepositoryToken } from '@nestjs/typeorm'
 import crypto from 'crypto'
diff --git a/qg-api-service/qg-api-service/src/namespace/workflow/workflow-finished-service.ts b/qg-api-service/qg-api-service/src/namespace/workflow/workflow-finished-service.ts
index ac786d99..56541273 100644
--- a/qg-api-service/qg-api-service/src/namespace/workflow/workflow-finished-service.ts
+++ b/qg-api-service/qg-api-service/src/namespace/workflow/workflow-finished-service.ts
@@ -1,4 +1,4 @@
-import { streamToString } from 'api-commons-lib'
+import { streamToString } from '@B-S-F/api-commons-lib'
 import { Inject, Injectable } from '@nestjs/common'
 import { InjectRepository } from '@nestjs/typeorm'
 import { setTimeout } from 'timers/promises'
diff --git a/qg-api-service/qg-api-service/src/notifications/notification.service.spec.ts b/qg-api-service/qg-api-service/src/notifications/notification.service.spec.ts
index dbb0e48a..669fa8b4 100644
--- a/qg-api-service/qg-api-service/src/notifications/notification.service.spec.ts
+++ b/qg-api-service/qg-api-service/src/notifications/notification.service.spec.ts
@@ -3,7 +3,7 @@ import { Logger, LoggerModule, PinoLogger } from 'nestjs-pino'
 import {
   KeyCloakService,
   KeyCloakUserOfRole,
-} from 'api-keycloak-auth-lib'
+} from '@B-S-F/api-keycloak-auth-lib'
 import { DELETED_USER, SYSTEM_USER } from '../namespace/users/users.service'
 import { LocalKeyCloakModule } from '../keycloak/local.keycloak.module'
 import { MailingService, NullMailingService } from '../mailing/mailing.service'
diff --git a/qg-api-service/qg-api-service/src/notifications/notification.service.ts b/qg-api-service/qg-api-service/src/notifications/notification.service.ts
index 4cc09cef..2176fb5d 100644
--- a/qg-api-service/qg-api-service/src/notifications/notification.service.ts
+++ b/qg-api-service/qg-api-service/src/notifications/notification.service.ts
@@ -1,6 +1,6 @@
 import { Inject, Injectable } from '@nestjs/common'
 import { InjectPinoLogger, PinoLogger } from 'nestjs-pino'
-import { KeyCloakService } from 'api-keycloak-auth-lib'
+import { KeyCloakService } from '@B-S-F/api-keycloak-auth-lib'
 import { QG_LOG_LEVEL } from '../config'
 import { Notification } from '../mailing/mailing.utils'
 import { MailingService } from '../mailing/mailing.service'
diff --git a/qg-api-service/qg-api-service/src/service/authinfo/auth-info.controller.ts b/qg-api-service/qg-api-service/src/service/authinfo/auth-info.controller.ts
index 2e95ddff..fe10664c 100644
--- a/qg-api-service/qg-api-service/src/service/authinfo/auth-info.controller.ts
+++ b/qg-api-service/qg-api-service/src/service/authinfo/auth-info.controller.ts
@@ -1,4 +1,4 @@
-import { Public } from 'api-commons-lib'
+import { Public } from '@B-S-F/api-commons-lib'
 import { Controller, Get, Inject } from '@nestjs/common'
 import { ApiOkResponse, ApiOperation, ApiTags } from '@nestjs/swagger'
 import { AuthInfoDto, AuthInfoService } from './auth-info.service'
diff --git a/qg-api-service/qg-api-service/src/service/service.module.ts b/qg-api-service/qg-api-service/src/service/service.module.ts
index 2c27c63a..b4c3c4b9 100644
--- a/qg-api-service/qg-api-service/src/service/service.module.ts
+++ b/qg-api-service/qg-api-service/src/service/service.module.ts
@@ -2,7 +2,7 @@ import {
   OSSComplianceConfig,
   OSSComplianceService,
   OSSSourceController,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import { Module } from '@nestjs/common'
 import * as path from 'path'
 import {
diff --git a/qg-api-service/qg-api-service/src/service/version/version.controller.ts b/qg-api-service/qg-api-service/src/service/version/version.controller.ts
index a60d3c18..2dcff3c3 100644
--- a/qg-api-service/qg-api-service/src/service/version/version.controller.ts
+++ b/qg-api-service/qg-api-service/src/service/version/version.controller.ts
@@ -1,4 +1,4 @@
-import { Public } from 'api-commons-lib'
+import { Public } from '@B-S-F/api-commons-lib'
 import { Controller, Get } from '@nestjs/common'
 import { ApiOkResponse, ApiOperation, ApiTags } from '@nestjs/swagger'
 import { VersionInformation, VersionService } from './version.service'
diff --git a/qg-api-service/qg-api-service/src/user/long-running-token/interactive.login.guard.ts b/qg-api-service/qg-api-service/src/user/long-running-token/interactive.login.guard.ts
index a90c4ba8..33c743f2 100644
--- a/qg-api-service/qg-api-service/src/user/long-running-token/interactive.login.guard.ts
+++ b/qg-api-service/qg-api-service/src/user/long-running-token/interactive.login.guard.ts
@@ -6,7 +6,7 @@ import {
   HttpStatus,
 } from '@nestjs/common'
 import { Observable } from 'rxjs'
-import { KeyCloakUser } from 'api-keycloak-auth-lib'
+import { KeyCloakUser } from '@B-S-F/api-keycloak-auth-lib'
 
 @Injectable()
 export class InteractiveLoginGuard implements CanActivate {
diff --git a/qg-api-service/qg-api-service/src/user/long-running-token/long.running.strategy.ts b/qg-api-service/qg-api-service/src/user/long-running-token/long.running.strategy.ts
index 2c7780ba..33562753 100644
--- a/qg-api-service/qg-api-service/src/user/long-running-token/long.running.strategy.ts
+++ b/qg-api-service/qg-api-service/src/user/long-running-token/long.running.strategy.ts
@@ -2,7 +2,7 @@ import { Inject, Injectable, UnauthorizedException } from '@nestjs/common'
 import { PassportStrategy } from '@nestjs/passport'
 import { Strategy } from 'passport-http-bearer'
 import { LongRunningTokenService } from './long.running.token.service'
-import { KeyCloakService } from 'api-keycloak-auth-lib'
+import { KeyCloakService } from '@B-S-F/api-keycloak-auth-lib'
 import { AuthCache } from './long.running.token.cache'
 
 export const LONG_RUNNING_TOKEN_STRATEGY_NAME = 'LRT'
diff --git a/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.cache.spec.ts b/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.cache.spec.ts
index c50a7a64..c8a1c1a9 100644
--- a/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.cache.spec.ts
+++ b/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.cache.spec.ts
@@ -1,4 +1,4 @@
-import { KeyCloakUser } from 'api-keycloak-auth-lib'
+import { KeyCloakUser } from '@B-S-F/api-keycloak-auth-lib'
 import { AuthCache, AuthCacheConfig } from './long.running.token.cache'
 
 describe('AuthCache', () => {
diff --git a/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.cache.ts b/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.cache.ts
index a1345867..59747882 100644
--- a/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.cache.ts
+++ b/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.cache.ts
@@ -1,4 +1,4 @@
-import { KeyCloakUser } from 'api-keycloak-auth-lib'
+import { KeyCloakUser } from '@B-S-F/api-keycloak-auth-lib'
 import { Inject, Injectable } from '@nestjs/common'
 
 interface MapValue {
diff --git a/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.controller.ts b/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.controller.ts
index 222055c4..75d50d87 100644
--- a/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.controller.ts
+++ b/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.controller.ts
@@ -6,7 +6,7 @@ import {
   toListQueryOptions,
   validateBody,
   validateId,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import {
   Body,
   Controller,
diff --git a/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.module.ts b/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.module.ts
index 3b7292fa..11ee0121 100644
--- a/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.module.ts
+++ b/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.module.ts
@@ -12,7 +12,7 @@ import { SERVICE_PROTOCOL } from '../../config'
 import {
   UrlHandlerFactory,
   UrlProtocolConfig,
-} from 'api-commons-lib'
+} from '@B-S-F/api-commons-lib'
 import { AuthCache, AuthCacheConfig } from './long.running.token.cache'
 import { LongRunningTokenAuthGuard } from './long.running.token.auth.guard'
 
diff --git a/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.service.ts b/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.service.ts
index 10177e17..b53e0f4c 100644
--- a/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.service.ts
+++ b/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.service.ts
@@ -1,4 +1,4 @@
-import { ListQueryHandler } from 'api-commons-lib'
+import { ListQueryHandler } from '@B-S-F/api-commons-lib'
 import { Inject, Injectable, UnauthorizedException } from '@nestjs/common'
 import { InjectRepository } from '@nestjs/typeorm'
 import { isUUID } from 'class-validator'
diff --git a/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.utils.ts b/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.utils.ts
index e05e3421..7895d3a7 100644
--- a/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.utils.ts
+++ b/qg-api-service/qg-api-service/src/user/long-running-token/long.running.token.utils.ts
@@ -1,6 +1,6 @@
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'
 import { LongRunningTokenEntity, STATUS } from './long.running.token.entity'
-import { PaginatedData } from 'api-commons-lib'
+import { PaginatedData } from '@B-S-F/api-commons-lib'
 import { z } from 'zod'
 
 export const allowedSortProperties = [
diff --git a/qg-api-service/qg-api-service/src/user/user-profile/user-profile.controller.ts b/qg-api-service/qg-api-service/src/user/user-profile/user-profile.controller.ts
index 5d6b906c..da077d9f 100644
--- a/qg-api-service/qg-api-service/src/user/user-profile/user-profile.controller.ts
+++ b/qg-api-service/qg-api-service/src/user/user-profile/user-profile.controller.ts
@@ -19,11 +19,11 @@ import {
   ApiUnauthorizedResponse,
 } from '@nestjs/swagger'
 import { Request } from 'express'
-import { KeyCloakUser } from 'api-keycloak-auth-lib'
+import { KeyCloakUser } from '@B-S-F/api-keycloak-auth-lib'
 import { GetUserProfileDto } from './dto/get-user-profile.dto'
 import { UpdateUserProfileDto } from './dto/update-user-profile.dto'
 import { z } from 'zod'
-import { validateBody } from 'api-commons-lib'
+import { validateBody } from '@B-S-F/api-commons-lib'
 import { EditorType } from './utils/types'
 
 @ApiBearerAuth()