diff --git a/jans-config-api/common/src/main/java/io/jans/configapi/model/configuration/AssetMgtConfiguration.java b/jans-config-api/common/src/main/java/io/jans/configapi/model/configuration/AssetMgtConfiguration.java
index 565a6853804..a274bad53a4 100644
--- a/jans-config-api/common/src/main/java/io/jans/configapi/model/configuration/AssetMgtConfiguration.java
+++ b/jans-config-api/common/src/main/java/io/jans/configapi/model/configuration/AssetMgtConfiguration.java
@@ -31,10 +31,7 @@ public class AssetMgtConfiguration {
      */
     private String assetBaseDirectory;
 
-    /**
-     * List of supported service module where asset can be uploaded
-     */
-    private List<String> jansModules;
+    private List<String> jansServices;
 
     /**
      * Asset type mapped to server directory
@@ -81,14 +78,6 @@ public void setAssetBaseDirectory(String assetBaseDirectory) {
         this.assetBaseDirectory = assetBaseDirectory;
     }
 
-    public List<String> getJansModules() {
-        return jansModules;
-    }
-
-    public void setJansModules(List<String> jansModules) {
-        this.jansModules = jansModules;
-    }
-
     public List<AssetDirMapping> getAssetDirMapping() {
         return assetDirMapping;
     }
@@ -97,12 +86,22 @@ public void setAssetDirMapping(List<AssetDirMapping> assetDirMapping) {
         this.assetDirMapping = assetDirMapping;
     }
 
+    /**
+     * List of supported service module where asset can be uploaded
+     */
+    public List<String> getJansServices() {
+        return jansServices;
+    }
+
+    public void setJansServices(List<String> jansServices) {
+        this.jansServices = jansServices;
+    }
+
     @Override
     public String toString() {
         return "AssetMgtConfiguration [assetMgtEnabled=" + assetMgtEnabled + ", assetServerUploadEnabled="
                 + assetServerUploadEnabled + ", fileExtensionValidationEnabled=" + fileExtensionValidationEnabled
                 + ", moduleNameValidationEnabled=" + moduleNameValidationEnabled + ", assetBaseDirectory="
-                + assetBaseDirectory + ", jansModules=" + jansModules + ", assetDirMapping=" + assetDirMapping + "]";
+                + assetBaseDirectory + ", jansServices=" + jansServices + ", assetDirMapping=" + assetDirMapping + "]";
     }
-
 }
diff --git a/jans-core/document-store/src/main/java/io/jans/service/document/store/service/Document.java b/jans-core/document-store/src/main/java/io/jans/service/document/store/service/Document.java
index 41f698a0609..bf557738073 100644
--- a/jans-core/document-store/src/main/java/io/jans/service/document/store/service/Document.java
+++ b/jans-core/document-store/src/main/java/io/jans/service/document/store/service/Document.java
@@ -41,8 +41,8 @@ public class Document extends Entry implements Serializable {
 	@AttributeName
 	private Date creationDate;
 	
-	@AttributeName
-	private List<String> jansModuleProperty;
+	@AttributeName(name = "jansService")
+	private List<String> jansServices;
 
 	@AttributeName
 	private Integer jansLevel;
@@ -136,11 +136,19 @@ public void setJansAlias(String jansAlias) {
         this.jansAlias = jansAlias;
     }
 
+	public List<String> getJansServices() {
+		return jansServices;
+	}
+
+	public void setJansServices(List<String> jansServices) {
+		this.jansServices = jansServices;
+	}
+
     @Override
     public String toString() {
         return "Document [inum=" + inum + ", displayName=" + displayName + ", description=" + description
-                + ", document=" + document + ", creationDate=" + creationDate + ", jansModuleProperty="
-                + jansModuleProperty + ", jansLevel=" + jansLevel + ", jansRevision=" + jansRevision + ", jansEnabled="
+                + ", document=" + document + ", creationDate=" + creationDate + ", jansServices="
+                + jansServices + ", jansLevel=" + jansLevel + ", jansRevision=" + jansRevision + ", jansEnabled="
                 + jansEnabled + ", jansAlias=" + jansAlias + "]";
     }
 }
diff --git a/jans-linux-setup/jans_setup/schema/jans_schema.json b/jans-linux-setup/jans_setup/schema/jans_schema.json
index 00a30087328..4cfdc91400b 100644
--- a/jans-linux-setup/jans_setup/schema/jans_schema.json
+++ b/jans-linux-setup/jans_setup/schema/jans_schema.json
@@ -2308,6 +2308,19 @@
       "syntax": "1.3.6.1.4.1.1466.115.121.1.15",
       "x_origin": "Jans created attribute"
     },
+    {
+      "desc": "Jans Service property",
+      "equality": "caseIgnoreMatch",
+      "names": [
+        "jansService"
+      ],
+      "json": true,
+      "multivalued": true,
+      "oid": "jansAttr",
+      "substr": "caseIgnoreSubstringsMatch",
+      "syntax": "1.3.6.1.4.1.1466.115.121.1.15",
+      "x_origin": "Jans created attribute"
+    },
     {
       "desc": "Conf property",
       "equality": "caseIgnoreMatch",
@@ -5054,7 +5067,7 @@
         "description",
         "document",
         "creationDate",
-        "jansModuleProperty",
+        "jansServices",
         "jansLevel",
         "jansRevision",
         "jansEnabled",
diff --git a/jans-linux-setup/jans_setup/templates/jans-config-api/dynamic-conf.json b/jans-linux-setup/jans_setup/templates/jans-config-api/dynamic-conf.json
index 50f1cf69dd1..40ce93e77a4 100644
--- a/jans-linux-setup/jans_setup/templates/jans-config-api/dynamic-conf.json
+++ b/jans-linux-setup/jans_setup/templates/jans-config-api/dynamic-conf.json
@@ -75,14 +75,15 @@
     "fileExtensionValidationEnabled":true,
     "moduleNameValidationEnabled":true,
     "assetBaseDirectory":"/opt/jans/jetty/%s/custom",
-    "jansModules":[
+    "jansServices":[
       "jans-auth",
       "jans-casa",
       "jans-config-api",
       "jans-fido2",
       "jans-link",
       "jans-lock",
-      "jans-scim"
+      "jans-scim",
+      "jans-keycloak-link"
     ],
     "assetDirMapping":[
       {
@@ -161,7 +162,7 @@
       "description": "lock plugin",
       "className": "io.jans.configapi.plugin.lock.rest.ApiApplication"
     }
-	
+
   ]
 }