-java -jar $jar_location -c $WSS_UNIFIED_AGENT_CONFIG \
- -product $WSS_PRODUCT_NAME -project $WSS_PROJECT_NAME \
- ${WSS_UNIFIED_AGENT_OPTIONS:-}
-rm $jar_location
+
+# WSS_UNIFIED_AGENT_OPTIONS & JAVA_OPTS are expected to be unquoted
+# shellcheck disable=SC2086
+java ${JAVA_OPTS:-} -jar "${jar_location}" -c wss-unified-agent.config \
+ -product "${WSS_PRODUCT_NAME}" -project "${WSS_PROJECT_NAME}" \
+ -projectVersion "${GERRIT_BRANCH}" ${WSS_UNIFIED_AGENT_OPTIONS:-}
+
+rm "${jar_location}"