diff --git a/.gitlab/ci/pcp-ballistics-service.yml b/.gitlab/ci/pcp-ballistics-service.yml
index e7eb207..7c337a2 100644
--- a/.gitlab/ci/pcp-ballistics-service.yml
+++ b/.gitlab/ci/pcp-ballistics-service.yml
@@ -95,7 +95,7 @@ variables:
 
 ballistics:test:
   stage: test
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   services:
     - name: repo.nstart.cloud/postgis/postgis:16-3.4
       alias: postgres
@@ -124,7 +124,7 @@ ballistics:test:
 
 ballistics:build:
   stage: build
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .ballistics:rules:build-and-image
     - .ballistics:gradle-cache
diff --git a/.gitlab/ci/pcp-complex-mission-service-tle.yml b/.gitlab/ci/pcp-complex-mission-service-tle.yml
index d577bc4..94e3b81 100644
--- a/.gitlab/ci/pcp-complex-mission-service-tle.yml
+++ b/.gitlab/ci/pcp-complex-mission-service-tle.yml
@@ -139,7 +139,7 @@ variables:
 
 complex-mission-service:test:
   stage: test
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .complex-mission-service:rules:test
     - .pcp-gradle-cache
@@ -158,7 +158,7 @@ complex-mission-service:test:
 
 complex-mission-service:build:
   stage: build
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .complex-mission-service:rules:build-and-image
     - .pcp-gradle-cache
@@ -300,7 +300,7 @@ complex-mission-service:deploy:master:
 
 tle-monitoring:test:
   stage: test
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   services:
     - name: repo.nstart.cloud/postgis/postgis:16-3.4
       alias: postgres
@@ -330,7 +330,7 @@ tle-monitoring:test:
 
 tle-monitoring:build:
   stage: build
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .tle-monitoring:rules:build-and-image
     - .pcp-gradle-cache
diff --git a/.gitlab/ci/pcp-coverage-scheme-service.yml b/.gitlab/ci/pcp-coverage-scheme-service.yml
index 79ac7fe..92abf30 100644
--- a/.gitlab/ci/pcp-coverage-scheme-service.yml
+++ b/.gitlab/ci/pcp-coverage-scheme-service.yml
@@ -86,7 +86,7 @@ variables:
 
 coverage-scheme:test:
   stage: test
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .coverage_scheme:rules:test
     - .coverage_scheme:gradle-cache
@@ -105,7 +105,7 @@ coverage-scheme:test:
 
 coverage-scheme:build:
   stage: build
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .coverage_scheme:rules:build-and-image
     - .coverage_scheme:gradle-cache
diff --git a/.gitlab/ci/pcp-dynamic-plan-service.yml b/.gitlab/ci/pcp-dynamic-plan-service.yml
index 1dfc458..27b6c14 100644
--- a/.gitlab/ci/pcp-dynamic-plan-service.yml
+++ b/.gitlab/ci/pcp-dynamic-plan-service.yml
@@ -87,7 +87,7 @@ variables:
 
 dynamic-plan:test:
   stage: test
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .dynamic_plan:rules:test
     - .dynamic_plan:gradle-cache
@@ -106,7 +106,7 @@ dynamic-plan:test:
 
 dynamic-plan:build:
   stage: build
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .dynamic_plan:rules:build-and-image
     - .dynamic_plan:gradle-cache
diff --git a/.gitlab/ci/pcp-mission-planing-service.yml b/.gitlab/ci/pcp-mission-planing-service.yml
index 4868a82..0d00c47 100644
--- a/.gitlab/ci/pcp-mission-planing-service.yml
+++ b/.gitlab/ci/pcp-mission-planing-service.yml
@@ -86,7 +86,7 @@ variables:
 
 mission-planing:test:
   stage: test
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .mission-planing:rules:test
     - .mission-planing:gradle-cache
@@ -105,7 +105,7 @@ mission-planing:test:
 
 mission-planing:build:
   stage: build
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .mission-planing:rules:build-and-image
     - .mission-planing:gradle-cache
diff --git a/.gitlab/ci/pcp-request-service.yml b/.gitlab/ci/pcp-request-service.yml
index d2b42c2..efdfa9d 100644
--- a/.gitlab/ci/pcp-request-service.yml
+++ b/.gitlab/ci/pcp-request-service.yml
@@ -85,7 +85,7 @@ variables:
 
 request:test:
   stage: test
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .request:rules:test
     - .request:gradle-cache
@@ -104,7 +104,7 @@ request:test:
 
 request:build:
   stage: build
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .request:rules:build-and-image
     - .request:gradle-cache
diff --git a/.gitlab/ci/pcp-satellite-catalog-service.yml b/.gitlab/ci/pcp-satellite-catalog-service.yml
index 27493d6..424ccea 100644
--- a/.gitlab/ci/pcp-satellite-catalog-service.yml
+++ b/.gitlab/ci/pcp-satellite-catalog-service.yml
@@ -85,7 +85,7 @@ variables:
 
 satellite-catalog:test:
   stage: test
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .satellite-catalog:rules:test
     - .satellite-catalog:gradle-cache
@@ -104,7 +104,7 @@ satellite-catalog:test:
 
 satellite-catalog:build:
   stage: build
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .satellite-catalog:rules:build-and-image
     - .satellite-catalog:gradle-cache
diff --git a/.gitlab/ci/pcp-spring-boot-admin-server.yml b/.gitlab/ci/pcp-spring-boot-admin-server.yml
index bd8b576..298be83 100644
--- a/.gitlab/ci/pcp-spring-boot-admin-server.yml
+++ b/.gitlab/ci/pcp-spring-boot-admin-server.yml
@@ -76,7 +76,7 @@ variables:
 
 spring-boot-admin:test:
   stage: test
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .spring-boot-admin:rules:test
     - .spring-boot-admin:gradle-cache
@@ -95,7 +95,7 @@ spring-boot-admin:test:
 
 spring-boot-admin:build:
   stage: build
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .spring-boot-admin:rules:build-and-image
     - .spring-boot-admin:gradle-cache
diff --git a/.gitlab/ci/pcp-stations-service.yml b/.gitlab/ci/pcp-stations-service.yml
index fa40ffa..22b4590 100644
--- a/.gitlab/ci/pcp-stations-service.yml
+++ b/.gitlab/ci/pcp-stations-service.yml
@@ -85,7 +85,7 @@ variables:
 
 stations:test:
   stage: test
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .stations:rules:test
     - .stations:gradle-cache
@@ -104,7 +104,7 @@ stations:test:
 
 stations:build:
   stage: build
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .stations:rules:build-and-image
     - .stations:gradle-cache
diff --git a/.gitlab/ci/pcp-ui-service.yml b/.gitlab/ci/pcp-ui-service.yml
index 09028d4..21111ae 100644
--- a/.gitlab/ci/pcp-ui-service.yml
+++ b/.gitlab/ci/pcp-ui-service.yml
@@ -86,7 +86,7 @@ variables:
 
 ui:test:
   stage: test
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .ui:rules:test
     - .ui:gradle-cache
@@ -105,7 +105,7 @@ ui:test:
 
 ui:build:
   stage: build
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .ui:rules:build-and-image
     - .ui:gradle-cache
diff --git a/.gitlab/ci/slots-service.yml b/.gitlab/ci/slots-service.yml
index eec3793..52749a2 100644
--- a/.gitlab/ci/slots-service.yml
+++ b/.gitlab/ci/slots-service.yml
@@ -86,7 +86,7 @@ variables:
 
 slots:test:
   stage: test
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   services:
     - name: repo.nstart.cloud/postgis/postgis:16-3.4
       alias: postgres
@@ -115,7 +115,7 @@ slots:test:
 
 slots:build:
   stage: build
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .slots:rules:build-and-image
     - .slots:gradle-cache
diff --git a/.gitlab/ci/spring-cloud-config-server.yml b/.gitlab/ci/spring-cloud-config-server.yml
index a25f6a6..e1e45b8 100644
--- a/.gitlab/ci/spring-cloud-config-server.yml
+++ b/.gitlab/ci/spring-cloud-config-server.yml
@@ -82,7 +82,7 @@ variables:
 
 config-server:test:
   stage: test
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .config-server:rules:test
     - .config-server:gradle-cache
@@ -101,7 +101,7 @@ config-server:test:
 
 config-server:build:
   stage: build
-  image: repo.nstart.cloud/nstart/gradle:jdk17-ubi10
+  image: repo.nstart.cloud/library/gradle:jdk17-ubi10
   extends:
     - .config-server:rules:build-and-image
     - .config-server:gradle-cache
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 22c6bfc..04156ef 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -38,14 +38,7 @@ pluginManagement {
     val versions_spring_dependency: String by settings
     val versions_sonarqube        : String by settings
     val versions_buildtools       : String by settings
-//
-//    resolutionStrategy {
-//        eachPlugin {
-//            if (requested.id.id == "org.sonarqube") {
-//                useModule("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:$versions_sonarqube")
-//            }
-//        }
-//    }
+
 
     plugins {
         kotlin("jvm")                         version versions_kotlin