diff --git a/lib/executor.js b/lib/executor.js
index cba591bd..975d17a8 100644
--- a/lib/executor.js
+++ b/lib/executor.js
@@ -1,6 +1,8 @@
-var EventEmitter = require('events').EventEmitter;
-var _ = require('lodash');
-var util = require('util');
+const EventEmitter = require('events').EventEmitter;
+const _ = require('lodash');
+const util = require('util');
+const log = require('./logging.js');
+
 
 exports.TaskExec = TaskExec;
 
@@ -13,7 +15,7 @@ util.inherits(TaskExec, EventEmitter);
 
 TaskExec.prototype.process = function process(triggerOrAction, payload, cfg, snapshot) {
     //eslint-disable-next-line consistent-this
-    var self = this;
+    const self = this;
     if (!_.isFunction(triggerOrAction.process)) {
         return onError(new Error('Process function is not found'));
     }
@@ -28,7 +30,7 @@ TaskExec.prototype.process = function process(triggerOrAction, payload, cfg, sna
 
     function onPromisedData(data) {
         if (data) {
-            console.log('Process function is a Promise/generator/etc');
+            log.debug('Process function is a Promise/generator/etc');
             self.emit('data', data);
         }
         self.emit('end');
diff --git a/lib/sailor.js b/lib/sailor.js
index 5c1dfe2b..fe00cc1c 100644
--- a/lib/sailor.js
+++ b/lib/sailor.js
@@ -11,7 +11,7 @@ const assert = require('assert');
 const co = require('co');
 const uuid = require('uuid');
 
-const TIMEOUT = process.env.ELASTICIO_TIMEOUT || 20 * 60 * 1000; // 20 minutes
+const TIMEOUT = process.env.ELASTICIO_TIMEOUT || 60 * 60 * 1000; // 60 minutes
 const AMQP_HEADER_META_PREFIX = 'x-eio-meta-';
 const AMQP_HEADER_TRACE_ID = AMQP_HEADER_META_PREFIX + 'trace-id';
 
@@ -194,7 +194,7 @@ class Sailor {
         const messageId = message.properties.headers.messageId || 'unknown';
         const parentMessageId = message.properties.headers.parentMessageId || 'unknown';
         const deliveryTag = message.fields.deliveryTag;
-        log.info({
+        log.debug({
             deliveryTag,
             messageId,
             parentMessageId,
@@ -242,7 +242,7 @@ class Sailor {
             let endWasEmitted;
 
             function onTimeout() {
-                log.info({
+                log.warn({
                     deliveryTag,
                     messageId,
                     parentMessageId,
@@ -273,7 +273,7 @@ class Sailor {
 
             function onData(data) {
                 const headers = _.clone(outgoingMessageHeaders);
-                log.info({
+                log.debug({
                     deliveryTag,
                     messageId,
                     parentMessageId,
@@ -299,7 +299,7 @@ class Sailor {
             function onHttpReply(reply) {
                 const headers = _.clone(outgoingMessageHeaders);
                 const props = createAmqpProperties(headers);
-                log.info({
+                log.debug({
                     deliveryTag,
                     messageId,
                     parentMessageId,
@@ -314,7 +314,7 @@ class Sailor {
                 const headers = _.clone(outgoingMessageHeaders);
                 err = formatError(err);
                 taskExec.errorCount++;
-                log.info({
+                log.debug({
                     deliveryTag,
                     messageId,
                     parentMessageId,
@@ -331,7 +331,7 @@ class Sailor {
             function onRebound(err) {
                 const headers = _.clone(outgoingMessageHeaders);
                 err = formatError(err);
-                log.info({
+                log.debug({
                     deliveryTag,
                     messageId,
                     parentMessageId,
@@ -371,7 +371,7 @@ class Sailor {
             }
 
             function onUpdateKeys(keys) {
-                log.info({
+                log.debug({
                     deliveryTag,
                     messageId,
                     parentMessageId,
@@ -420,7 +420,7 @@ class Sailor {
                     self.amqpConnection.ack(message);
                 }
                 self.messagesCount -= 1;
-                log.info({
+                log.debug({
                     deliveryTag,
                     messageId,
                     parentMessageId,