diff --git a/cloud-gateway-package/src/main/resources/bin/start.sh b/cloud-gateway-package/src/main/resources/bin/start.sh
index d1c7ec25bf..18513eb8aa 100755
--- a/cloud-gateway-package/src/main/resources/bin/start.sh
+++ b/cloud-gateway-package/src/main/resources/bin/start.sh
@@ -99,6 +99,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CLOUD_GATEWAY_CODE} java \
     -Dapiml.logs.location=${ZWE_zowe_logDirectory} \
     -Dapiml.zoweManifest=${ZWE_zowe_runtimeDirectory}/manifest.json \
     -Dserver.address=0.0.0.0 \
+    -Dapiml.service.apimlId=${ZWE_configs_apimlId:-} \
     -Deureka.client.serviceUrl.defaultZone=${ZWE_DISCOVERY_SERVICES_LIST:-"https://${ZWE_haInstance_hostname:-localhost}:${ZWE_components_discovery_port:-7553}/eureka/"} \
     -Dserver.ssl.enabled=${ZWE_configs_server_ssl_enabled:-true} \
     -Dserver.maxConnectionsPerRoute=${ZWE_configs_server_maxConnectionsPerRoute:-100} \
diff --git a/cloud-gateway-service/build.gradle b/cloud-gateway-service/build.gradle
index 643d9eed20..327ccefaa6 100644
--- a/cloud-gateway-service/build.gradle
+++ b/cloud-gateway-service/build.gradle
@@ -82,7 +82,6 @@ dependencies {
     implementation libs.spring.expression
     implementation libs.bcpkix
     implementation libs.nimbusJoseJwt
-    implementation libs.janino
 
     compileOnly libs.lombok
     annotationProcessor libs.lombok
diff --git a/cloud-gateway-service/src/main/resources/application.yml b/cloud-gateway-service/src/main/resources/application.yml
index 19b607ee88..0be73f0240 100644
--- a/cloud-gateway-service/src/main/resources/application.yml
+++ b/cloud-gateway-service/src/main/resources/application.yml
@@ -15,7 +15,7 @@ apiml:
         id: cloud-gateway
         port: 10023
         hostname: localhost
-        scheme: https  # "https" or "http"
+        scheme: https
         corsEnabled: true
         ignoredHeadersWhenCorsEnabled: Access-Control-Request-Method,Access-Control-Request-Headers,Access-Control-Allow-Origin,Access-Control-Allow-Methods,Access-Control-Allow-Headers,Access-Control-Allow-Credentials,Origin
         forwardClientCertEnabled: false
@@ -49,7 +49,6 @@ server:
     main:
         allow-circular-references: true
 
-logbackServiceName: ZWEACG1
 
 logging:
     level:
diff --git a/cloud-gateway-service/src/main/resources/logback.xml b/cloud-gateway-service/src/main/resources/logback.xml
deleted file mode 100644
index 999077ccc1..0000000000
--- a/cloud-gateway-service/src/main/resources/logback.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <property resource="application.yml" />
-    <property name="MAX_INDEX" value="${rollingPolicy.maxIndex:-12}"/>
-    <property name="MIN_INDEX" value="${rollingPolicy.minIndex:-1}"/>
-    <property name="MAX_FILE_SIZE" value="${rollingPolicy.file.maxSize:-50MB}"/>
-    <property name="STORAGE_LOCATION" value="${apiml.logs.location}" />
-    <property name="apimlLogPattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS,UTC} %clr(&lt;${logbackService:-${logbackServiceName}}:%thread:${PID:- }&gt;){magenta} %X{userid:-} %clr(%-5level) %clr(\\(%logger{15}\\)){cyan} %msg%n"/>
-
-    <turboFilter class="org.zowe.apiml.product.logging.UseridFilter"/>
-    <if condition='property("spring.profiles.include").contains("debug")||property("spring.profiles.include").contains("diag")||property("spring.profiles.include").contains("dev")'>
-        <then>
-        </then>
-        <else>
-            <turboFilter class="org.zowe.apiml.product.logging.LogLevelInfoFilter"/>
-        </else>
-    </if>
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.zowe.apiml.product.logging.MaskingLogPatternLayout">
-                <pattern>${apimlLogPattern}</pattern>
-            </layout>
-        </encoder>
-    </appender>
-
-    <appender name="FILE" class="org.zowe.apiml.product.logging.ApimlRollingFileAppender">
-        <file>${STORAGE_LOCATION}/${logbackServiceName}.log</file>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <fileNamePattern>${STORAGE_LOCATION}/${logbackServiceName}.%i.log</fileNamePattern>
-            <minIndex>${MIN_INDEX}</minIndex>
-            <maxIndex>${MAX_INDEX}</maxIndex>
-        </rollingPolicy>
-
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
-        </triggeringPolicy>
-
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.zowe.apiml.product.logging.MaskingLogPatternLayout">
-                <pattern>${apimlLogPattern}</pattern>
-            </layout>
-        </encoder>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-        <appender-ref ref="FILE" />
-    </root>
-</configuration>
\ No newline at end of file
diff --git a/cloud-gateway-service/src/test/resources/application.yml b/cloud-gateway-service/src/test/resources/application.yml
index 90fb74edc7..b2a08791bb 100644
--- a/cloud-gateway-service/src/test/resources/application.yml
+++ b/cloud-gateway-service/src/test/resources/application.yml
@@ -9,8 +9,8 @@ apiml:
         id: cloud-gateway
         port: 10023
         hostname: localhost
-        scheme: https
         corsEnabled: true
+        scheme: https
         ignoredHeadersWhenCorsEnabled: Access-Control-Request-Method,Access-Control-Request-Headers,Access-Control-Allow-Origin,Access-Control-Allow-Methods,Access-Control-Allow-Headers,Access-Control-Allow-Credentials,Origin
         forwardClientCertEnabled: false
     cloudGateway: