diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 279dd8b..c830fce 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -42,6 +42,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: engineerd/setup-kind@v0.5.0
         with:
+          version: "v0.11.1"
+          image: "kindest/node:v1.21.1"
           skipClusterCreation: true
       - name: Install dependencies
         run: |
diff --git a/pipeline/buildpacks/0.1/buildpacks.yaml b/pipeline/buildpacks/0.1/buildpacks.yaml
index af91c92..faba25a 100644
--- a/pipeline/buildpacks/0.1/buildpacks.yaml
+++ b/pipeline/buildpacks/0.1/buildpacks.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/version: "0.1"
   annotations:
+    tekton.dev/categories: Image Build
     tekton.dev/pipelines.minVersion: "0.17.0"
     tekton.dev/tags: image-build
     tekton.dev/displayName: "Buildpacks"
diff --git a/scripts/platforms/1_k8s_setup.sh b/scripts/platforms/1_k8s_setup.sh
index 2553f71..720f67f 100755
--- a/scripts/platforms/1_k8s_setup.sh
+++ b/scripts/platforms/1_k8s_setup.sh
@@ -22,4 +22,22 @@ $KUBECTLCMD apply --filename https://storage.googleapis.com/tekton-releases/pipe
 
 echo "> Waiting for pods to be ready..."
 sleep 15
-$KUBECTLCMD wait --for=condition=ready -n tekton-pipelines pods --timeout=120s --all
+
+# disable error propogation
+set +e
+
+$KUBECTLCMD wait --for=condition=ready -n tekton-pipelines pods --timeout=300s --all
+wait_rc="${?}"
+
+# re-enable error propogation
+set -e
+
+if [ "${wait_rc}" -ne 0 ]; then
+    echo "Failed to start pods..."
+    echo "Current pod status: "
+    $KUBECTLCMD get -n tekton-pipelines pods
+
+    # Write an informative error message and halt the script with an `exit 1`, or
+    # perhaps let it continue onwards, depending on what you're doing.
+    exit 1
+fi