diff --git a/CHANGELOG.md b/CHANGELOG.md
index e67a67fa..1508c0b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to the ZSS package will be documented in this file.
 ## `2.18.1`
 - Bugfix: Support cross-memory server parameters longer than 128 characters (#684)
 - Enhancement: Expose new cross-memory server's functions in dynlink (#684)
+- Bugfix: ZSS was not accessible from the Gateway when using AT-TLS (#748)
 
 ## `2.18.0`
 - Change log level for setting default value of 'httpRequestHeapMaxBlocks' to DEBUG instead of INFO.(#719)
diff --git a/apiml-static-reg.yaml.template b/apiml-static-reg.yaml.template
index 4d323513..defbd87b 100644
--- a/apiml-static-reg.yaml.template
+++ b/apiml-static-reg.yaml.template
@@ -4,7 +4,7 @@ services:
     description: 'Zowe System Services is an HTTPS and Websocket server that makes it easy to have secure, powerful web APIs backed by low-level z/OS constructs. It contains services for essential z/OS abilities such as working with files, datasets, and ESMs, but is also extensible by REST and Websocket "Dataservices" which are optionally present in App Framework "Plugins".'
     catalogUiTileId: zss
     instanceBaseUrls:
-      - https://${ZWE_haInstance_hostname}:${ZWE_components_zss_port}/
+      - ${ZWE_zowe_network_proxyType:-https}://${ZWE_haInstance_hostname}:${ZWE_components_zss_port}/
     homePageRelativeUrl:
     routedServices:
       - gatewayUrl: api/v1
@@ -12,7 +12,7 @@ services:
     apiInfo:
       - apiId: zowe.zss
         gatewayUrl: api/v1
-        swaggerUrl: https://${ZWE_haInstance_hostname}:${ZWE_components_app_server_port}/api-docs/agent
+        swaggerUrl: ${ZWE_zowe_network_proxyType:-https}://${ZWE_haInstance_hostname}:${ZWE_components_app_server_port}/api-docs/agent
         # documentationUrl: TODO
     authentication:
         scheme: zoweJwt