diff --git a/lib/apiml.js b/lib/apiml.js
index e99015db..acc21106 100644
--- a/lib/apiml.js
+++ b/lib/apiml.js
@@ -124,7 +124,9 @@ ApimlConnector.prototype = {
         headers: {'accept':'application/json'}
       }, this.tlsOptions);
 
-      if (!process.env['KEYSTORE_DIRECTORY']) {
+      //TODO FIXME We should not be referring to env var this far in the code.
+      const zweVerifyCerts = process.env['ZWE_zowe_verifyCertificates'];
+      if (!zweVerifyCerts || zweVerifyCerts=='DISABLED') {
         //Keeping these certs causes an openssl error 46, unknown cert error in a dev environment
         delete options.cert;
         delete options.key;
@@ -258,7 +260,9 @@ ApimlConnector.prototype = {
   
   registerMainServerInstance() {
     const overrideOptions = Object.assign({},this.tlsOptions);
-    if (!process.env['KEYSTORE_DIRECTORY']) {
+    //TODO FIXME We should not be referring to env var this far in the code.
+    const zweVerifyCerts = process.env['ZWE_zowe_verifyCertificates'];
+    if (!zweVerifyCerts || zweVerifyCerts=='DISABLED') {
       //Keeping these certs causes an openssl error 46, unknown cert error in a dev environment
       delete overrideOptions.cert;
       delete overrideOptions.key;
diff --git a/lib/swagger-catalog.js b/lib/swagger-catalog.js
index cf17690f..1c62c66c 100644
--- a/lib/swagger-catalog.js
+++ b/lib/swagger-catalog.js
@@ -252,7 +252,7 @@ function getSchemesFromContext (nodeContext) {
 }
 
 function getHost(nodeContext) {
-  let hostname = process.env['ZOWE_EXPLORER_HOST'] ? process.env['ZOWE_EXPLORER_HOST'] : os.hostname();
+  let hostname = process.env['ZWE_zowe_externalDomains_0'] ? process.env['ZWE_zowe_externalDomains_0'] : os.hostname();
   return nodeContext.https ? `${hostname}:${nodeContext.https.port}`
                            : `${hostname}:${nodeContext.http.port}`;
 }
diff --git a/plugins/terminal-proxy/lib/terminalProxy.js b/plugins/terminal-proxy/lib/terminalProxy.js
index ef8ca5ef..eab42658 100644
--- a/plugins/terminal-proxy/lib/terminalProxy.js
+++ b/plugins/terminal-proxy/lib/terminalProxy.js
@@ -690,7 +690,7 @@ let scanAndImportHandlers = function(logger) {
     let filenames;
     let len;
     try {
-      let handlerDir = pathModule.join(process.env.INSTANCE_DIR,'workspace','app-server','org.zowe.terminal.proxy','handlers');
+      let handlerDir = pathModule.join(process.env.ZWE_zowe_workspaceDirectory,'app-server','org.zowe.terminal.proxy','handlers');
       filenames = fs.readdirSync(handlerDir);
       len = filenames.length;
       for (let i = 0; i < len; i++) {