diff --git a/crowdin.yml b/crowdin.yml
index c9f28fba09..e68452f599 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -141,4 +141,22 @@ files: [
     "escape_special_characters": 0,
     "escape_quotes" : 0,
   },
+  {
+    "source" : "/wallet-webapps/src/main/resources/locale/portlet/LayoutEditor_en.properties",
+
+    "translation" : "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%",
+    "translation_replace" : {
+      "_en!": "","ar_SA": "ar","ar_OM": "aro","az_AZ": "az","ca_ES": "ca","ceb_PH": "ceb",
+      "co_FR": "co","cs_CZ": "cs","de_DE": "de","el_GR": "el","en_US": "en","es_ES": "es_ES","eu_ES": "eu","fa_IR": "fa",
+      "fi_FI": "fi","fil_PH": "fil","fr_FR": "fr","hi_IN": "hi","hu_HU": "hu","id_ID": "id","it_IT": "it","ja_JP": "ja",
+      "kab_KAB": "kab","ko_KR": "ko","lt_LT": "lt","ms_MY": "ms","nl_NL": "nl","no_NO": "no","pcm_NG": "pcm","pl_PL": "pl",
+      "pt_BR": "pt_BR","pt_PT": "pt_PT","ro_RO": "ro","ru_RU": "ru","sk_SK": "sk","sl_SI": "sl","sq_AL": "sq",
+      "sv_SE": "sv_SE","th_TH": "th","tl_PH": "tl","tr_TR": "tr","uk_UA": "uk","ur_IN": "ur_IN","vi_VN": "vi",
+      "zh_CN": "zh_CN","zh_TW": "zh_TW",
+    },
+    "dest" : "add__ons/wallet/LayoutEditor.properties",
+    "update_option" : "update_as_unapproved",
+    "escape_special_characters": 0,
+    "escape_quotes" : 0,
+  },
 ]
\ No newline at end of file
diff --git a/wallet-services/src/main/resources/portlet-instances.json b/wallet-services/src/main/resources/portlet-instances.json
new file mode 100644
index 0000000000..4084d7e21a
--- /dev/null
+++ b/wallet-services/src/main/resources/portlet-instances.json
@@ -0,0 +1,24 @@
+{
+  "descriptors":[
+    {
+      "nameId":"SpaceWallet",
+      "categoryNameId":"spaces",
+      "portletName":"SpaceWallet",
+      "names":{
+        "en":"layout.portletInstance.SpaceWallet.name"
+      },
+      "descriptions":{
+        "en":"layout.portletInstance.SpaceWallet.description"
+      },
+      "preferences":[
+        
+      ],
+      "permissions":[
+        "Everyone"
+      ],
+      "illustrationPath":"war:/../skin/DefaultSkin/portletIcons/SpaceWallet.png",
+      "system":true,
+      "spaceApplication":true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/wallet-webapps/src/main/resources/locale/portlet/LayoutEditor_en.properties b/wallet-webapps/src/main/resources/locale/portlet/LayoutEditor_en.properties
new file mode 100644
index 0000000000..075bc9c610
--- /dev/null
+++ b/wallet-webapps/src/main/resources/locale/portlet/LayoutEditor_en.properties
@@ -0,0 +1,2 @@
+layout.portletInstance.SpaceWallet.name=Space Wallet
+layout.portletInstance.SpaceWallet.description=Space Wallet Portlet
diff --git a/wallet-webapps/src/main/webapp/WEB-INF/conf/configuration.xml b/wallet-webapps/src/main/webapp/WEB-INF/conf/configuration.xml
index 784d6a86d9..880d7095ed 100644
--- a/wallet-webapps/src/main/webapp/WEB-INF/conf/configuration.xml
+++ b/wallet-webapps/src/main/webapp/WEB-INF/conf/configuration.xml
@@ -25,7 +25,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <import>war:/conf/wallet/bundle-configuration.xml</import>
   <import>war:/conf/wallet/organization-configuration.xml</import>
   <import>war:/conf/wallet/dynamic-container-configuration.xml</import>
-  <import>war:/conf/wallet/application-registry-configuration.xml</import>
   <import>war:/conf/wallet/user-page-configuration.xml</import>
   <import>war:/conf/wallet/notification-configuration.xml</import>
   <import>war:/conf/wallet/wallet-portal-configuration.xml</import>
diff --git a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/application-registry-configuration.xml b/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/application-registry-configuration.xml
deleted file mode 100644
index 46953dee3a..0000000000
--- a/wallet-webapps/src/main/webapp/WEB-INF/conf/wallet/application-registry-configuration.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This file is part of the Meeds project (https://meeds.io/).
-Copyright (C) 2020 Meeds Association
-contact@meeds.io
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 3 of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
--->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_3.xsd http://www.exoplatform.org/xml/ns/kernel_1_3.xsd" xmlns="http://www.exoplatform.org/xml/ns/kernel_1_3.xsd">
-
-  <external-component-plugins>
-    <target-component>org.exoplatform.application.registry.ApplicationRegistryService</target-component>
-    <component-plugin>
-      <name>spaces.portlets.registry</name>
-      <set-method>initListener</set-method>
-      <type>org.exoplatform.application.registry.ApplicationCategoriesPlugins</type>
-      <description>this listener init the portlets are registered in PortletRegister</description>
-      <init-params>
-        <value-param>
-          <name>merge</name>
-          <value>true</value>
-        </value-param>
-        <object-param>
-          <name>spacesApplications</name>
-          <description>description</description>
-          <object type="org.exoplatform.application.registry.ApplicationCategory">
-            <field name="name">
-              <string>spacesApplications</string>
-            </field>
-            <field name="displayName">
-              <string>Spaces applications</string>
-            </field>
-            <field name="description">
-              <string>Applications allowed to be added in spaces</string>
-            </field>
-            <field name="accessPermissions">
-              <collection type="java.util.ArrayList" item-type="java.lang.String">
-                <value>
-                  <string>*:/platform/users</string>
-                </value>
-              </collection>
-            </field>
-            <field name="applications">
-              <collection type="java.util.ArrayList">
-                <value>
-                  <object type="org.exoplatform.application.registry.Application">
-                    <field name="displayName">
-                      <string>Wallet</string>
-                    </field>
-                    <field name="contentId">
-                      <string>wallet/SpaceWallet</string>
-                    </field>
-                    <field name="description">
-                      <string>Space Wallet Portlet</string>
-                    </field>
-                    <field name="type">
-                      <string>portlet</string>
-                    </field>
-                    <field name="categoryName">
-                      <string>spacesApplications</string>
-                    </field>
-                    <field name="applicationName">
-                      <string>SpaceWallet</string>
-                    </field>
-                    <field name="accessPermissions">
-                      <collection type="java.util.ArrayList">
-                        <value>
-                          <string>Everyone</string>
-                        </value>
-                      </collection>
-                    </field>
-                  </object>
-                </value>
-              </collection>
-            </field>
-          </object>
-        </object-param>
-      </init-params>
-    </component-plugin>
-  </external-component-plugins>
-</configuration>