diff --git a/jans-linux-setup/jans_setup/setup_app/installers/couchbase.py b/jans-linux-setup/jans_setup/setup_app/installers/couchbase.py
index b0f08e1ac54..aef35d64060 100644
--- a/jans-linux-setup/jans_setup/setup_app/installers/couchbase.py
+++ b/jans-linux-setup/jans_setup/setup_app/installers/couchbase.py
@@ -44,7 +44,7 @@ def install(self):
             Config.isCouchbaseUserAdmin = True
 
         if not Config.get('couchbaseTrustStorePass'):
-            Config.couchbaseTrustStorePass = 'secret'
+            Config.couchbaseTrustStorePass = self.getPW()
             Config.encoded_couchbaseTrustStorePass = self.obscure(Config.couchbaseTrustStorePass)
 
         if not Config.get('cb_query_node'):
diff --git a/jans-linux-setup/jans_setup/setup_app/utils/collect_properties.py b/jans-linux-setup/jans_setup/setup_app/utils/collect_properties.py
index d19e8b47dbe..507e119801a 100644
--- a/jans-linux-setup/jans_setup/setup_app/utils/collect_properties.py
+++ b/jans-linux-setup/jans_setup/setup_app/utils/collect_properties.py
@@ -143,8 +143,6 @@ def collect(self):
 
         Config.cache_provider_type = str(oxCacheConfiguration['cacheProviderType'])
 
-        Config.scim_rp_client_jks_pass = 'secret' # this is static
-
         # Other clients
         client_var_id_list = [
                     ('oxauth_client_id', '1001.'),