diff --git a/tasks/cockpit-tasks-webhook.yaml b/tasks/cockpit-tasks-webhook.yaml
index 1008d0f1..b18d5a24 100644
--- a/tasks/cockpit-tasks-webhook.yaml
+++ b/tasks/cockpit-tasks-webhook.yaml
@@ -39,7 +39,7 @@ spec:
           ports:
             - containerPort: 8080
               protocol: TCP
-          command: [ "sh", "-ec", "sleep 10; exec webhook" ]
+          command: [ "webhook" ]
           volumeMounts:
           - name: webhook-secrets
             mountPath: /run/secrets/webhook
diff --git a/tasks/container/webhook b/tasks/container/webhook
index 5490c774..f879c0bd 100755
--- a/tasks/container/webhook
+++ b/tasks/container/webhook
@@ -88,7 +88,7 @@ def scan_tasks():
         try:
             with distributed_queue(AMQP_SERVER):
                 break
-        except pika.exceptions.AMQPError as e:
+        except (OSError, pika.exceptions.AMQPError) as e:
             logging.info("Failed to connect to AMQP, attempt #%i: %s", retry, e)
             time.sleep(5)