diff --git a/tasks/util/registry.py b/tasks/util/registry.py
index c87d6e78..7ecd4fda 100644
--- a/tasks/util/registry.py
+++ b/tasks/util/registry.py
@@ -1,6 +1,7 @@
 from os import makedirs
 from os.path import exists, join
 from subprocess import CalledProcessError, run
+from tasks.util.containerd import wait_for_containerd_socket
 from tasks.util.docker import is_ctr_running
 from tasks.util.env import (
     CONF_FILES_DIR,
@@ -39,6 +40,8 @@ def start(debug=False, clean=False):
     # Docker Registry Config
     # ----------
 
+    wait_for_containerd_socket()
+
     if clean and is_ctr_running(REGISTRY_CTR_NAME):
         if debug:
             print(f"WARNING: stopping registry container: {REGISTRY_CTR_NAME}")
diff --git a/tests/knative_chaining_guest_pull.bats b/tests/knative_chaining_guest_pull.bats
index d7486ac5..82e774b5 100644
--- a/tests/knative_chaining_guest_pull.bats
+++ b/tests/knative_chaining_guest_pull.bats
@@ -12,7 +12,7 @@ setup() {
     load utils/helpers.sh
 
     # Longer timeout for chaining tests
-    export SC2_TEST_TIMEOUT=180
+    export SC2_TEST_TIMEOUT=240
 }
 
 teardown() {