diff --git a/sbin/run_integration_test.sh b/sbin/run_integration_test.sh
index 367d96f7f418755d0f28a645fb4167b233dbb7cb..57e4fff1458ead7733250ad130da5ff1602a1bdb 100755
--- a/sbin/run_integration_test.sh
+++ b/sbin/run_integration_test.sh
@@ -32,7 +32,8 @@ function integration_test {
     echo "make restart ${restarts[@]} ..."
     make restart "${restarts[@]}"
   fi
-  sleep 10
+  #TODO(L2SS-988): Use healthcheck to wait for containers to become ready
+  sleep 30
   echo "make integration ${1} ..."
   make integration "${1}"
 }
@@ -105,6 +106,7 @@ integration_test dummy
 make start elk
 
 # Give elk time to start
+# TODO(L2SS-988): Use a nicer more reliable mechanism
 sleep 10
 
 # Update the dsconfig
@@ -128,7 +130,7 @@ make start $DEVICES
 make start archiver-timescale
 
 # Give devices time to restart
-# TODO(Corne Lukken): Use a nicer more reliable mechanism
+# TODO(L2SS-988): Use a nicer more reliable mechanism
 sleep 70
 
 # Give archiver-timescale time to start