diff --git a/lib/cli/scripts/check-cs-env.ts b/lib/cli/scripts/check-cs-env.ts
index 11fe68001c..c61ce5422a 100755
--- a/lib/cli/scripts/check-cs-env.ts
+++ b/lib/cli/scripts/check-cs-env.ts
@@ -1,8 +1,10 @@
+/* tslint:disable */
 const alfrescoApi = require('@alfresco/js-api');
 const program = require('commander');
 const path = require('path');
 const fs = require('fs');
-
+/* tslint:enable */
+import { logger } from './logger';
 const MAX_RETRY = 3;
 const TIMEOUT = 20000;
 let counter = 0;
@@ -20,7 +22,6 @@ export default async function main(_args: string[]) {
         .option('-r, --retry [type]', 'retry ')
         .parse(process.argv);
 
-
     await checkEnv();
     await checkDiskSpaceFullEnv();
 }
@@ -34,15 +35,19 @@ async function checkEnv() {
 
         await alfrescoJsApi.login(program.username, program.password);
     } catch (error) {
-        console.log('Login error environment down or inaccessible');
+        if (error.error.code === 'ETIMEDOUT') {
+            logger.error('The env is not reachable. Terminating');
+            process.exit(1);
+        }
+        logger.error('Login error environment down or inaccessible');
         counter++;
         const retry = program.retry || MAX_RETRY;
         const time = program.time || TIMEOUT;
         if (retry === counter) {
-            console.log('Give up');
+            logger.error('Give up');
             process.exit(1);
         } else {
-            console.log(`Retry in 1 minute attempt N ${counter}`, error);
+            logger.error(`Retry in 1 minute attempt N ${counter}`, error);
             sleep(time);
             checkEnv();
         }
@@ -50,7 +55,7 @@ async function checkEnv() {
 }
 
 async function checkDiskSpaceFullEnv() {
-    console.log(`Start Check disk full space`);
+    logger.info(`Start Check disk full space`);
 
     try {
 
@@ -80,11 +85,11 @@ async function checkDiskSpaceFullEnv() {
                 'overwrite': true
             });
         }
-        let pathFile = path.join(__dirname, '../', 'README.md');
+        const pathFile = path.join(__dirname, '../', 'README.md');
 
-        let file = fs.createReadStream(pathFile);
+        const file = fs.createReadStream(pathFile);
 
-        let uploadedFile = await alfrescoJsApi.upload.uploadFile(
+        const uploadedFile = await alfrescoJsApi.upload.uploadFile(
             file,
             '',
             folder.entry.id,
@@ -103,13 +108,13 @@ async function checkDiskSpaceFullEnv() {
         const retry = program.retry || MAX_RETRY;
         const time = program.time || TIMEOUT;
         if (retry === counter) {
-            console.log('=============================================================');
-            console.log('================ Not able to upload a file ==================');
-            console.log('================ Possible cause CS is full ==================');
-            console.log('=============================================================');
+            logger.info('=============================================================');
+            logger.info('================ Not able to upload a file ==================');
+            logger.info('================ Possible cause CS is full ==================');
+            logger.info('=============================================================');
             process.exit(1);
         } else {
-            console.log(`Retry N ${counter} ${error?.error?.status}`);
+            logger.error(`Retry N ${counter} ${error?.error?.status}`);
             sleep(time);
             checkDiskSpaceFullEnv();
         }
@@ -119,7 +124,6 @@ async function checkDiskSpaceFullEnv() {
 }
 
 function sleep(delay) {
-    console.log(`Sleep ${delay}`);
-    var start = new Date().getTime();
-    while (new Date().getTime() < start + delay) ;
+    const start = new Date().getTime();
+    while (new Date().getTime() < start + delay) {  }
 }
diff --git a/lib/cli/scripts/check-ps-env.ts b/lib/cli/scripts/check-ps-env.ts
index c578d92406..e31112dc8b 100755
--- a/lib/cli/scripts/check-ps-env.ts
+++ b/lib/cli/scripts/check-ps-env.ts
@@ -1,6 +1,8 @@
+/* tslint:disable */
 const alfrescoApi = require('@alfresco/js-api');
 const program = require('commander');
-
+/* tslint:enable */
+import { logger } from './logger';
 const MAX_RETRY = 10;
 const TIMEOUT = 60000;
 let counter = 0;
@@ -16,7 +18,6 @@ export default async function main(_args: string[]) {
         .option('-u, --username [type]', 'username ')
         .parse(process.argv);
 
-
     await checkEnv();
 }
 
@@ -29,22 +30,24 @@ async function checkEnv() {
 
         await alfrescoJsApi.login(program.username, program.password);
     } catch (e) {
-        console.log('Login error environment down or inaccessible');
+        if (e.error.code === 'ETIMEDOUT') {
+            logger.error('The env is not reachable. Terminating');
+            process.exit(1);
+        }
+        logger.error('Login error environment down or inaccessible');
         counter++;
         if (MAX_RETRY === counter) {
-            console.log('Give up');
+            logger.error('Give up');
             process.exit(1);
         } else {
-            console.log(`Retry in 1 minute attempt N ${counter}`);
+            logger.error(`Retry in 1 minute attempt N ${counter}`);
             sleep(TIMEOUT);
             checkEnv();
         }
     }
-    console.log('ok');
 }
 
-
 function sleep(delay) {
-    var start = new Date().getTime();
-    while (new Date().getTime() < start + delay) ;
+    const start = new Date().getTime();
+    while (new Date().getTime() < start + delay) {  }
 }
diff --git a/lib/cli/scripts/init-acs-env.ts b/lib/cli/scripts/init-acs-env.ts
index 0f06935ab6..669248bcaa 100755
--- a/lib/cli/scripts/init-acs-env.ts
+++ b/lib/cli/scripts/init-acs-env.ts
@@ -139,13 +139,17 @@ async function checkEnv() {
         });
         await alfrescoJsApi.login(program.username, program.password);
     } catch (e) {
-        logger.info('Login error environment down or inaccessible');
+        if (e.error.code === 'ETIMEDOUT') {
+            logger.error('The env is not reachable. Terminating');
+            process.exit(1);
+        }
+        logger.error('Login error environment down or inaccessible');
         counter++;
         if (MAX_RETRY === counter) {
-            logger.info('Give up');
+            logger.error('Give up');
             process.exit(1);
         } else {
-            logger.info(`Retry in 1 minute attempt N ${counter}`);
+            logger.error(`Retry in 1 minute attempt N ${counter}`);
             sleep(TIMEOUT);
             checkEnv();
         }
diff --git a/lib/cli/scripts/init-aps-env.ts b/lib/cli/scripts/init-aps-env.ts
index ab6c3717ab..ad00c3dd6c 100755
--- a/lib/cli/scripts/init-aps-env.ts
+++ b/lib/cli/scripts/init-aps-env.ts
@@ -125,13 +125,17 @@ async function checkEnv() {
         alfrescoJsApiRepo = alfrescoJsApi;
         await alfrescoJsApi.login(program.username, program.password);
     } catch (e) {
+        if (e.error.code === 'ETIMEDOUT') {
+            logger.error('The env is not reachable. Terminating');
+            process.exit(1);
+        }
         logger.info('Login error environment down or inaccessible');
         counter++;
         if (MAX_RETRY === counter) {
-            logger.info('Give up');
+            logger.error('Give up');
             process.exit(1);
         } else {
-            logger.info(`Retry in 1 minute attempt N ${counter}`);
+            logger.error(`Retry in 1 minute attempt N ${counter}`);
             sleep(TIMEOUT);
             checkEnv();
         }
diff --git a/lib/cli/scripts/plugins/check-env.ts b/lib/cli/scripts/plugins/check-env.ts
index c7bb7084cd..e1562e222d 100644
--- a/lib/cli/scripts/plugins/check-env.ts
+++ b/lib/cli/scripts/plugins/check-env.ts
@@ -28,6 +28,10 @@ export class CheckEnv {
             });
             await this.alfrescoJsApi.login(this.username, this.password);
         } catch (e) {
+            if (e.error.code === 'ETIMEDOUT') {
+                logger.error('The env is not reachable. Terminating');
+                process.exit(1);
+            }
             logger.error('Login error environment down or inaccessible');
             this.counter++;
             if (this.MAX_RETRY === this.counter) {