diff --git a/library/common/templates/lib/dependencies/_clickhouseInjector.tpl b/library/common/templates/lib/dependencies/_clickhouseInjector.tpl
index 7756e5e8..281b005e 100644
--- a/library/common/templates/lib/dependencies/_clickhouseInjector.tpl
+++ b/library/common/templates/lib/dependencies/_clickhouseInjector.tpl
@@ -35,14 +35,14 @@ data:
   url:                 {{ $url }}
   jdbc:                {{ $jdbc }}
 
-{{- $_ := set .Values.clickhouse     "clickhousePassword" ($dbPass | quote) }}
-{{- $_ := set .Values.clickhouse.url "plain"              ($host | quote) }}
-{{- $_ := set .Values.clickhouse.url "plainhost"          ($host | quote) }}
-{{- $_ := set .Values.clickhouse.url "plainport"          ($portHost | quote) }}
-{{- $_ := set .Values.clickhouse.url "plainporthost"      ($portHost | quote) }}
-{{- $_ := set .Values.clickhouse.url "ping"               ($ping | quote) }}
-{{- $_ := set .Values.clickhouse.url "complete"           ($url | quote) }}
-{{- $_ := set .Values.clickhouse.url "jdbc"               ($jdbc | quote) }}
+{{- $_ := set .Values.clickhouse.creds     "clickhousePassword" ($dbPass | quote) }}
+{{- $_ := set .Values.clickhouse.creds "plain"              ($host | quote) }}
+{{- $_ := set .Values.clickhouse.creds "plainhost"          ($host | quote) }}
+{{- $_ := set .Values.clickhouse.creds "plainport"          ($portHost | quote) }}
+{{- $_ := set .Values.clickhouse.creds "plainporthost"      ($portHost | quote) }}
+{{- $_ := set .Values.clickhouse.creds "ping"               ($ping | quote) }}
+{{- $_ := set .Values.clickhouse.creds "complete"           ($url | quote) }}
+{{- $_ := set .Values.clickhouse.creds "jdbc"               ($jdbc | quote) }}
 
 {{- end }}
 {{- end -}}
diff --git a/library/common/templates/lib/dependencies/_mariadbInjector.tpl b/library/common/templates/lib/dependencies/_mariadbInjector.tpl
index bf220e0a..b3c738bb 100644
--- a/library/common/templates/lib/dependencies/_mariadbInjector.tpl
+++ b/library/common/templates/lib/dependencies/_mariadbInjector.tpl
@@ -38,14 +38,14 @@ data:
   jdbc-mysql: {{ ( printf "jdbc:mysql://%v-mariadb:3306/%v" .Release.Name .Values.mariadb.mariadbDatabase  ) }}
   jdbc-mariadb: {{ ( printf "jdbc:mariadb://%v-mariadb:3306/%v" .Release.Name .Values.mariadb.mariadbDatabase  ) }}
 type: Opaque
-{{- $_ := set .Values.mariadb "mariadbPassword" ( $dbPass | quote ) }}
-{{- $_ := set .Values.mariadb "mariadbRootPassword" ( $rootPass | quote ) }}
-{{- $_ := set .Values.mariadb.url "plain" ( ( printf "%v-%v" .Release.Name "mariadb" ) | quote ) }}
-{{- $_ := set .Values.mariadb.url "plainhost" ( ( printf "%v-%v" .Release.Name "mariadb" ) | quote ) }}
-{{- $_ := set .Values.mariadb.url "plainport" ( ( printf "%v-%v:3306" .Release.Name "mariadb" ) | quote ) }}
-{{- $_ := set .Values.mariadb.url "plainporthost" ( ( printf "%v-%v:3306" .Release.Name "mariadb" ) | quote ) }}
-{{- $_ := set .Values.mariadb.url "complete" ( ( printf "sql://%v:%v@%v-mariadb:3306/%v" .Values.mariadb.mariadbUsername $dbPass .Release.Name .Values.mariadb.mariadbDatabase  ) | quote ) }}
-{{- $_ := set .Values.mariadb.url "jdbc" ( ( printf "jdbc:sqlserver://%v-mariadb:3306/%v" .Release.Name .Values.mariadb.mariadbDatabase  ) | quote ) }}
+{{- $_ := set .Values.mariadb.creds "mariadbPassword" ( $dbPass | quote ) }}
+{{- $_ := set .Values.mariadb.creds "mariadbRootPassword" ( $rootPass | quote ) }}
+{{- $_ := set .Values.mariadb.creds "plain" ( ( printf "%v-%v" .Release.Name "mariadb" ) | quote ) }}
+{{- $_ := set .Values.mariadb.creds "plainhost" ( ( printf "%v-%v" .Release.Name "mariadb" ) | quote ) }}
+{{- $_ := set .Values.mariadb.creds "plainport" ( ( printf "%v-%v:3306" .Release.Name "mariadb" ) | quote ) }}
+{{- $_ := set .Values.mariadb.creds "plainporthost" ( ( printf "%v-%v:3306" .Release.Name "mariadb" ) | quote ) }}
+{{- $_ := set .Values.mariadb.creds "complete" ( ( printf "sql://%v:%v@%v-mariadb:3306/%v" .Values.mariadb.mariadbUsername $dbPass .Release.Name .Values.mariadb.mariadbDatabase  ) | quote ) }}
+{{- $_ := set .Values.mariadb.creds "jdbc" ( ( printf "jdbc:sqlserver://%v-mariadb:3306/%v" .Release.Name .Values.mariadb.mariadbDatabase  ) | quote ) }}
 
 {{- end }}
 {{- end -}}
diff --git a/library/common/templates/lib/dependencies/_mongodbInjector.tpl b/library/common/templates/lib/dependencies/_mongodbInjector.tpl
index a148ad04..3bd28123 100644
--- a/library/common/templates/lib/dependencies/_mongodbInjector.tpl
+++ b/library/common/templates/lib/dependencies/_mongodbInjector.tpl
@@ -37,14 +37,14 @@ data:
   plainhost: {{ ( printf "%v-%v" .Release.Name "mongodb" ) }}
   plainporthost: {{ ( printf "%v-%v:27017" .Release.Name "mongodb" ) }}
 type: Opaque
-{{- $_ := set .Values.mongodb "mongodbPassword" ( $dbPass | quote ) }}
-{{- $_ := set .Values.mongodb "mongodbRootPassword" ( $rootPass | quote ) }}
-{{- $_ := set .Values.mongodb.url "plain" ( ( printf "%v-%v" .Release.Name "mongodb" ) | quote ) }}
-{{- $_ := set .Values.mongodb.url "plainhost" ( ( printf "%v-%v" .Release.Name "mongodb" ) | quote ) }}
-{{- $_ := set .Values.mongodb.url "plainport" ( ( printf "%v-%v:27017" .Release.Name "mongodb" ) | quote ) }}
-{{- $_ := set .Values.mongodb.url "plainporthost" ( ( printf "%v-%v:27017" .Release.Name "mongodb" ) | quote ) }}
-{{- $_ := set .Values.mongodb.url "complete" ( ( printf "mongodb://%v:%v@%v-mongodb:27017/%v" .Values.mongodb.mongodbUsername $dbPass .Release.Name .Values.mongodb.mongodbDatabase  ) | quote ) }}
-{{- $_ := set .Values.mongodb.url "jdbc" ( ( printf "jdbc:mongodb://%v-mongodb:27017/%v" .Release.Name .Values.mongodb.mongodbDatabase  ) | quote ) }}
+{{- $_ := set .Values.mongodb.creds "mongodbPassword" ( $dbPass | quote ) }}
+{{- $_ := set .Values.mongodb.creds "mongodbRootPassword" ( $rootPass | quote ) }}
+{{- $_ := set .Values.mongodb.creds "plain" ( ( printf "%v-%v" .Release.Name "mongodb" ) | quote ) }}
+{{- $_ := set .Values.mongodb.creds "plainhost" ( ( printf "%v-%v" .Release.Name "mongodb" ) | quote ) }}
+{{- $_ := set .Values.mongodb.creds "plainport" ( ( printf "%v-%v:27017" .Release.Name "mongodb" ) | quote ) }}
+{{- $_ := set .Values.mongodb.creds "plainporthost" ( ( printf "%v-%v:27017" .Release.Name "mongodb" ) | quote ) }}
+{{- $_ := set .Values.mongodb.creds "complete" ( ( printf "mongodb://%v:%v@%v-mongodb:27017/%v" .Values.mongodb.mongodbUsername $dbPass .Release.Name .Values.mongodb.mongodbDatabase  ) | quote ) }}
+{{- $_ := set .Values.mongodb.creds "jdbc" ( ( printf "jdbc:mongodb://%v-mongodb:27017/%v" .Release.Name .Values.mongodb.mongodbDatabase  ) | quote ) }}
 
 {{- end }}
 {{- end -}}
diff --git a/library/common/templates/lib/dependencies/_redisInjector.tpl b/library/common/templates/lib/dependencies/_redisInjector.tpl
index 44c1ee12..58c12fe9 100644
--- a/library/common/templates/lib/dependencies/_redisInjector.tpl
+++ b/library/common/templates/lib/dependencies/_redisInjector.tpl
@@ -31,11 +31,11 @@ data:
   plainporthost: {{ ( printf "%v-%v:6379" .Release.Name "redis" ) }}
   plainhost: {{ ( printf "%v-%v" .Release.Name "redis" ) }}
 type: Opaque
-{{- $_ := set .Values.redis "redisPassword" ( $dbPass | quote ) }}
-{{- $_ := set .Values.redis.url "plain" ( ( printf "%v-%v" .Release.Name "redis" ) | quote ) }}
-{{- $_ := set .Values.redis.url "plainhost" ( ( printf "%v-%v" .Release.Name "redis" ) | quote ) }}
-{{- $_ := set .Values.redis.url "plainport" ( ( printf "%v-%v:6379" .Release.Name "redis" ) | quote ) }}
-{{- $_ := set .Values.redis.url "plainporthost" ( ( printf "%v-%v:6379" .Release.Name "redis" ) | quote ) }}
+{{- $_ := set .Values.redis.creds "redisPassword" ( $dbPass | quote ) }}
+{{- $_ := set .Values.redis.creds "plain" ( ( printf "%v-%v" .Release.Name "redis" ) | quote ) }}
+{{- $_ := set .Values.redis.creds "plainhost" ( ( printf "%v-%v" .Release.Name "redis" ) | quote ) }}
+{{- $_ := set .Values.redis.creds "plainport" ( ( printf "%v-%v:6379" .Release.Name "redis" ) | quote ) }}
+{{- $_ := set .Values.redis.creds "plainporthost" ( ( printf "%v-%v:6379" .Release.Name "redis" ) | quote ) }}
 
 {{- end }}
 {{- end -}}
diff --git a/library/common/templates/lib/dependencies/_solrInjector.tpl b/library/common/templates/lib/dependencies/_solrInjector.tpl
index c26f6ef1..d0b33b37 100644
--- a/library/common/templates/lib/dependencies/_solrInjector.tpl
+++ b/library/common/templates/lib/dependencies/_solrInjector.tpl
@@ -26,9 +26,9 @@ data:
   url: {{ ( printf "http://%v:%v@%v-solr:8983/url/%v" .Values.solr.solrUsername $solrPass .Release.Name .Values.solr.solrCores ) }}
   plainhost: {{ ( ( printf "%v-%v" .Release.Name "solr" ) ) }}
 type: Opaque
-{{- $_ := set .Values.solr "solrPassword" ( $solrPass | quote ) }}
-{{- $_ := set .Values.solr.url "plain" ( ( printf "%v-%v" .Release.Name "solr" ) | quote ) }}
-{{- $_ := set .Values.solr.url "plainhost" ( ( printf "%v-%v" .Release.Name "solr" ) | quote ) }}
+{{- $_ := set .Values.solr.creds "solrPassword" ( $solrPass | quote ) }}
+{{- $_ := set .Values.solr.creds "plain" ( ( printf "%v-%v" .Release.Name "solr" ) | quote ) }}
+{{- $_ := set .Values.solr.creds "plainhost" ( ( printf "%v-%v" .Release.Name "solr" ) | quote ) }}
 
 {{- end }}
 {{- end -}}
diff --git a/library/common/values.yaml b/library/common/values.yaml
index 9690fe7f..642b1ed9 100644
--- a/library/common/values.yaml
+++ b/library/common/values.yaml
@@ -707,7 +707,7 @@ cnpg:
     monitoring:
       enablePodMonitor: true
     # -- contains credentials and urls output by generator
-    creds: {}
+    .Values.solr.creds
     # -- contains postgresql settings
     # ref: https://cloudnative-pg.io/documentation/1.19/postgresql_conf/#the-postgresql-section
     postgresql: {}
@@ -717,7 +717,7 @@ cnpg:
 redis:
   enabled: false
   # -- can be used to make an easy accessable note which URLS to use to access the DB.
-  url: {}
+  creds: {}
   manifestManager:
     enabled: false
   secret:
@@ -730,7 +730,7 @@ mariadb:
   enabled: false
   existingSecret: "mariadbcreds"
   # -- can be used to make an easy accessable note which URLS to use to access the DB.
-  url: {}
+  creds: {}
   manifestManager:
     enabled: false
 
@@ -740,7 +740,7 @@ mongodb:
   enabled: false
   existingSecret: "mongodbcreds"
   # -- can be used to make an easy accessable note which URLS to use to access the DB.
-  url: {}
+  creds: {}
   manifestManager:
     enabled: false
 
@@ -750,7 +750,7 @@ clickhouse:
   enabled: false
   existingSecret: "clickhousecreds"
   # -- can be used to make an easy accessable note which URLS to use to access the DB.
-  url: {}
+  creds: {}
   manifestManager:
     enabled: false
 
@@ -762,6 +762,6 @@ solr:
   solrEnableAuthentication: "no"
   existingSecret: "solrcreds"
   # -- can be used to make an easy accessable note which URLS to use to access the DB.
-  url: {}
+  creds: {}
   manifestManager:
     enabled: false