From 33033b1b1a19e6649a48639c6c107ec6e172d0de Mon Sep 17 00:00:00 2001
From: hrishikesh-nalawade <hrishikesh.nalawade.17@gmail.com>
Date: Thu, 5 Mar 2026 15:01:36 +0530
Subject: [PATCH 1/6] fix: updated file encoding

Signed-off-by: hrishikesh-nalawade <hrishikesh.nalawade.17@gmail.com>
---
 api-catalog-package/src/main/resources/bin/start.sh     | 2 +-
 apiml-package/src/main/resources/bin/start.sh           | 2 +-
 caching-service-package/src/main/resources/bin/start.sh | 2 +-
 discovery-package/src/main/resources/bin/start.sh       | 2 +-
 gateway-package/src/main/resources/bin/start.sh         | 2 +-
 zaas-package/src/main/resources/bin/start.sh            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api-catalog-package/src/main/resources/bin/start.sh b/api-catalog-package/src/main/resources/bin/start.sh
index db9d74e6c1..8dab7314e9 100755
--- a/api-catalog-package/src/main/resources/bin/start.sh
+++ b/api-catalog-package/src/main/resources/bin/start.sh
@@ -110,7 +110,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CATALOG_CODE} ${JAVA_BIN_DIR}java \
     ${EXTERNAL_URL} \
     ${CUSTOM_JVM_OPTS} \
     -Dibm.serversocket.recover=true \
-    -Dfile.encoding=UTF-8 \
+    -Dfile.encoding=COMPAT \
     -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
     -Djava.io.tmpdir=${TMPDIR:-/tmp} \
     -Dspring.profiles.active=${ZWE_configs_spring_profiles_active:-} \
diff --git a/apiml-package/src/main/resources/bin/start.sh b/apiml-package/src/main/resources/bin/start.sh
index d3f4695826..ade7cfce68 100755
--- a/apiml-package/src/main/resources/bin/start.sh
+++ b/apiml-package/src/main/resources/bin/start.sh
@@ -283,7 +283,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${APIML_CODE} ${JAVA_BIN_DIR}java \
     -Dcaching.storage.size=${ZWE_components_caching_service_storage_size:-${ZWE_configs_storage_size:-10000}} \
     -Dcaching.storage.vsam.name=${VSAM_FILE_NAME} \
     -Deureka.client.serviceUrl.defaultZone=${ZWE_DISCOVERY_SERVICES_LIST} \
-    -Dfile.encoding=UTF-8 \
+    -Dfile.encoding=COMPAT \
     -Dibm.serversocket.recover=true \
     -Djava.io.tmpdir=${TMPDIR:-/tmp} \
     -Djava.library.path=${LIBPATH} \
diff --git a/caching-service-package/src/main/resources/bin/start.sh b/caching-service-package/src/main/resources/bin/start.sh
index 6140862e23..c8e25091ac 100755
--- a/caching-service-package/src/main/resources/bin/start.sh
+++ b/caching-service-package/src/main/resources/bin/start.sh
@@ -102,7 +102,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CACHING_CODE} ${JAVA_BIN_DIR}java \
   ${JVM_SECURITY_PROPERTIES} \
   ${CUSTOM_JVM_OPTS} \
   -Dibm.serversocket.recover=true \
-  -Dfile.encoding=UTF-8 \
+  -Dfile.encoding=COMPAT \
   -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
   -Djava.io.tmpdir=${TMPDIR:-/tmp} \
   -Dspring.profiles.active=${ZWE_configs_spring_profiles_active:-} \
diff --git a/discovery-package/src/main/resources/bin/start.sh b/discovery-package/src/main/resources/bin/start.sh
index fe85c52c5d..5ed2ab7565 100755
--- a/discovery-package/src/main/resources/bin/start.sh
+++ b/discovery-package/src/main/resources/bin/start.sh
@@ -113,7 +113,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${DISCOVERY_CODE} ${JAVA_BIN_DIR}java \
     -Dapiml.security.ssl.verifySslCertificatesOfServices=${verifySslCertificatesOfServices:-false} \
     -Dapiml.service.hostname=${ZWE_haInstance_hostname:-localhost} \
     -Dapiml.service.port=${ZWE_configs_port:-7553} \
-    -Dfile.encoding=UTF-8 \
+    -Dfile.encoding=COMPAT \
     -Dibm.serversocket.recover=true \
     -Djava.io.tmpdir=${TMPDIR:-/tmp} \
     -Djava.library.path=${LIBPATH} \
diff --git a/gateway-package/src/main/resources/bin/start.sh b/gateway-package/src/main/resources/bin/start.sh
index 326c423771..75351a5abd 100755
--- a/gateway-package/src/main/resources/bin/start.sh
+++ b/gateway-package/src/main/resources/bin/start.sh
@@ -194,7 +194,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${GATEWAY_CODE} ${JAVA_BIN_DIR}java \
     -Dapiml.service.port=${ZWE_configs_port:-7554} \
     -Dapiml.zoweManifest=${ZWE_zowe_runtimeDirectory}/manifest.json \
     -Deureka.client.serviceUrl.defaultZone=${ZWE_DISCOVERY_SERVICES_LIST} \
-    -Dfile.encoding=UTF-8 \
+    -Dfile.encoding=COMPAT \
     -Dibm.serversocket.recover=true \
     -Djava.io.tmpdir=${TMPDIR:-/tmp} \
     -Djava.library.path=${LIBPATH} \
diff --git a/zaas-package/src/main/resources/bin/start.sh b/zaas-package/src/main/resources/bin/start.sh
index c4b8c17c79..50213a6a83 100755
--- a/zaas-package/src/main/resources/bin/start.sh
+++ b/zaas-package/src/main/resources/bin/start.sh
@@ -149,7 +149,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${ZAAS_CODE} ${JAVA_BIN_DIR}java \
     ${JVM_SECURITY_PROPERTIES} \
     ${CUSTOM_JVM_OPTS} \
     -Dibm.serversocket.recover=true \
-    -Dfile.encoding=UTF-8 \
+    -Dfile.encoding=COMPAT \
     -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
     -Djava.io.tmpdir=${TMPDIR:-/tmp} \
     -Dspring.profiles.active=${ZWE_configs_spring_profiles_active:-} \

From 60137b501938870feea049d7b619815073c1f55e Mon Sep 17 00:00:00 2001
From: hrishikesh-nalawade <hrishikesh.nalawade.17@gmail.com>
Date: Mon, 9 Mar 2026 19:24:43 +0530
Subject: [PATCH 2/6] update

Signed-off-by: hrishikesh-nalawade <hrishikesh.nalawade.17@gmail.com>
---
 caching-service-package/src/main/resources/bin/start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/caching-service-package/src/main/resources/bin/start.sh b/caching-service-package/src/main/resources/bin/start.sh
index c8e25091ac..6140862e23 100755
--- a/caching-service-package/src/main/resources/bin/start.sh
+++ b/caching-service-package/src/main/resources/bin/start.sh
@@ -102,7 +102,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CACHING_CODE} ${JAVA_BIN_DIR}java \
   ${JVM_SECURITY_PROPERTIES} \
   ${CUSTOM_JVM_OPTS} \
   -Dibm.serversocket.recover=true \
-  -Dfile.encoding=COMPAT \
+  -Dfile.encoding=UTF-8 \
   -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
   -Djava.io.tmpdir=${TMPDIR:-/tmp} \
   -Dspring.profiles.active=${ZWE_configs_spring_profiles_active:-} \

From 49a69654535345f5a24a8b3211115c743a87bdad Mon Sep 17 00:00:00 2001
From: hrishikesh-nalawade <hrishikesh.nalawade.17@gmail.com>
Date: Tue, 17 Mar 2026 15:13:36 +0530
Subject: [PATCH 3/6] Changes

Signed-off-by: hrishikesh-nalawade <hrishikesh.nalawade.17@gmail.com>
---
 api-catalog-package/src/main/resources/bin/start.sh | 2 +-
 apiml-package/src/main/resources/bin/start.sh       | 2 +-
 discovery-package/src/main/resources/bin/start.sh   | 2 +-
 gateway-package/src/main/resources/bin/start.sh     | 2 +-
 scripts/apiml-common-scripts.sh                     | 8 ++++----
 zaas-package/src/main/resources/bin/start.sh        | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/api-catalog-package/src/main/resources/bin/start.sh b/api-catalog-package/src/main/resources/bin/start.sh
index 8dab7314e9..db9d74e6c1 100755
--- a/api-catalog-package/src/main/resources/bin/start.sh
+++ b/api-catalog-package/src/main/resources/bin/start.sh
@@ -110,7 +110,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CATALOG_CODE} ${JAVA_BIN_DIR}java \
     ${EXTERNAL_URL} \
     ${CUSTOM_JVM_OPTS} \
     -Dibm.serversocket.recover=true \
-    -Dfile.encoding=COMPAT \
+    -Dfile.encoding=UTF-8 \
     -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
     -Djava.io.tmpdir=${TMPDIR:-/tmp} \
     -Dspring.profiles.active=${ZWE_configs_spring_profiles_active:-} \
diff --git a/apiml-package/src/main/resources/bin/start.sh b/apiml-package/src/main/resources/bin/start.sh
index 22d8d0f5aa..43a83dd43c 100755
--- a/apiml-package/src/main/resources/bin/start.sh
+++ b/apiml-package/src/main/resources/bin/start.sh
@@ -314,7 +314,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${APIML_CODE} ${JAVA_BIN_DIR}java \
     -Dcaching.storage.size=${ZWE_components_caching_service_storage_size:-${ZWE_configs_storage_size:-10000}} \
     -Dcaching.storage.vsam.name=${VSAM_FILE_NAME} \
     -Deureka.client.serviceUrl.defaultZone=${ZWE_DISCOVERY_SERVICES_LIST} \
-    -Dfile.encoding=COMPAT \
+    -Dfile.encoding=UTF-8 \
     -Dibm.serversocket.recover=true \
     -Djava.io.tmpdir=${TMPDIR:-/tmp} \
     -Djava.library.path=${LIBPATH} \
diff --git a/discovery-package/src/main/resources/bin/start.sh b/discovery-package/src/main/resources/bin/start.sh
index 5ed2ab7565..fe85c52c5d 100755
--- a/discovery-package/src/main/resources/bin/start.sh
+++ b/discovery-package/src/main/resources/bin/start.sh
@@ -113,7 +113,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${DISCOVERY_CODE} ${JAVA_BIN_DIR}java \
     -Dapiml.security.ssl.verifySslCertificatesOfServices=${verifySslCertificatesOfServices:-false} \
     -Dapiml.service.hostname=${ZWE_haInstance_hostname:-localhost} \
     -Dapiml.service.port=${ZWE_configs_port:-7553} \
-    -Dfile.encoding=COMPAT \
+    -Dfile.encoding=UTF-8 \
     -Dibm.serversocket.recover=true \
     -Djava.io.tmpdir=${TMPDIR:-/tmp} \
     -Djava.library.path=${LIBPATH} \
diff --git a/gateway-package/src/main/resources/bin/start.sh b/gateway-package/src/main/resources/bin/start.sh
index 75351a5abd..326c423771 100755
--- a/gateway-package/src/main/resources/bin/start.sh
+++ b/gateway-package/src/main/resources/bin/start.sh
@@ -194,7 +194,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${GATEWAY_CODE} ${JAVA_BIN_DIR}java \
     -Dapiml.service.port=${ZWE_configs_port:-7554} \
     -Dapiml.zoweManifest=${ZWE_zowe_runtimeDirectory}/manifest.json \
     -Deureka.client.serviceUrl.defaultZone=${ZWE_DISCOVERY_SERVICES_LIST} \
-    -Dfile.encoding=COMPAT \
+    -Dfile.encoding=UTF-8 \
     -Dibm.serversocket.recover=true \
     -Djava.io.tmpdir=${TMPDIR:-/tmp} \
     -Djava.library.path=${LIBPATH} \
diff --git a/scripts/apiml-common-scripts.sh b/scripts/apiml-common-scripts.sh
index e24b098733..410b055d72 100755
--- a/scripts/apiml-common-scripts.sh
+++ b/scripts/apiml-common-scripts.sh
@@ -103,11 +103,11 @@ if [ "$(uname)" = "OS/390" ]; then
         | grep "major version" \
         | cut -d " " -f5)
 
-    if [ $JAVA_VERSION -ge 65 ]; then # Java 21
+    JAVA_VERSION=${JAVA_VERSION:-0}
+
+    if [ "$JAVA_VERSION" -ge 65 ]; then # Java 21
         ZOWE_CONSOLE_LOG_CHARSET=IBM-1047
-        # Java 21+ changed default encoding to UTF-8 (JEP 400). Set console encoding
-        # to EBCDIC for z/OS SYSPRINT to prevent garbled characters in early startup logs
-        JAVA21_CONSOLE_ENCODING="-Dstdout.encoding=${ZOWE_CONSOLE_LOG_CHARSET} -Dstderr.encoding=${ZOWE_CONSOLE_LOG_CHARSET}"
+        JAVA21_CONSOLE_ENCODING="-Dconsole.encoding=${ZOWE_CONSOLE_LOG_CHARSET}"
     fi
 fi
 
diff --git a/zaas-package/src/main/resources/bin/start.sh b/zaas-package/src/main/resources/bin/start.sh
index 50213a6a83..c4b8c17c79 100755
--- a/zaas-package/src/main/resources/bin/start.sh
+++ b/zaas-package/src/main/resources/bin/start.sh
@@ -149,7 +149,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${ZAAS_CODE} ${JAVA_BIN_DIR}java \
     ${JVM_SECURITY_PROPERTIES} \
     ${CUSTOM_JVM_OPTS} \
     -Dibm.serversocket.recover=true \
-    -Dfile.encoding=COMPAT \
+    -Dfile.encoding=UTF-8 \
     -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
     -Djava.io.tmpdir=${TMPDIR:-/tmp} \
     -Dspring.profiles.active=${ZWE_configs_spring_profiles_active:-} \

From 217bad4daf2456c495703f833563944567a81295 Mon Sep 17 00:00:00 2001
From: hrishikesh-nalawade <hrishikesh.nalawade.17@gmail.com>
Date: Fri, 20 Mar 2026 15:49:32 +0530
Subject: [PATCH 4/6] Changes

Signed-off-by: hrishikesh-nalawade <hrishikesh.nalawade.17@gmail.com>
---
 api-catalog-package/src/main/resources/bin/start.sh     | 1 -
 caching-service-package/src/main/resources/bin/start.sh | 1 -
 discovery-package/src/main/resources/bin/start.sh       | 1 -
 gateway-package/src/main/resources/bin/start.sh         | 1 -
 zaas-package/src/main/resources/bin/start.sh            | 1 -
 5 files changed, 5 deletions(-)

diff --git a/api-catalog-package/src/main/resources/bin/start.sh b/api-catalog-package/src/main/resources/bin/start.sh
index 3dccacc414..00ab4a836c 100755
--- a/api-catalog-package/src/main/resources/bin/start.sh
+++ b/api-catalog-package/src/main/resources/bin/start.sh
@@ -110,7 +110,6 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CATALOG_CODE} ${JAVA_BIN_DIR}java \
     ${EXTERNAL_URL} \
     ${CUSTOM_JVM_OPTS} \
     -Dibm.serversocket.recover=true \
-    -Dfile.encoding=UTF-8 \
     -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
     -Djava.io.tmpdir=${TMPDIR:-/tmp} \
     -Dspring.profiles.active=${ZWE_configs_spring_profiles_active:-} \
diff --git a/caching-service-package/src/main/resources/bin/start.sh b/caching-service-package/src/main/resources/bin/start.sh
index 5e77d594df..a740d7dd5d 100755
--- a/caching-service-package/src/main/resources/bin/start.sh
+++ b/caching-service-package/src/main/resources/bin/start.sh
@@ -102,7 +102,6 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CACHING_CODE} ${JAVA_BIN_DIR}java \
   ${JVM_SECURITY_PROPERTIES} \
   ${CUSTOM_JVM_OPTS} \
   -Dibm.serversocket.recover=true \
-  -Dfile.encoding=UTF-8 \
   -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
   -Djava.io.tmpdir=${TMPDIR:-/tmp} \
   -Dspring.profiles.active=${ZWE_configs_spring_profiles_active:-} \
diff --git a/discovery-package/src/main/resources/bin/start.sh b/discovery-package/src/main/resources/bin/start.sh
index 9c8e5e4dd6..324645d20c 100755
--- a/discovery-package/src/main/resources/bin/start.sh
+++ b/discovery-package/src/main/resources/bin/start.sh
@@ -123,7 +123,6 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${DISCOVERY_CODE} ${JAVA_BIN_DIR}java \
     -Dapiml.security.ssl.verifySslCertificatesOfServices=${verifySslCertificatesOfServices:-false} \
     -Dapiml.service.hostname=${ZWE_haInstance_hostname:-localhost} \
     -Dapiml.service.port=${ZWE_configs_port:-7553} \
-    -Dfile.encoding=UTF-8 \
     -Dibm.serversocket.recover=true \
     -Djava.io.tmpdir=${TMPDIR:-/tmp} \
     -Djava.library.path=${LIBPATH} \
diff --git a/gateway-package/src/main/resources/bin/start.sh b/gateway-package/src/main/resources/bin/start.sh
index 71d1a27ed7..f0ab9a8a4d 100755
--- a/gateway-package/src/main/resources/bin/start.sh
+++ b/gateway-package/src/main/resources/bin/start.sh
@@ -204,7 +204,6 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${GATEWAY_CODE} ${JAVA_BIN_DIR}java \
     -Dapiml.service.port=${ZWE_configs_port:-7554} \
     -Dapiml.zoweManifest=${ZWE_zowe_runtimeDirectory}/manifest.json \
     -Deureka.client.serviceUrl.defaultZone=${ZWE_DISCOVERY_SERVICES_LIST} \
-    -Dfile.encoding=UTF-8 \
     -Dibm.serversocket.recover=true \
     -Djava.io.tmpdir=${TMPDIR:-/tmp} \
     -Djava.library.path=${LIBPATH} \
diff --git a/zaas-package/src/main/resources/bin/start.sh b/zaas-package/src/main/resources/bin/start.sh
index bc2aed9a4a..76a74fc10b 100755
--- a/zaas-package/src/main/resources/bin/start.sh
+++ b/zaas-package/src/main/resources/bin/start.sh
@@ -149,7 +149,6 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${ZAAS_CODE} ${JAVA_BIN_DIR}java \
     ${JVM_SECURITY_PROPERTIES} \
     ${CUSTOM_JVM_OPTS} \
     -Dibm.serversocket.recover=true \
-    -Dfile.encoding=UTF-8 \
     -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
     -Djava.io.tmpdir=${TMPDIR:-/tmp} \
     -Dspring.profiles.active=${ZWE_configs_spring_profiles_active:-} \

From bcde4d51784ca39c96525ce00373c40fa698bb26 Mon Sep 17 00:00:00 2001
From: hrishikesh-nalawade <hrishikesh.nalawade.17@gmail.com>
Date: Mon, 23 Mar 2026 14:20:13 +0530
Subject: [PATCH 5/6]  logBuildInfo() moved after app.run()

Signed-off-by: hrishikesh-nalawade <hrishikesh.nalawade.17@gmail.com>
---
 api-catalog-package/src/main/resources/bin/start.sh             | 1 +
 .../java/org/zowe/apiml/apicatalog/ApiCatalogApplication.java   | 2 +-
 caching-service-package/src/main/resources/bin/start.sh         | 1 +
 discovery-package/src/main/resources/bin/start.sh               | 1 +
 .../org/zowe/apiml/discovery/DiscoveryServiceApplication.java   | 2 +-
 gateway-package/src/main/resources/bin/start.sh                 | 1 +
 zaas-package/src/main/resources/bin/start.sh                    | 1 +
 .../src/main/java/org/zowe/apiml/zaas/ZaasApplication.java      | 2 +-
 8 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/api-catalog-package/src/main/resources/bin/start.sh b/api-catalog-package/src/main/resources/bin/start.sh
index 00ab4a836c..9c295b6081 100755
--- a/api-catalog-package/src/main/resources/bin/start.sh
+++ b/api-catalog-package/src/main/resources/bin/start.sh
@@ -109,6 +109,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CATALOG_CODE} ${JAVA_BIN_DIR}java \
     ${JVM_SECURITY_PROPERTIES} \
     ${EXTERNAL_URL} \
     ${CUSTOM_JVM_OPTS} \
+    -Dfile.encoding=UTF-8 \
     -Dibm.serversocket.recover=true \
     -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
     -Djava.io.tmpdir=${TMPDIR:-/tmp} \
diff --git a/api-catalog-services/src/main/java/org/zowe/apiml/apicatalog/ApiCatalogApplication.java b/api-catalog-services/src/main/java/org/zowe/apiml/apicatalog/ApiCatalogApplication.java
index 1007763dcc..7d4c5ff4e9 100644
--- a/api-catalog-services/src/main/java/org/zowe/apiml/apicatalog/ApiCatalogApplication.java
+++ b/api-catalog-services/src/main/java/org/zowe/apiml/apicatalog/ApiCatalogApplication.java
@@ -46,7 +46,7 @@ public static void main(String[] args) {
         SpringApplication app = new SpringApplication(ApiCatalogApplication.class);
         app.addInitializers(new LatencyUtilsConfigInitializer());
         app.setLogStartupInfo(false);
-        new BuildInfo().logBuildInfo();
         app.run(args);
+        new BuildInfo().logBuildInfo();
     }
 }
diff --git a/caching-service-package/src/main/resources/bin/start.sh b/caching-service-package/src/main/resources/bin/start.sh
index a740d7dd5d..3a74877e2e 100755
--- a/caching-service-package/src/main/resources/bin/start.sh
+++ b/caching-service-package/src/main/resources/bin/start.sh
@@ -101,6 +101,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CACHING_CODE} ${JAVA_BIN_DIR}java \
   ${LOGBACK} \
   ${JVM_SECURITY_PROPERTIES} \
   ${CUSTOM_JVM_OPTS} \
+  -Dfile.encoding=UTF-8 \
   -Dibm.serversocket.recover=true \
   -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
   -Djava.io.tmpdir=${TMPDIR:-/tmp} \
diff --git a/discovery-package/src/main/resources/bin/start.sh b/discovery-package/src/main/resources/bin/start.sh
index 324645d20c..9d73fed73f 100755
--- a/discovery-package/src/main/resources/bin/start.sh
+++ b/discovery-package/src/main/resources/bin/start.sh
@@ -129,6 +129,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${DISCOVERY_CODE} ${JAVA_BIN_DIR}java \
     -Djava.protocol.handler.pkgs=com.ibm.crypto.provider \
     -Djavax.net.debug=${ZWE_configs_sslDebug:-""} \
     -Djdk.tls.client.cipherSuites=${client_ciphers} \
+    -Dfile.encoding=UTF-8 \
     -Dloader.path=${DISCOVERY_LOADER_PATH} \
     -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
     -Dserver.address=${ZWE_configs_zowe_network_server_listenAddresses_0:-${ZWE_zowe_network_server_listenAddresses_0:-"0.0.0.0"}} \
diff --git a/discovery-service/src/main/java/org/zowe/apiml/discovery/DiscoveryServiceApplication.java b/discovery-service/src/main/java/org/zowe/apiml/discovery/DiscoveryServiceApplication.java
index 809a4b6bd4..e528c3a741 100644
--- a/discovery-service/src/main/java/org/zowe/apiml/discovery/DiscoveryServiceApplication.java
+++ b/discovery-service/src/main/java/org/zowe/apiml/discovery/DiscoveryServiceApplication.java
@@ -48,8 +48,8 @@ public static void main(String[] args) {
         SpringApplication app = new SpringApplication(DiscoveryServiceApplication.class);
         app.addInitializers(new LatencyUtilsConfigInitializer());
         app.setLogStartupInfo(false);
-        new BuildInfo().logBuildInfo();
         app.run(args);
+        new BuildInfo().logBuildInfo();
     }
 
     @Override
diff --git a/gateway-package/src/main/resources/bin/start.sh b/gateway-package/src/main/resources/bin/start.sh
index f0ab9a8a4d..82ad6d1b49 100755
--- a/gateway-package/src/main/resources/bin/start.sh
+++ b/gateway-package/src/main/resources/bin/start.sh
@@ -210,6 +210,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${GATEWAY_CODE} ${JAVA_BIN_DIR}java \
     -Djava.protocol.handler.pkgs=com.ibm.crypto.provider \
     -Djavax.net.debug=${ZWE_configs_sslDebug:-""} \
     -Djdk.tls.client.cipherSuites=${client_ciphers} \
+    -Dfile.encoding=UTF-8 \
     -Dloader.path=${GATEWAY_LOADER_PATH} \
     -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
     -Dserver.address=${ZWE_configs_zowe_network_server_listenAddresses_0:-${ZWE_zowe_network_server_listenAddresses_0:-"0.0.0.0"}} \
diff --git a/zaas-package/src/main/resources/bin/start.sh b/zaas-package/src/main/resources/bin/start.sh
index 76a74fc10b..fe663a4976 100755
--- a/zaas-package/src/main/resources/bin/start.sh
+++ b/zaas-package/src/main/resources/bin/start.sh
@@ -148,6 +148,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${ZAAS_CODE} ${JAVA_BIN_DIR}java \
     ${LOGBACK} \
     ${JVM_SECURITY_PROPERTIES} \
     ${CUSTOM_JVM_OPTS} \
+    -Dfile.encoding=UTF-8 \
     -Dibm.serversocket.recover=true \
     -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
     -Djava.io.tmpdir=${TMPDIR:-/tmp} \
diff --git a/zaas-service/src/main/java/org/zowe/apiml/zaas/ZaasApplication.java b/zaas-service/src/main/java/org/zowe/apiml/zaas/ZaasApplication.java
index 2488f796ec..b38365a3af 100644
--- a/zaas-service/src/main/java/org/zowe/apiml/zaas/ZaasApplication.java
+++ b/zaas-service/src/main/java/org/zowe/apiml/zaas/ZaasApplication.java
@@ -44,8 +44,8 @@ public static void main(String[] args) {
         app.addInitializers(new LatencyUtilsConfigInitializer());
         app.addListeners(new ExtensionsLoader(new ExtensionConfigReader(defaultEnv())));
         app.setLogStartupInfo(false);
-        new BuildInfo().logBuildInfo();
         app.run(args);
+        new BuildInfo().logBuildInfo();
     }
 
 }

From c52c97cbcfbd9c4c8da4b8c0956f413c509877fc Mon Sep 17 00:00:00 2001
From: hrishikesh-nalawade <hrishikesh.nalawade.17@gmail.com>
Date: Mon, 13 Apr 2026 15:44:59 +0530
Subject: [PATCH 6/6] updating Config

Signed-off-by: hrishikesh-nalawade <hrishikesh.nalawade.17@gmail.com>
---
 api-catalog-package/src/main/resources/bin/start.sh           | 4 ++--
 .../java/org/zowe/apiml/apicatalog/ApiCatalogApplication.java | 2 +-
 apiml-package/src/main/resources/bin/start.sh                 | 4 ++--
 caching-service-package/src/main/resources/bin/start.sh       | 4 ++--
 discovery-package/src/main/resources/bin/start.sh             | 4 ++--
 .../org/zowe/apiml/discovery/DiscoveryServiceApplication.java | 2 +-
 gateway-package/src/main/resources/bin/start.sh               | 4 ++--
 zaas-package/src/main/resources/bin/start.sh                  | 3 ++-
 .../src/main/java/org/zowe/apiml/zaas/ZaasApplication.java    | 2 +-
 9 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/api-catalog-package/src/main/resources/bin/start.sh b/api-catalog-package/src/main/resources/bin/start.sh
index 9c295b6081..bddf677978 100755
--- a/api-catalog-package/src/main/resources/bin/start.sh
+++ b/api-catalog-package/src/main/resources/bin/start.sh
@@ -97,7 +97,7 @@ if [ -n "${externalProtocol}" ] && [ -n "${ZWE_zowe_externalDomains_0}" ] && [ -
 fi
 
 CATALOG_CODE=AC
-_BPXK_AUTOCVT=OFF
+_BPXK_AUTOCVT=ALL
 _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CATALOG_CODE} ${JAVA_BIN_DIR}java \
     -Xms${ZWE_configs_heap_init:-32}m -Xmx${ZWE_configs_heap_max:-512}m \
     -XX:+ExitOnOutOfMemoryError \
@@ -109,7 +109,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CATALOG_CODE} ${JAVA_BIN_DIR}java \
     ${JVM_SECURITY_PROPERTIES} \
     ${EXTERNAL_URL} \
     ${CUSTOM_JVM_OPTS} \
-    -Dfile.encoding=UTF-8 \
+    -Dfile.encoding=COMPAT \
     -Dibm.serversocket.recover=true \
     -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
     -Djava.io.tmpdir=${TMPDIR:-/tmp} \
diff --git a/api-catalog-services/src/main/java/org/zowe/apiml/apicatalog/ApiCatalogApplication.java b/api-catalog-services/src/main/java/org/zowe/apiml/apicatalog/ApiCatalogApplication.java
index 7d4c5ff4e9..1007763dcc 100644
--- a/api-catalog-services/src/main/java/org/zowe/apiml/apicatalog/ApiCatalogApplication.java
+++ b/api-catalog-services/src/main/java/org/zowe/apiml/apicatalog/ApiCatalogApplication.java
@@ -46,7 +46,7 @@ public static void main(String[] args) {
         SpringApplication app = new SpringApplication(ApiCatalogApplication.class);
         app.addInitializers(new LatencyUtilsConfigInitializer());
         app.setLogStartupInfo(false);
-        app.run(args);
         new BuildInfo().logBuildInfo();
+        app.run(args);
     }
 }
diff --git a/apiml-package/src/main/resources/bin/start.sh b/apiml-package/src/main/resources/bin/start.sh
index 858262bb39..18d292c1d8 100755
--- a/apiml-package/src/main/resources/bin/start.sh
+++ b/apiml-package/src/main/resources/bin/start.sh
@@ -215,7 +215,7 @@ fi
 # End OpenTelemetry
 
 APIML_CODE=AG
-_BPXK_AUTOCVT=OFF
+_BPXK_AUTOCVT=ALL
 _BPX_JOBNAME=${ZWE_zowe_job_prefix}${APIML_CODE} ${JAVA_BIN_DIR}java \
     -Xms${ZWE_configs_heap_init:-${ZWE_components_gateway_heap_init:-32}}m -Xmx${ZWE_configs_heap_max:-${ZWE_components_gateway_heap_max:-512}}m \
     -XX:+ExitOnOutOfMemoryError \
@@ -324,7 +324,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${APIML_CODE} ${JAVA_BIN_DIR}java \
     -Dcaching.storage.size=${ZWE_components_caching_service_storage_size:-${ZWE_configs_storage_size:-10000}} \
     -Dcaching.storage.vsam.name=${VSAM_FILE_NAME} \
     -Deureka.client.serviceUrl.defaultZone=${ZWE_DISCOVERY_SERVICES_LIST} \
-    -Dfile.encoding=UTF-8 \
+    -Dfile.encoding=COMPAT \
     -Dibm.serversocket.recover=true \
     -Djava.io.tmpdir=${TMPDIR:-/tmp} \
     -Djava.library.path=${LIBPATH} \
diff --git a/caching-service-package/src/main/resources/bin/start.sh b/caching-service-package/src/main/resources/bin/start.sh
index 3a74877e2e..2dbea71abb 100755
--- a/caching-service-package/src/main/resources/bin/start.sh
+++ b/caching-service-package/src/main/resources/bin/start.sh
@@ -90,7 +90,7 @@ if [ -d "${original_infinispan_index_location}" ]; then
 fi
 
 CACHING_CODE=CS
-_BPXK_AUTOCVT=OFF
+_BPXK_AUTOCVT=ALL
 _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CACHING_CODE} ${JAVA_BIN_DIR}java \
   -Xms${ZWE_configs_heap_init:-32}m -Xmx${ZWE_configs_heap_max:-512}m \
   -XX:+ExitOnOutOfMemoryError \
@@ -101,7 +101,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CACHING_CODE} ${JAVA_BIN_DIR}java \
   ${LOGBACK} \
   ${JVM_SECURITY_PROPERTIES} \
   ${CUSTOM_JVM_OPTS} \
-  -Dfile.encoding=UTF-8 \
+  -Dfile.encoding=COMPAT \
   -Dibm.serversocket.recover=true \
   -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
   -Djava.io.tmpdir=${TMPDIR:-/tmp} \
diff --git a/discovery-package/src/main/resources/bin/start.sh b/discovery-package/src/main/resources/bin/start.sh
index 9d73fed73f..d7c4d9deec 100755
--- a/discovery-package/src/main/resources/bin/start.sh
+++ b/discovery-package/src/main/resources/bin/start.sh
@@ -89,7 +89,7 @@ if [ "${ZWE_components_gateway_apiml_security_auth_uniqueCookie}" = "true" ]; th
 fi
 
 DISCOVERY_CODE=AD
-_BPXK_AUTOCVT=OFF
+_BPXK_AUTOCVT=ALL
 _BPX_JOBNAME=${ZWE_zowe_job_prefix}${DISCOVERY_CODE} ${JAVA_BIN_DIR}java \
     -Xms${ZWE_configs_heap_init:-32}m -Xmx${ZWE_configs_heap_max:-512}m \
     -XX:+ExitOnOutOfMemoryError \
@@ -129,7 +129,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${DISCOVERY_CODE} ${JAVA_BIN_DIR}java \
     -Djava.protocol.handler.pkgs=com.ibm.crypto.provider \
     -Djavax.net.debug=${ZWE_configs_sslDebug:-""} \
     -Djdk.tls.client.cipherSuites=${client_ciphers} \
-    -Dfile.encoding=UTF-8 \
+    -Dfile.encoding=COMPAT \
     -Dloader.path=${DISCOVERY_LOADER_PATH} \
     -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
     -Dserver.address=${ZWE_configs_zowe_network_server_listenAddresses_0:-${ZWE_zowe_network_server_listenAddresses_0:-"0.0.0.0"}} \
diff --git a/discovery-service/src/main/java/org/zowe/apiml/discovery/DiscoveryServiceApplication.java b/discovery-service/src/main/java/org/zowe/apiml/discovery/DiscoveryServiceApplication.java
index e528c3a741..809a4b6bd4 100644
--- a/discovery-service/src/main/java/org/zowe/apiml/discovery/DiscoveryServiceApplication.java
+++ b/discovery-service/src/main/java/org/zowe/apiml/discovery/DiscoveryServiceApplication.java
@@ -48,8 +48,8 @@ public static void main(String[] args) {
         SpringApplication app = new SpringApplication(DiscoveryServiceApplication.class);
         app.addInitializers(new LatencyUtilsConfigInitializer());
         app.setLogStartupInfo(false);
-        app.run(args);
         new BuildInfo().logBuildInfo();
+        app.run(args);
     }
 
     @Override
diff --git a/gateway-package/src/main/resources/bin/start.sh b/gateway-package/src/main/resources/bin/start.sh
index 82ad6d1b49..0b63c0ce12 100755
--- a/gateway-package/src/main/resources/bin/start.sh
+++ b/gateway-package/src/main/resources/bin/start.sh
@@ -142,7 +142,7 @@ if [ -n "${ZWE_GATEWAY_LIBRARY_PATH}" ]; then
 fi
 
 GATEWAY_CODE=AG
-_BPXK_AUTOCVT=OFF
+_BPXK_AUTOCVT=ALL
 _BPX_JOBNAME=${ZWE_zowe_job_prefix}${GATEWAY_CODE} ${JAVA_BIN_DIR}java \
     -Xms${ZWE_configs_heap_init:-32}m -Xmx${ZWE_configs_heap_max:-512}m \
     -XX:+ExitOnOutOfMemoryError \
@@ -210,7 +210,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${GATEWAY_CODE} ${JAVA_BIN_DIR}java \
     -Djava.protocol.handler.pkgs=com.ibm.crypto.provider \
     -Djavax.net.debug=${ZWE_configs_sslDebug:-""} \
     -Djdk.tls.client.cipherSuites=${client_ciphers} \
-    -Dfile.encoding=UTF-8 \
+    -Dfile.encoding=COMPAT \
     -Dloader.path=${GATEWAY_LOADER_PATH} \
     -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
     -Dserver.address=${ZWE_configs_zowe_network_server_listenAddresses_0:-${ZWE_zowe_network_server_listenAddresses_0:-"0.0.0.0"}} \
diff --git a/zaas-package/src/main/resources/bin/start.sh b/zaas-package/src/main/resources/bin/start.sh
index fe663a4976..89370ebf1d 100755
--- a/zaas-package/src/main/resources/bin/start.sh
+++ b/zaas-package/src/main/resources/bin/start.sh
@@ -139,6 +139,7 @@ CERTIFICATES_URLS=${ZWE_configs_apiml_security_x509_certificatesUrl:-${ZWE_compo
 CERTIFICATES_URLS=${ZWE_configs_apiml_security_x509_certificatesUrls:-${ZWE_components_gateway_apiml_security_x509_certificatesUrls:-${CERTIFICATES_URLS}}}
 
 ZAAS_CODE=AZ
+_BPXK_AUTOCVT=ALL
 _BPX_JOBNAME=${ZWE_zowe_job_prefix}${ZAAS_CODE} ${JAVA_BIN_DIR}java \
     -Xms${ZWE_configs_heap_init:-32}m -Xmx${ZWE_configs_heap_max:-512}m \
     ${QUICK_START} \
@@ -148,7 +149,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${ZAAS_CODE} ${JAVA_BIN_DIR}java \
     ${LOGBACK} \
     ${JVM_SECURITY_PROPERTIES} \
     ${CUSTOM_JVM_OPTS} \
-    -Dfile.encoding=UTF-8 \
+    -Dfile.encoding=COMPAT \
     -Dibm.serversocket.recover=true \
     -Dlogging.charset.console=${ZOWE_CONSOLE_LOG_CHARSET} \
     -Djava.io.tmpdir=${TMPDIR:-/tmp} \
diff --git a/zaas-service/src/main/java/org/zowe/apiml/zaas/ZaasApplication.java b/zaas-service/src/main/java/org/zowe/apiml/zaas/ZaasApplication.java
index b38365a3af..2488f796ec 100644
--- a/zaas-service/src/main/java/org/zowe/apiml/zaas/ZaasApplication.java
+++ b/zaas-service/src/main/java/org/zowe/apiml/zaas/ZaasApplication.java
@@ -44,8 +44,8 @@ public static void main(String[] args) {
         app.addInitializers(new LatencyUtilsConfigInitializer());
         app.addListeners(new ExtensionsLoader(new ExtensionConfigReader(defaultEnv())));
         app.setLogStartupInfo(false);
-        app.run(args);
         new BuildInfo().logBuildInfo();
+        app.run(args);
     }
 
 }