diff --git a/Makefile b/Makefile
index f6fc6be..839bf5d 100644
--- a/Makefile
+++ b/Makefile
@@ -131,6 +131,8 @@ test-redis-shutdown:
 test-redis-clear:
 	@rm -rf "/tmp/redis_test_santiago*"
 
+docker-rebuild: cross docker-worker-build docker-build
+
 docker-build:
 	@docker build -t santiago .
 
diff --git a/metadata/version.go b/metadata/version.go
index 6cb7201..27bfb76 100644
--- a/metadata/version.go
+++ b/metadata/version.go
@@ -7,4 +7,4 @@
 package metadata
 
 //VERSION identifies current version of the application
-var VERSION = "1.0.0"
+var VERSION = "1.0.1"
diff --git a/worker/handler/core.go b/worker/handler/core.go
index 6ceb059..46a5305 100644
--- a/worker/handler/core.go
+++ b/worker/handler/core.go
@@ -316,7 +316,7 @@ func (w *Worker) ProcessSubscription() error {
 	res, err := w.Client.LPop(w.Queue).Result()
 	if err != nil {
 		if err.Error() == "redis: nil" {
-			l.Info("No hooks to be processed.")
+			l.Debug("No hooks to be processed.")
 			return nil
 		}
 		l.Error("Worker failed to consume message from queue.", zap.Error(err))
@@ -348,18 +348,21 @@ func (w *Worker) Start() {
 	)
 
 	for {
-		raven.CapturePanic(func() {
-			l.Info("Subscribing to next message...")
-			err := w.ProcessSubscription()
-			if err != nil {
-				l.Warn("Failed to retrieve messages from queue.", zap.Error(err))
-				tags := map[string]string{
-					"queue":       w.Queue,
-					"maxAttempts": string(w.MaxAttempts),
+		l.Info("Subscribing to next message...")
+
+		for i := 0; i < 50; i++ {
+			raven.CapturePanic(func() {
+				err := w.ProcessSubscription()
+				if err != nil {
+					l.Warn("Failed to retrieve messages from queue.", zap.Error(err))
+					tags := map[string]string{
+						"queue":       w.Queue,
+						"maxAttempts": string(w.MaxAttempts),
+					}
+					raven.CaptureError(err, tags)
 				}
-				raven.CaptureError(err, tags)
-			}
-			time.Sleep(100 * time.Millisecond)
-		}, nil)
+				time.Sleep(50 * time.Millisecond)
+			}, nil)
+		}
 	}
 }