diff --git a/engines/aio/Dockerfile b/engines/aio/Dockerfile
index f574b9d1c..70d3c2116 100644
--- a/engines/aio/Dockerfile
+++ b/engines/aio/Dockerfile
@@ -79,4 +79,6 @@ EXPOSE 8090
 
 USER ${AIOUSERNAME}
 
-ENTRYPOINT ["/bin/sh", "-c", "if [[ \"$(uname -m)\" != \"x86_64\" ]]; then export LIBREOFFICE_HOME=${LIBREOFFICE_HOME:=/usr/lib64/libreoffice}; fi && java $JAVA_OPTS -jar /usr/bin/${env.project_artifactId}.jar"]
+# Copy the script to set LIBREOFFICE_HOME
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+ENTRYPOINT ["/docker-entrypoint.sh", "${env.project_artifactId}"]
\ No newline at end of file
diff --git a/engines/aio/docker-entrypoint.sh b/engines/aio/docker-entrypoint.sh
new file mode 100755
index 000000000..49b5451b5
--- /dev/null
+++ b/engines/aio/docker-entrypoint.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Check if the architecture is ARM64 (aarch64)
+if [[ "$(uname -m)" != "x86_64" ]]; then
+  export LIBREOFFICE_HOME=${LIBREOFFICE_HOME:=/usr/lib64/libreoffice}
+fi
+
+# Run the Alfresco transformation service JAR file with the specified Java options
+exec java $JAVA_OPTS -jar /usr/bin/${1}.jar "$@"
\ No newline at end of file
diff --git a/engines/libreoffice/Dockerfile b/engines/libreoffice/Dockerfile
index a2e1a0339..570424aa8 100644
--- a/engines/libreoffice/Dockerfile
+++ b/engines/libreoffice/Dockerfile
@@ -10,9 +10,6 @@ ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositor
 ENV LIBREOFFICE_ARM64_RPM_URL=https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/libreoffice-6.4.7.2-13.el8.aarch64.rpm
 ENV JAVA_OPTS=""
 
-# Copy the script to set LIBREOFFICE_HOME
-COPY set_libreoffice_home.sh /set_libreoffice_home.sh
-
 # Set default user information
 ARG GROUPNAME=Alfresco
 ARG GROUPID=1000
@@ -32,8 +29,7 @@ RUN ln /${env.project_artifactId}-${env.project_version}.jar /usr/bin/${env.proj
         rm -rf libreoffice-dist-*linux.gz LibreOffice_*_Linux_x86-64_rpm; \
     else \
       dnf --enablerepo=devel install -y $LIBREOFFICE_ARM64_RPM_URL && \
-      update-alternatives --set java java-17-openjdk.aarch64 && \
-      . /set_libreoffice_home.sh; \
+      update-alternatives --set java java-17-openjdk.aarch64; \
     fi && \
       yum clean all
 
@@ -50,4 +46,6 @@ EXPOSE 8090
 
 USER ${LIBREUSERNAME}
 
-ENTRYPOINT java $JAVA_OPTS -jar /usr/bin/${env.project_artifactId}.jar
+# Copy the script to set LIBREOFFICE_HOME
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+ENTRYPOINT ["/docker-entrypoint.sh", "${env.project_artifactId}"]
diff --git a/engines/libreoffice/docker-entrypoint.sh b/engines/libreoffice/docker-entrypoint.sh
new file mode 100755
index 000000000..49b5451b5
--- /dev/null
+++ b/engines/libreoffice/docker-entrypoint.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Check if the architecture is ARM64 (aarch64)
+if [[ "$(uname -m)" != "x86_64" ]]; then
+  export LIBREOFFICE_HOME=${LIBREOFFICE_HOME:=/usr/lib64/libreoffice}
+fi
+
+# Run the Alfresco transformation service JAR file with the specified Java options
+exec java $JAVA_OPTS -jar /usr/bin/${1}.jar "$@"
\ No newline at end of file
diff --git a/engines/libreoffice/set_libreoffice_home.sh b/engines/libreoffice/set_libreoffice_home.sh
deleted file mode 100755
index 969067b77..000000000
--- a/engines/libreoffice/set_libreoffice_home.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-export LIBREOFFICE_HOME=/usr/lib64/libreoffice
\ No newline at end of file