diff --git a/manifest/git_manifest_extra_odoo18.0.xml b/manifest/git_manifest_extra_odoo18.0.xml
index c41344b..a69a128 100644
--- a/manifest/git_manifest_extra_odoo18.0.xml
+++ b/manifest/git_manifest_extra_odoo18.0.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <manifest>
+    <remote name="odoo" fetch="https://github.com/odoo/" />
     <remote name="CybroOdoo" fetch="https://github.com/CybroOdoo/" />
     <remote name="ERPLibre_origin_CybroOdoo" fetch="https://github.com/ERPLibre/" />
-
+    <remote name="ERPLibre_origin_odoo" fetch="https://github.com/ERPLibre/" />
     <project
         name="OpenHRMS.git"
         revision="18.0"
@@ -18,4 +19,18 @@
         revision="18.0_dev"
         groups="extra,odoo18.0"
     />
+    <project
+        name="design-themes.git"
+        path="odoo18.0/addons/odoo_design-themes"
+        remote="ERPLibre_origin_odoo"
+        revision="18.0"
+        groups="addons,odoo18.0"
+    />
+    <project
+        name="documentation-user.git"
+        path="odoo18.0/odoo_documentation-user"
+        revision="18.0"
+        remote="odoo"
+        groups="odoo,odoo18.0"
+    />
 </manifest>
diff --git a/manifest/git_manifest_odoo18.0.xml b/manifest/git_manifest_odoo18.0.xml
index b6baaef..27d1cc5 100644
--- a/manifest/git_manifest_odoo18.0.xml
+++ b/manifest/git_manifest_odoo18.0.xml
@@ -290,13 +290,6 @@
         remote="ERPLibre_origin_MathBenTech"
         groups="addons,base,odoo18.0"
     />
-    <project
-        name="design-themes.git"
-        path="odoo18.0/addons/odoo_design-themes"
-        remote="ERPLibre_origin_odoo"
-        revision="18.0"
-        groups="addons,odoo18.0"
-    />
     <project
         name="donation.git"
         revision="18.0"
diff --git a/manifest/git_manifest_odoo18.0_dev.xml b/manifest/git_manifest_odoo18.0_dev.xml
index 08a2119..265baec 100644
--- a/manifest/git_manifest_odoo18.0_dev.xml
+++ b/manifest/git_manifest_odoo18.0_dev.xml
@@ -11,11 +11,4 @@
         clone-depth="10"
         groups="migration,odoo18.0"
     />
-    <project
-        name="documentation-user.git"
-        path="odoo18.0/odoo_documentation-user"
-        revision="18.0"
-        remote="odoo"
-        groups="odoo,odoo18.0"
-    />
 </manifest>
diff --git a/script/generate_config.sh b/script/generate_config.sh
index 834100f..6cbc959 100755
--- a/script/generate_config.sh
+++ b/script/generate_config.sh
@@ -27,8 +27,6 @@ printf "longpolling_port = ${EL_LONGPOLLING_PORT}\n" >> "${EL_CONFIG_FILE}"
 printf "addons_path = ${EL_HOME_ODOO}/addons,${EL_HOME_ODOO}/odoo/addons,${EL_HOME}/odoo${EL_ODOO_VERSION}/addons/addons," >> "${EL_CONFIG_FILE}"
 
 if [[ ${EL_MINIMAL_ADDONS} = "False" ]]; then
-    printf "${EL_HOME_ODOO_PROJECT}/addons/CybroOdoo_CybroAddons," >> "${EL_CONFIG_FILE}"
-    printf "${EL_HOME_ODOO_PROJECT}/addons/CybroOdoo_OpenHRMS," >> "${EL_CONFIG_FILE}"
     printf "${EL_HOME_ODOO_PROJECT}/addons/ERPLibre_erplibre_addons," >> "${EL_CONFIG_FILE}"
     printf "${EL_HOME_ODOO_PROJECT}/addons/MathBenTech_development," >> "${EL_CONFIG_FILE}"
     printf "${EL_HOME_ODOO_PROJECT}/addons/OCA_account-analytic," >> "${EL_CONFIG_FILE}"