diff --git a/docker/ubi8-init-java17/entrypoint.sh b/docker/ubi8-init-java17/entrypoint.sh
index 43069b74d..b5261596d 100755
--- a/docker/ubi8-init-java17/entrypoint.sh
+++ b/docker/ubi8-init-java17/entrypoint.sh
@@ -18,7 +18,11 @@
 
 set -eo pipefail
 
-[[ -n "${APP_HOME}" ]] || exit 63
+if [[ -z "${APP_HOME}" ]]; then
+  echo "ERROR: APP_HOME is not defined, but is required!"
+  exit 63
+fi
+
 cd "${APP_HOME}" || exit 64
 
 if [[ -z "${JAVA_OPTS}" ]]; then
diff --git a/docker/ubi8-init-java17/network-node.service b/docker/ubi8-init-java17/network-node.service
index 00daa20eb..8d6a46eb2 100644
--- a/docker/ubi8-init-java17/network-node.service
+++ b/docker/ubi8-init-java17/network-node.service
@@ -8,7 +8,7 @@ Restart=no
 User=hedera
 Group=hedera
 
-
+PassEnvironment=JAVA_HOME PATH APP_HOME
 EnvironmentFile=/etc/network-node/java.env
 EnvironmentFile=/etc/network-node/application.env