diff --git a/bin/pos-cli-data-clean.js b/bin/pos-cli-data-clean.js
index 0ad2e17f..e63bd655 100755
--- a/bin/pos-cli-data-clean.js
+++ b/bin/pos-cli-data-clean.js
@@ -16,10 +16,10 @@ const confirmCleanup = async (autoConfirm, includeSchema, url) => {
   try {
     let schemaText = includeSchema ? 'and database schemas ' : '';
 
-    logger.Warn('');
-    logger.Warn(`WARNING!!! You are going to REMOVE your data ${schemaText}from instance: ${url}`);
-    logger.Warn('There is no coming back.');
-    logger.Warn('');
+    await logger.Warn('');
+    await logger.Warn(`WARNING!!! You are going to REMOVE your data ${schemaText}from instance: ${url}`);
+    await logger.Warn('There is no coming back.');
+    await logger.Warn('');
 
     const message = `If you still want to continue please type: '${confirmationText}' `;
     const response = await prompts({ type: 'text', name: 'confirmation', message: message });
diff --git a/bin/pos-cli-generate-list.js b/bin/pos-cli-generate-list.js
index 722e6240..d2ac4197 100755
--- a/bin/pos-cli-generate-list.js
+++ b/bin/pos-cli-generate-list.js
@@ -3,6 +3,7 @@
 import { program } from '../lib/program.js';
 import glob from 'fast-glob';
 import table from 'text-table';
+import logger from '../lib/logger.js';
 
 program
   .name('pos-cli generate')
@@ -10,15 +11,15 @@ program
   .action(async () => {
     const files = await glob('**/generators/*/index.js');
     if (files.length > 0) {
-      console.log('List of available generators:');
+      await logger.Info('List of available generators:');
       const generators = files.map((file) => {
         const generatorPath = file.replace('/index.js', '');
         const generatorName = generatorPath.split('/').pop();
         return [generatorName, `pos-cli generate run ${generatorPath} --generator-help`];
       });
-      console.log(table(generators));
+      await logger.Print(table(generators) + '\n');
     } else {
-      console.log("Can't find any generators");
+      await logger.Info("Can't find any generators");
     }
 
   });
diff --git a/bin/pos-cli-generate-run.js b/bin/pos-cli-generate-run.js
index 91ee5dbc..71230e55 100755
--- a/bin/pos-cli-generate-run.js
+++ b/bin/pos-cli-generate-run.js
@@ -113,7 +113,7 @@ const confirmInstallation = async (packageRoot, pkg, autoConfirm) => {
 
   const packageJsonPath = path.join(packageRoot, 'package.json');
 
-  const lines = ['\nGenerator dependencies need to be installed:'];
+  const lines = ['Generator dependencies need to be installed:'];
   lines.push(`  Package: ${pkg.name || 'unnamed'}`);
   lines.push(`  Location: ${packageJsonPath}`);
 
@@ -133,7 +133,7 @@ const confirmInstallation = async (packageRoot, pkg, autoConfirm) => {
 
   lines.push('');
 
-  console.log(lines.join('\n'));
+  await logger.Info(lines.join('\n'));
 
   try {
     const answer = await confirm({
diff --git a/bin/pos-cli-logsv2-reports.js b/bin/pos-cli-logsv2-reports.js
index c0d426e2..59309d6e 100644
--- a/bin/pos-cli-logsv2-reports.js
+++ b/bin/pos-cli-logsv2-reports.js
@@ -29,7 +29,7 @@ program
       const response = await client.searchSQLByQuery(report);
 
       if (!program.json)
-        search.printReport(response, report);
+        await search.printReport(response, report);
       else
         console.log(JSON.stringify(response));
 
diff --git a/lib/productionEnvironment.js b/lib/productionEnvironment.js
index ca9cfd38..8ebc0f7d 100644
--- a/lib/productionEnvironment.js
+++ b/lib/productionEnvironment.js
@@ -10,9 +10,9 @@ const isProductionEnvironment = (environment) => {
 };
 
 const confirmProductionExecution = async (environment) => {
-  logger.Warn(`WARNING: You are executing on a production environment: ${environment}`);
-  logger.Warn('This could potentially modify production data or cause unintended side effects.');
-  logger.Warn('');
+  await logger.Warn(`WARNING: You are executing on a production environment: ${environment}`);
+  await logger.Warn('This could potentially modify production data or cause unintended side effects.');
+  await logger.Warn('');
 
   const response = await prompts({
     type: 'confirm',
diff --git a/lib/swagger-client.js b/lib/swagger-client.js
index 576e9258..2574a13e 100644
--- a/lib/swagger-client.js
+++ b/lib/swagger-client.js
@@ -6,6 +6,7 @@ import logger from '../lib/logger.js';
 import ServerError from '../lib/ServerError.js';
 import api from './logsv2/http.js';
 import fs from 'fs';
+import chalk from 'chalk';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -252,18 +253,18 @@ const search = {
       .forEach(search.printLog);
   },
   printLog(hit) {
-    console.log(search.formatHit(hit)); 
+    logger.Print(search.formatHit(hit) + '\n');
   },
   formatHit([_id, hit]) {
     const row = `[${search.toDate(hit._timestamp)}] ${hit._timestamp} ${hit.type} | ${hit.message}`;
     if (hit.highlight) {
-      return row.blue;
+      return chalk.blue(row);
     } else {
       return row;
     }
   },
-  printReport(response, report) {
-    console.log(report.meta.title);
+  async printReport(response, report) {
+    await logger.Info(report.meta.title);
     if (response.aggs)
       console.table(
         Object.entries(response.aggs.histogram).map((r) => {