diff --git a/src/ambianic/pipeline/avsource/av_element.py b/src/ambianic/pipeline/avsource/av_element.py
index c88d8e26..0916d383 100755
--- a/src/ambianic/pipeline/avsource/av_element.py
+++ b/src/ambianic/pipeline/avsource/av_element.py
@@ -113,7 +113,7 @@ def _stop_gst_service(self):
             # the gst process from stopping
             self._clear_gst_out_queue()
             # give it a few seconds to stop cleanly
-            for i in range(3):
+            for i in range(10):
                 time.sleep(1)
                 if not gst_proc.is_alive():
                     break
@@ -124,7 +124,7 @@ def _stop_gst_service(self):
                 # do not call join() because it may cause a deadlock
                 # due to the shared queue
                 # give it a few seconds to terminate cleanly
-                for i in range(3):
+                for i in range(10):
                     time.sleep(1)
                     if not gst_proc.is_alive():
                         break
diff --git a/src/ambianic/pipeline/interpreter.py b/src/ambianic/pipeline/interpreter.py
index 3a6bbdca..d2338255 100755
--- a/src/ambianic/pipeline/interpreter.py
+++ b/src/ambianic/pipeline/interpreter.py
@@ -61,7 +61,7 @@ def healthcheck(self):
                     # more than a reasonable amount of time has passed
                     # since the pipeline reported a heartbeat.
                     # Let's recycle it
-                elif lapse > 10:
+                elif lapse > 20:
                     log.warning('Pipeline "%s" is not responsive. '
                                 'Latest heartbeat was %f seconds ago. '
                                 'Will attempt to heal it.', p.name, lapse)