diff --git a/openidm-repo-orientdb/pom.xml b/openidm-repo-orientdb/pom.xml
index c6da32317..e97c96e9d 100644
--- a/openidm-repo-orientdb/pom.xml
+++ b/openidm-repo-orientdb/pom.xml
@@ -248,6 +248,12 @@
             <artifactId>mockito-all</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.graalvm.sdk</groupId>
+            <artifactId>graal-sdk</artifactId>
+            <version>22.3.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/openidm-rhino/pom.xml b/openidm-rhino/pom.xml
new file mode 100644
index 000000000..d934e3936
--- /dev/null
+++ b/openidm-rhino/pom.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * The contents of this file are subject to the terms of the Common Development and
+ * Distribution License (the License). You may not use this file except in compliance with the
+ * License.
+ *
+ * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
+ * specific language governing permission and limitations under the License.
+ *
+ * When distributing Covered Software, include this CDDL Header Notice in each file and include
+ * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
+ * Header, with the fields enclosed by brackets [] replaced by your own identifying
+ * information: "Portions copyright [year] [name of copyright owner]".
+ *
+ * Copyright 2026 3A Systems LLC.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.openidentityplatform.openidm</groupId>
+        <artifactId>openidm-project</artifactId>
+        <version>7.0.3-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>openidm-rhino</artifactId>
+    <packaging>bundle</packaging>
+    <name>${project.groupId}.${project.artifactId}</name>
+    <description>OSGi bundle wrapper for Mozilla Rhino JavaScript engine</description>
+    <dependencies>
+        <dependency>
+            <groupId>org.mozilla</groupId>
+            <artifactId>rhino</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mozilla</groupId>
+            <artifactId>rhino-engine</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${project.name}</Bundle-Name>
+                        <Bundle-SymbolicName>${project.name}</Bundle-SymbolicName>
+                        <Embed-Dependency>*;groupId=org.mozilla;inline=true;scope=provided</Embed-Dependency>
+                        <Export-Package>*</Export-Package>
+                        <Import-Package>
+                            javax.lang.model;resolution:=optional,
+                            javax.script;resolution:=optional,
+                            *
+                        </Import-Package>
+                        <DynamicImport-Package>*</DynamicImport-Package>
+                        <_removeheaders>
+                            Bnd-LastModified,Built-By,Private-Package,Tool,Build-Jdk,Include-Resource,Ignore-Package,Bundle-DocURL
+                        </_removeheaders>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/openidm-ui/openidm-ui-admin/pom.xml b/openidm-ui/openidm-ui-admin/pom.xml
index 242a5366c..df9e9d086 100644
--- a/openidm-ui/openidm-ui-admin/pom.xml
+++ b/openidm-ui/openidm-ui-admin/pom.xml
@@ -187,11 +187,6 @@
             <type>css</type>
         </dependency>
 
-        <dependency>
-          <groupId>org.apache.servicemix.bundles</groupId>
-          <artifactId>org.apache.servicemix.bundles.rhino</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.openidentityplatform.commons.ui.libs</groupId>
             <artifactId>less</artifactId>
diff --git a/openidm-ui/openidm-ui-enduser/pom.xml b/openidm-ui/openidm-ui-enduser/pom.xml
index 8dd0f8037..9d7232b46 100644
--- a/openidm-ui/openidm-ui-enduser/pom.xml
+++ b/openidm-ui/openidm-ui-enduser/pom.xml
@@ -139,11 +139,6 @@
         <type>js</type>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.servicemix.bundles</groupId>
-      <artifactId>org.apache.servicemix.bundles.rhino</artifactId>
-    </dependency>
-
     <dependency>
         <groupId>org.openidentityplatform.commons.ui.libs</groupId>
         <artifactId>less</artifactId>
diff --git a/openidm-util/pom.xml b/openidm-util/pom.xml
index fa0f29a50..aab6e6eae 100644
--- a/openidm-util/pom.xml
+++ b/openidm-util/pom.xml
@@ -88,8 +88,9 @@
             <artifactId>joda-time</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.rhino</artifactId>
+            <groupId>org.openidentityplatform.openidm</groupId>
+            <artifactId>openidm-rhino</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- Provided OSGi Dependencies -->
diff --git a/openidm-zip/pom.xml b/openidm-zip/pom.xml
index 2b84098d5..4da27cf6d 100644
--- a/openidm-zip/pom.xml
+++ b/openidm-zip/pom.xml
@@ -99,6 +99,11 @@
             <artifactId>openidm-script</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.openidentityplatform.openidm</groupId>
+            <artifactId>openidm-rhino</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.openidentityplatform.openidm</groupId>
             <artifactId>openidm-api-servlet</artifactId>
diff --git a/openidm-zip/src/main/assembly/zip.xml b/openidm-zip/src/main/assembly/zip.xml
index fa0909a78..5410694d3 100644
--- a/openidm-zip/src/main/assembly/zip.xml
+++ b/openidm-zip/src/main/assembly/zip.xml
@@ -1218,6 +1218,7 @@
                 <exclude>jakarta.activation*</exclude>
                 <exclude>org.bouncycastle:bc*-fips</exclude>
                 <exclude>org.openjdk.nashorn:*</exclude>
+                <exclude>org.mozilla:rhino*</exclude>
                 <exclude>org.apache.felix:org.apache.felix.utils</exclude>
                 <exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
             </excludes>
diff --git a/pom.xml b/pom.xml
index 029722aa5..cfc15f5c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,6 @@
         <asm.version>9.9.1</asm.version>
         <!-- quartz 2.x is not compatible yet -->
         <quartz.version>1.8.6_1</quartz.version>
-        <rhino.version>1.7.14_2</rhino.version>
         <groovy.version>2.4.21</groovy.version>
 
         <!-- OSGi/Felix versions -->
@@ -235,6 +234,7 @@
         <!--module>openidm-workflow-remote</module-->
         <module>openidm-zip</module>
         <module>custom-scripted-connector-bundler</module>
+        <module>openidm-rhino</module>
     </modules>
 
     <profiles>
@@ -593,11 +593,6 @@
                 <artifactId>org.apache.servicemix.bundles.quartz</artifactId>
                 <version>${quartz.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.rhino</artifactId>
-                <version>${rhino.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>
                 <artifactId>org.apache.servicemix.bundles.javax-inject</artifactId>