diff --git a/.github/workflows/push_pr.yaml b/.github/workflows/push_pr.yaml
index af01f262..10922c53 100644
--- a/.github/workflows/push_pr.yaml
+++ b/.github/workflows/push_pr.yaml
@@ -113,6 +113,7 @@ jobs:
           kubectl port-forward svc/controller 8889:80 -nfission &
 
       - name: Get fission version
+        timeout-minutes: 10
         run: |
           fission version
 
@@ -127,11 +128,13 @@ jobs:
           command -v fission && fission support dump
 
       - name: Kind export logs
+        timeout-minutes: 10
         if: ${{ always() }}
         run: |
           kind export logs --name kind kind-logs
 
       - name: Archive fission dump
+        timeout-minutes: 10
         if: ${{ failure() || cancelled() }}
         uses: actions/upload-artifact@v3
         with:
@@ -140,6 +143,7 @@ jobs:
           retention-days: 5
 
       - name: Archive kind logs
+        timeout-minutes: 10
         if: ${{ always() }}
         uses: actions/upload-artifact@v3
         with:
diff --git a/test/kind_CI.sh b/test/kind_CI.sh
index 798159dd..418714d7 100755
--- a/test/kind_CI.sh
+++ b/test/kind_CI.sh
@@ -15,6 +15,7 @@ echo "source test_utils done"
 dump_system_info
 
 export FUNCTION_NAMESPACE=fission-function
+export BUILDER_NAMESPACE=fission-builder
 export FISSION_NAMESPACE=fission
 export FISSION_ROUTER=127.0.0.1:8888
 export NODE_RUNTIME_IMAGE=fission/node-env-14
diff --git a/test/tests/test_annotations.sh b/test/tests/test_annotations.sh
index b717a4c8..ebcd7785 100755
--- a/test/tests/test_annotations.sh
+++ b/test/tests/test_annotations.sh
@@ -14,7 +14,7 @@ mkdir -p $tmp_dir
 ENV=python-${TEST_ID}
 RESOURCE_NS=default # Change to test-specific namespace once we support namespaced CRDs
 FUNCTION_NS=${FUNCTION_NAMESPACE:-fission-function}
-BUILDER_NS=fission-builder
+BUILDER_NS=${BUILDER_NAMESPACE:-fission-builder}
 LIST_ANNOTATIONS=go-template='{{range $key,$value := .metadata.annotations}}{{$key}}: {{$value}}{{"\n"}}{{end}}'
 
 # fs
diff --git a/test/tests/test_env_vars.sh b/test/tests/test_env_vars.sh
index 1d338b81..ff415e22 100755
--- a/test/tests/test_env_vars.sh
+++ b/test/tests/test_env_vars.sh
@@ -16,7 +16,7 @@ ENV=python-${TEST_ID}
 FN=foo-${TEST_ID}
 RESOURCE_NS=default # Change to test-specific namespace once we support namespaced CRDs
 FUNCTION_NS=${FUNCTION_NAMESPACE:-fission-function}
-BUILDER_NS=fission-builder
+BUILDER_NS=${BUILDER_NAMESPACE:-fission-builder}
 
 # fs
 ENV_SPEC_FILE=${tmp_dir}/${ENV}.yaml
diff --git a/test/utils.sh b/test/utils.sh
index 3139eeeb..1dab4a10 100755
--- a/test/utils.sh
+++ b/test/utils.sh
@@ -161,7 +161,7 @@ wait_for_builder() {
     # wait for tiller ready
     set +e
     while true; do
-      kubectl --namespace fission-builder get pod -l envName=$env -o jsonpath="$JSONPATH" | grep "Ready=True"
+      kubectl --namespace $BUILDER_NAMESPACE get pod -l envName=$env -o jsonpath="$JSONPATH" | grep "Ready=True"
       if [[ $? -eq 0 ]]; then
           break
       fi