diff --git a/exist-distribution/pom.xml b/exist-distribution/pom.xml
index afb9456c5e..4728e3a5fc 100644
--- a/exist-distribution/pom.xml
+++ b/exist-distribution/pom.xml
@@ -754,6 +754,7 @@
                 </executions>
             </plugin>
 
+
             <!-- Replace the eXist-db logo with the Elemental logo in the Dashboard and Monex XAR files -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -761,8 +762,8 @@
                 <version>3.2.0</version>
                 <executions>
                     <execution>
-                        <id>unzip-dashboard</id>
-                        <phase>process-resources</phase>
+                        <id>resolve-dashboard-xar-path</id>
+                        <phase>generate-resources</phase>
                         <goals>
                             <goal>run</goal>
                         </goals>
@@ -770,29 +771,17 @@
                             <target>
                                 <fileset id="dashboard-fileset" dir="${expath.pkg.dir}" includes="dashboard-*.xar" />
                                 <pathconvert property="dashboard-xar-path" refid="dashboard-fileset" />
-                                <unzip src="${dashboard-xar-path}" dest="${expath.pkg.dir}-dashboard-staging/">
-                                    <patternset>
-                                        <exclude name="resources/images/existdb.png" />
-                                        <exclude name="resources/images/existdb-web.svg" />
-                                        <exclude name="resources/images/x.svg" />
-                                    </patternset>
-                                </unzip>
                             </target>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>patch-dashboard</id>
+                        <id>patch-dashboard-branding</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>run</goal>
                         </goals>
                         <configuration>
                             <target>
-                                <replace file="${expath.pkg.dir}-dashboard-staging/admin.xql" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;" />
-                                <replace file="${expath.pkg.dir}-dashboard-staging/build.html" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;" />
-                                <replace file="${expath.pkg.dir}-dashboard-staging/doc.html" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;" />
-                                <replace file="${expath.pkg.dir}-dashboard-staging/guest.html" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;" />
-                                <replace file="${expath.pkg.dir}-dashboard-staging/index.html" token="title&gt;existdb-dashboard&lt;" value="title&gt;Dashboard :: Elemental&lt;" />
                                 <replace file="${expath.pkg.dir}-dashboard-staging/existdb-dashboard.html" token="existdb-web.svg" value="elemental-web.svg" />
                                 <loadfile property="elemental-web-svg" srcFile="${project.build.outputDirectory}/elemental-web.svg" />
                                 <replaceregexp file="${expath.pkg.dir}-dashboard-staging/bower_components/existdb-launcher/existdb-branding.html" match="&lt;svg.+&lt;/svg&gt;" replace="${elemental-web-svg}" />
@@ -800,25 +789,21 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>zip-patched-dashboard</id>
-                        <phase>process-resources</phase>
+                        <id>resolve-packageservice-xar-path</id>
+                        <phase>generate-resources</phase>
                         <goals>
                             <goal>run</goal>
                         </goals>
                         <configuration>
                             <target>
-                                <fileset id="dashboard-fileset" dir="${expath.pkg.dir}" includes="dashboard-*.xar" />
-                                <pathconvert property="dashboard-xar-path" refid="dashboard-fileset" />
-                                <zip destfile="${dashboard-xar-path}">
-                                    <fileset dir="${expath.pkg.dir}-dashboard-staging" />
-                                    <zipfileset dir="${project.build.outputDirectory}" includes="elemental-web.svg" fullpath="resources/images/elemental-web.svg" />
-                                </zip>
+                                <fileset id="packageservice-fileset" dir="${expath.pkg.dir}" includes="packageservice-*.xar" />
+                                <pathconvert property="packageservice-xar-path" refid="packageservice-fileset" />
                             </target>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>unzip-monex</id>
-                        <phase>process-resources</phase>
+                        <id>resolve-monex-xar-path</id>
+                        <phase>generate-resources</phase>
                         <goals>
                             <goal>run</goal>
                         </goals>
@@ -826,18 +811,11 @@
                             <target>
                                 <fileset id="monex-fileset" dir="${expath.pkg.dir}" includes="monex-*.xar" />
                                 <pathconvert property="monex-xar-path" refid="monex-fileset" />
-                                <unzip src="${monex-xar-path}" dest="${expath.pkg.dir}-monex-staging/">
-                                    <patternset>
-                                        <exclude name="resources/img/exist_icon_16x16.ico" />
-                                        <exclude name="resources/img/existdb-logo.png" />
-                                        <exclude name="resources/img/powered-by-whiteglass.svg" />
-                                    </patternset>
-                                </unzip>
                             </target>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>patch-monex</id>
+                        <id>patch-monex-branding</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>run</goal>
@@ -847,38 +825,197 @@
                                 <replace file="${expath.pkg.dir}-monex-staging/console.html" token="eXist once" value="" />
                                 <replace file="${expath.pkg.dir}-monex-staging/login.html" token="exist_icon_16x16.ico" value="elemental-favicon.ico" />
                                 <replace file="${expath.pkg.dir}-monex-staging/login.html" token="existdb-logo.png" value="elemental-web.svg" />
-                                <replace file="${expath.pkg.dir}-monex-staging/profiling.html" token="any eXist interface" value="any interface" />
-                                <replace file="${expath.pkg.dir}-monex-staging/remotes.html" token="eXist's scheduler" value="the scheduler" />
-                                <replace file="${expath.pkg.dir}-monex-staging/remotes.html" token="remote eXist-db instances" value="remote instances" />
-                                <replace file="${expath.pkg.dir}-monex-staging/remotes.html" token="the eXist instance" value="the instance" />
-                                <replace file="${expath.pkg.dir}-monex-staging/remotes.html" token="eXist versions before" value="eXist-db versions before" />
                                 <replace file="${expath.pkg.dir}-monex-staging/templates/page.html" token="exist_icon_16x16.ico" value="elemental-favicon.ico" />
                                 <replace file="${expath.pkg.dir}-monex-staging/templates/page.html" token="existdb-logo.png" value="elemental-web.svg" />
                                 <replace file="${expath.pkg.dir}-monex-staging/templates/page.html" token="powered-by-whiteglass.svg" value="elemental-web.svg" />
                             </target>
                         </configuration>
                     </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>truezip-maven-plugin</artifactId>
+                <version>1.2</version>
+                <executions>
+                    <execution>
+                        <id>unzip-dashboard</id>
+                        <phase>generate-resources</phase>
+                        <goals><goal>copy</goal></goals>
+                        <configuration>
+                            <fileset>
+                                <directory>${dashboard-xar-path}</directory>
+                                <outputDirectory>${expath.pkg.dir}-dashboard-staging</outputDirectory>
+                                <excludes>
+                                    <exclude>resources/images/existdb.png</exclude>
+                                    <exclude>resources/images/existdb-web.svg</exclude>
+                                    <exclude>resources/images/x.svg</exclude>
+                                </excludes>
+                            </fileset>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>zip-patched-dashboard</id>
+                        <phase>prepare-package</phase>
+                        <goals><goal>copy</goal></goals>
+                        <configuration>
+                            <fileset>
+                                <directory>${expath.pkg.dir}-dashboard-staging</directory>
+                                <outputDirectory>${dashboard-xar-path}</outputDirectory>
+                            </fileset>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>add-elemental-logo-to-dashboard</id>
+                        <phase>prepare-package</phase>
+                        <goals><goal>copy</goal></goals>
+                        <configuration>
+                            <fileset>
+                                <directory>${project.build.outputDirectory}</directory>
+                                <includes><include>elemental-web.svg</include></includes>
+                                <outputDirectory>${dashboard-xar-path}/resources/images</outputDirectory>
+                            </fileset>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>remove-old-dashboard-branding</id>
+                        <phase>prepare-package</phase>
+                        <goals><goal>remove</goal></goals>
+                        <configuration>
+                            <fileset>
+                                <directory>${dashboard-xar-path}</directory>
+                                <includes>
+                                    <include>resources/images/existdb.png</include>
+                                    <include>resources/images/existdb-web.svg</include>
+                                    <include>resources/images/x.svg</include>
+                                </includes>
+                            </fileset>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>unzip-packageservice</id>
+                        <phase>generate-resources</phase>
+                        <goals><goal>copy</goal></goals>
+                        <configuration>
+                            <fileset>
+                                <directory>${packageservice-xar-path}</directory>
+                                <outputDirectory>${expath.pkg.dir}-packageservice-staging</outputDirectory>
+                            </fileset>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>zip-patched-packageservice</id>
+                        <phase>prepare-package</phase>
+                        <goals><goal>copy</goal></goals>
+                        <configuration>
+                            <fileset>
+                                <directory>${expath.pkg.dir}-packageservice-staging</directory>
+                                <outputDirectory>${packageservice-xar-path}</outputDirectory>
+                            </fileset>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>unzip-monex</id>
+                        <phase>generate-resources</phase>
+                        <goals><goal>copy</goal></goals>
+                        <configuration>
+                            <fileset>
+                                <directory>${monex-xar-path}</directory>
+                                <outputDirectory>${expath.pkg.dir}-monex-staging</outputDirectory>
+                                <excludes>
+                                    <exclude>resources/img/exist_icon_16x16.ico</exclude>
+                                    <exclude>resources/img/existdb-logo.png</exclude>
+                                    <exclude>resources/img/powered-by-whiteglass.svg</exclude>
+                                </excludes>
+                            </fileset>
+                        </configuration>
+                    </execution>
                     <execution>
                         <id>zip-patched-monex</id>
+                        <phase>prepare-package</phase>
+                        <goals><goal>copy</goal></goals>
+                        <configuration>
+                            <fileset>
+                                <directory>${expath.pkg.dir}-monex-staging</directory>
+                                <outputDirectory>${monex-xar-path}</outputDirectory>
+                            </fileset>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>add-elemental-assets-to-monex</id>
+                        <phase>prepare-package</phase>
+                        <goals><goal>copy</goal></goals>
+                        <configuration>
+                            <fileset>
+                                <directory>${project.build.outputDirectory}</directory>
+                                <includes>
+                                    <include>elemental-favicon.ico</include>
+                                    <include>elemental-web.svg</include>
+                                </includes>
+                                <outputDirectory>${monex-xar-path}/resources/img</outputDirectory>
+                            </fileset>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>remove-old-monex-branding</id>
+                        <phase>prepare-package</phase>
+                        <goals><goal>remove</goal></goals>
+                        <configuration>
+                            <fileset>
+                                <directory>${monex-xar-path}</directory>
+                                <includes>
+                                    <include>resources/img/exist_icon_16x16.ico</include>
+                                    <include>resources/img/existdb-logo.png</include>
+                                    <include>resources/img/powered-by-whiteglass.svg</include>
+                                </includes>
+                            </fileset>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>io.github.lukasmansour</groupId>
+                <artifactId>patch-maven-plugin</artifactId>
+                <version>1.1.0</version>
+                <configuration>
+                    <targetDirectory>${expath.pkg.dir}-packageservice-staging</targetDirectory>
+                    <patchDirectory>${project.basedir}/src/xar-patches/packageservice</patchDirectory>
+                    <failOnFailedPatch>true</failOnFailedPatch>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>patch-packageservice</id>
                         <phase>process-resources</phase>
                         <goals>
-                            <goal>run</goal>
+                            <goal>apply</goal>
                         </goals>
+                    </execution>
+                    <execution>
+                        <id>patch-dashboard</id>
+                        <phase>process-resources</phase>
+                        <goals><goal>apply</goal></goals>
                         <configuration>
-                            <target>
-                                <fileset id="monex-fileset" dir="${expath.pkg.dir}" includes="monex-*.xar" />
-                                <pathconvert property="monex-xar-path" refid="monex-fileset" />
-                                <zip destfile="${monex-xar-path}">
-                                    <fileset dir="${expath.pkg.dir}-monex-staging" />
-                                    <zipfileset dir="${project.build.outputDirectory}" includes="elemental-favicon.ico" fullpath="resources/img/elemental-favicon.ico" />
-                                    <zipfileset dir="${project.build.outputDirectory}" includes="elemental-web.svg" fullpath="resources/img/elemental-web.svg" />
-                                </zip>
-                            </target>
+                            <targetDirectory>${expath.pkg.dir}-dashboard-staging</targetDirectory>
+                            <patchDirectory>${project.basedir}/src/xar-patches/dashboard</patchDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>patch-monex</id>
+                        <phase>process-resources</phase>
+                        <goals><goal>apply</goal></goals>
+                        <configuration>
+                            <targetDirectory>${expath.pkg.dir}-monex-staging</targetDirectory>
+                            <patchDirectory>${project.basedir}/src/xar-patches/monex</patchDirectory>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
 
+
+
+
             <plugin>
                 <groupId>com.evolvedbinary.maven.mfrey</groupId>
                 <artifactId>copy-maven-plugin</artifactId>
diff --git a/exist-distribution/src/xar-patches/dashboard/0002-build-html-title.patch b/exist-distribution/src/xar-patches/dashboard/0002-build-html-title.patch
new file mode 100644
index 0000000000..fe8a4b3fe5
--- /dev/null
+++ b/exist-distribution/src/xar-patches/dashboard/0002-build-html-title.patch
@@ -0,0 +1,7 @@
+--- /Users/lauretta/Documents/evolvedbinary/elemental/exist-distribution/target/expath-pkgs-dashboard-staging/build.html	2021-09-21 11:43:38
++++ /Users/lauretta/Documents/evolvedbinary/elemental/exist-distribution/target/expath-pkgs-dashboard-staging/build.html	2026-07-29 09:30:01
+@@ -1 +1 @@
+-<html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1,user-scalable=yes"><title>existdb-dashboard</title><link rel="stylesheet" href="resources/styles.css"><script src="bower_components/webcomponentsjs/webcomponents-loader.js"></script><link rel="import" href="dependencies.html"><link rel="import" href="bower_components/existdb-launcher/dependencies.html"><link rel="import" href="bower_components/existdb-packagemanager/dependencies.html"><link rel="import" href="bower_components/existdb-usermanager/dependencies.html"><link rel="import" href="bower_components/existdb-backup/dependencies.html"></head><body><existdb-dashboard></existdb-dashboard></body></html>
+\ No newline at end of file
++<html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1,user-scalable=yes"><title>Dashboard :: Elemental</title><link rel="stylesheet" href="resources/styles.css"><script src="bower_components/webcomponentsjs/webcomponents-loader.js"></script><link rel="import" href="dependencies.html"><link rel="import" href="bower_components/existdb-launcher/dependencies.html"><link rel="import" href="bower_components/existdb-packagemanager/dependencies.html"><link rel="import" href="bower_components/existdb-usermanager/dependencies.html"><link rel="import" href="bower_components/existdb-backup/dependencies.html"></head><body><existdb-dashboard></existdb-dashboard></body></html>
+\ No newline at end of file
\ No newline at end of file
diff --git a/exist-distribution/src/xar-patches/dashboard/0003-doc-html-title.patch b/exist-distribution/src/xar-patches/dashboard/0003-doc-html-title.patch
new file mode 100644
index 0000000000..8cac454785
--- /dev/null
+++ b/exist-distribution/src/xar-patches/dashboard/0003-doc-html-title.patch
@@ -0,0 +1,11 @@
+--- /Users/lauretta/Documents/evolvedbinary/elemental/exist-distribution/target/expath-pkgs-dashboard-staging/doc.html (original)
++++ /Users/lauretta/Documents/evolvedbinary/elemental/exist-distribution/target/expath-pkgs-dashboard-staging/doc.html (patched)
+@@ -3,7 +3,7 @@
+     <meta charset="utf-8"/>
+     <meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes"/>
+ 
+-    <title>existdb-dashboard</title>
++    <title>Dashboard :: Elemental</title>
+ 
+     <script src="bower_components/webcomponentsjs/webcomponents-loader.js"></script>
+ 
diff --git a/exist-distribution/src/xar-patches/dashboard/0004-guest-html-title.patch b/exist-distribution/src/xar-patches/dashboard/0004-guest-html-title.patch
new file mode 100644
index 0000000000..109a6a9a50
--- /dev/null
+++ b/exist-distribution/src/xar-patches/dashboard/0004-guest-html-title.patch
@@ -0,0 +1,11 @@
+--- /Users/lauretta/Documents/evolvedbinary/elemental/exist-distribution/target/expath-pkgs-dashboard-staging/guest.html	2021-09-21 11:43:38
++++ /Users/lauretta/Documents/evolvedbinary/elemental/exist-distribution/target/expath-pkgs-dashboard-staging/guest.html	2026-07-29 09:30:01
+@@ -3,7 +3,7 @@
+     <meta charset="utf-8"/>
+     <meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes"/>
+ 
+-    <title>existdb-dashboard</title>
++    <title>Dashboard :: Elemental</title>
+ 
+     <link rel="stylesheet" href="resources/styles.css"/>
+     <script src="bower_components/webcomponentsjs/webcomponents-loader.js"></script>
\ No newline at end of file
diff --git a/exist-distribution/src/xar-patches/dashboard/0005-index-html-title.patch b/exist-distribution/src/xar-patches/dashboard/0005-index-html-title.patch
new file mode 100644
index 0000000000..59ab5f8900
--- /dev/null
+++ b/exist-distribution/src/xar-patches/dashboard/0005-index-html-title.patch
@@ -0,0 +1,7 @@
+--- /Users/lauretta/Documents/evolvedbinary/elemental/exist-distribution/target/expath-pkgs-dashboard-staging/index.html (original)
++++ /Users/lauretta/Documents/evolvedbinary/elemental/exist-distribution/target/expath-pkgs-dashboard-staging/index.html (patched)
+@@ -1 +1 @@
+-<html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1,user-scalable=yes"><title>existdb-dashboard</title><link rel="stylesheet" href="resources/styles.css"><style type="text/css">existdb-login{--existdb-login-theme:{text-decoration:none;color:black;};}</style><script src="bower_components/webcomponentsjs/webcomponents-loader.js"></script><link rel="import" href="dependencies.html"><link rel="import" href="bower_components/existdb-launcher/dependencies.html"></head><body unresolved="unresolved"><existdb-launcher-app ignores="[&quot;packagemanager&quot;,&quot;packageservice&quot;,&quot;launcher&quot;,&quot;usermanager&quot;,&quot;dashboard&quot;]"><existdb-login login-label="Login" logout-label="Logout" group="dba" login-url="admin#" logout-url="index.html"></existdb-login></existdb-launcher-app></body></html>
+\ No newline at end of file
++<html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1,user-scalable=yes"><title>Dashboard :: Elemental</title><link rel="stylesheet" href="resources/styles.css"><style type="text/css">existdb-login{--existdb-login-theme:{text-decoration:none;color:black;};}</style><script src="bower_components/webcomponentsjs/webcomponents-loader.js"></script><link rel="import" href="dependencies.html"><link rel="import" href="bower_components/existdb-launcher/dependencies.html"></head><body unresolved="unresolved"><existdb-launcher-app ignores="[&quot;packagemanager&quot;,&quot;packageservice&quot;,&quot;launcher&quot;,&quot;usermanager&quot;,&quot;dashboard&quot;]"><existdb-login login-label="Login" logout-label="Logout" group="dba" login-url="admin#" logout-url="index.html"></existdb-login></existdb-launcher-app></body></html>
+\ No newline at end of file
diff --git a/exist-distribution/src/xar-patches/dashboard/001-admin-xql-title.patch b/exist-distribution/src/xar-patches/dashboard/001-admin-xql-title.patch
new file mode 100644
index 0000000000..c0aacc98b6
--- /dev/null
+++ b/exist-distribution/src/xar-patches/dashboard/001-admin-xql-title.patch
@@ -0,0 +1,11 @@
+--- /Users/lauretta/Documents/evolvedbinary/elemental/exist-distribution/target/expath-pkgs-dashboard-staging/admin.xql	2026-07-29 08:48:15
++++ /Users/lauretta/Documents/evolvedbinary/elemental/exist-distribution/target/expath-pkgs-dashboard-staging/admin.xql	2026-07-29 08:50:22
+@@ -14,7 +14,7 @@
+ <head>
+     <meta charset="utf-8"/>
+     <meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes"/>
+-    <title>existdb-dashboard</title>
++    <title>Dashboard :: Elemental</title>
+     <link rel="stylesheet" href="resources/styles.css"/>
+     <script src="bower_components/webcomponentsjs/webcomponents-loader.js"></script>
+     <link rel="import" href="dependencies.html"/>
\ No newline at end of file
diff --git a/exist-distribution/src/xar-patches/monex/0001-profiling-html-wording.patch b/exist-distribution/src/xar-patches/monex/0001-profiling-html-wording.patch
new file mode 100644
index 0000000000..26b0f7dc53
--- /dev/null
+++ b/exist-distribution/src/xar-patches/monex/0001-profiling-html-wording.patch
@@ -0,0 +1,11 @@
+--- /Users/lauretta/Documents/evolvedbinary/elemental/exist-distribution/target/expath-pkgs-monex-staging/profiling.html (original)
++++ /Users/lauretta/Documents/evolvedbinary/elemental/exist-distribution/target/expath-pkgs-monex-staging/profiling.html (patched)
+@@ -23,7 +23,7 @@
+     <section class="content profiling" data-template="app:profile">
+         <div class="pad margin no-print">
+             <div class="callout callout-info">Enable tracing to start collecting statistics. Run
+-                queries as usual (through any eXist interface), then press "Refresh" to see
++                queries as usual (through any interface), then press "Refresh" to see
+                 statistics. </div>
+         </div>
+         <div class="box">
diff --git a/exist-distribution/src/xar-patches/monex/0002-remotes-html-wording.patch b/exist-distribution/src/xar-patches/monex/0002-remotes-html-wording.patch
new file mode 100644
index 0000000000..be0793fa2a
--- /dev/null
+++ b/exist-distribution/src/xar-patches/monex/0002-remotes-html-wording.patch
@@ -0,0 +1,29 @@
+--- /Users/lauretta/Documents/evolvedbinary/elemental/exist-distribution/target/expath-pkgs-monex-staging/remotes.html	2026-05-30 21:12:45
++++ /Users/lauretta/Documents/evolvedbinary/elemental/exist-distribution/target/expath-pkgs-monex-staging/remotes.html	2026-07-29 09:30:25
+@@ -61,7 +61,7 @@
+         <div class="alert alert-danger" data-template="app:scheduler-enabled">
+             <i class="fa fa-ban"/>
+             <b>Alert! </b>
+-            <span class="message">Remote monitoring <strong>requires</strong> eXist's scheduler
++            <span class="message">Remote monitoring <strong>requires</strong> the scheduler
+                 module to be enabled. See <code>extensions/build.properties</code> and
+                     <code>conf.xml</code>.</span>
+         </div>
+@@ -76,7 +76,7 @@
+                     responsiveness of the system. <code>Response Time</code> is the elapsed time
+                     until the client received the response. </p>
+                 <h3>Configuration</h3>
+-                <p>To monitor remote eXist-db instances, edit the XML file <a href="instances.xml" target="eXide" class="eXide-open" data-exide-open="/db/apps/monex/instances.xml">instances.xml</a> in the root collection of
++                <p>To monitor remote instances, edit the XML file <a href="instances.xml" target="eXide" class="eXide-open" data-exide-open="/db/apps/monex/instances.xml">instances.xml</a> in the root collection of
+                     the monex application. Monex pings each server at configurable times or
+                     intervals. You can also set up email alerts in <a href="notifications.xml" target="eXide" class="eXide-open" data-exide-open="/db/apps/monex/notifications.xml">notifications.xml</a>.</p>
+                 <p>The configuration for monitoring a remote instance looks as follows:</p>
+@@ -121,7 +121,7 @@
+                         <td>token</td>
+                         <td>the unique JMX token required to connect to the JMX servlet. This token is generated
+                             for every server and can be found in the file <code>jmxservlet.token</code> 
+-                            inside the data directory of the eXist instance. Note: eXist versions before 2.2 
++                            inside the data directory of the instance. Note: eXist-db versions before 2.2
+                             do not use this mechanism, so no token is required.</td>
+                     </tr>
+                     <tr>
diff --git a/exist-distribution/src/xar-patches/packageservice/0001-exist-compatible-version.patch b/exist-distribution/src/xar-patches/packageservice/0001-exist-compatible-version.patch
new file mode 100644
index 0000000000..6a818fed3f
--- /dev/null
+++ b/exist-distribution/src/xar-patches/packageservice/0001-exist-compatible-version.patch
@@ -0,0 +1,22 @@
+--- /Users/lauretta/Documents/existdb-packageservice/modules/packages.xqm	2022-02-16 14:33:52
++++ /Users/lauretta/Documents/evolvedbinary/elemental/exist-distribution/target/expath-pkgs-packageservice-staging/modules/packages.xqm	2026-07-22 13:17:43
+@@ -288,7 +288,7 @@
+ (: should be private but there seems to be a bug :)
+ declare function packages:public-repo-contents($installed as element(repo-app)*) {
+     try {
+-        let $url := $config:DEFAULT-REPO || "/public/apps.xml?version=" || packages:get-version() ||
++        let $url := $config:DEFAULT-REPO || "/public/apps.xml?version=" || packages:get-existdb-compatible-version() ||
+             "&amp;source=" || util:system-property("product-source")
+         (: EXPath client module does not work properly. No idea why. :)
+         let $request :=
+@@ -323,8 +323,8 @@
+ };
+ 
+ (: should be private but there seems to be a bug :)
+-declare function packages:get-version() {
+-    (util:system-property("product-semver"), util:system-property("product-version"))[1]
++declare function packages:get-existdb-compatible-version() {
++    util:system-property("exist-db-expath-pkg-compatible-version")
+ };
+ 
+ (: should be private but there seems to be a bug :)