diff --git a/.github/workflows/action-test-k3s.yml b/.github/workflows/action-test-k3s.yml
index 595a27063..9d067f9da 100644
--- a/.github/workflows/action-test-k3s.yml
+++ b/.github/workflows/action-test-k3s.yml
@@ -37,7 +37,7 @@ jobs:
           name: test-img
           path: dist
       - name: run
-        timeout-minutes: 5
+        timeout-minutes: 15
         run: make test/k3s-${{ inputs.runtime }}
       # only runs when the previous step fails
       - name: inspect failed pods
diff --git a/.github/workflows/action-test-kind.yml b/.github/workflows/action-test-kind.yml
index db18e70fd..45cac9582 100644
--- a/.github/workflows/action-test-kind.yml
+++ b/.github/workflows/action-test-kind.yml
@@ -43,7 +43,7 @@ jobs:
           name: test-${{ inputs.image }}
           path: dist
       - name: run
-        timeout-minutes: 7
+        timeout-minutes: 21
         run: ${{ inputs.test-command }}
       # only runs when the previous step fails
       - name: inspect failed pods
diff --git a/Makefile b/Makefile
index 5b4f6ae37..45c241b73 100644
--- a/Makefile
+++ b/Makefile
@@ -244,39 +244,39 @@ test/k8s/cluster-%: dist/img.tar bin/kind test/k8s/_out/img-%
 .PHONY: test/k8s/deploy-workload-%
 test/k8s/deploy-workload-%: test/k8s/clean test/k8s/cluster-% 
 	kubectl --context=kind-$(KIND_CLUSTER_NAME) apply -f test/k8s/deploy.yaml
-	kubectl --context=kind-$(KIND_CLUSTER_NAME) wait deployment wasi-demo --for condition=Available=True --timeout=90s
+	kubectl --context=kind-$(KIND_CLUSTER_NAME) wait deployment wasi-demo --for condition=Available=True --timeout=270s
 	# verify that we are still running after some time	
 	sleep 5s
-	kubectl --context=kind-$(KIND_CLUSTER_NAME) wait deployment wasi-demo --for condition=Available=True --timeout=5s
+	kubectl --context=kind-$(KIND_CLUSTER_NAME) wait deployment wasi-demo --for condition=Available=True --timeout=15s
 
 .PHONY: test/k8s/deploy-workload-oci-%
 test/k8s/deploy-workload-oci-%: test/k8s/clean test/k8s/cluster-% dist/img-oci.tar dist/img-oci-artifact.tar test/k8s/cluster-%
 	bin/kind load image-archive --name $(KIND_CLUSTER_NAME) dist/img-oci.tar
 	bin/kind load image-archive --name $(KIND_CLUSTER_NAME) dist/img-oci-artifact.tar
 	kubectl --context=kind-$(KIND_CLUSTER_NAME) apply -f test/k8s/deploy.oci.yaml
-	kubectl --context=kind-$(KIND_CLUSTER_NAME) wait deployment wasi-demo --for condition=Available=True --timeout=90s
+	kubectl --context=kind-$(KIND_CLUSTER_NAME) wait deployment wasi-demo --for condition=Available=True --timeout=270s
 	# verify that we are still running after some time
 	sleep 5s
-	kubectl --context=kind-$(KIND_CLUSTER_NAME) wait deployment wasi-demo --for condition=Available=True --timeout=5s
+	kubectl --context=kind-$(KIND_CLUSTER_NAME) wait deployment wasi-demo --for condition=Available=True --timeout=15s
 	@if [ "$*" = "wasmtime" ]; then \
 		set -e; \
 		echo "checking for pre-compiled labels and ensuring can scale after pre-compile"; \
 		docker exec $(KIND_CLUSTER_NAME)-control-plane ctr -n k8s.io content ls | grep "runwasi.io/precompiled"; \
 		kubectl --context=kind-$(KIND_CLUSTER_NAME) scale deployment wasi-demo --replicas=4; \
-		kubectl --context=kind-$(KIND_CLUSTER_NAME) wait deployment wasi-demo --for condition=Available=True --timeout=5s; \
+		kubectl --context=kind-$(KIND_CLUSTER_NAME) wait deployment wasi-demo --for condition=Available=True --timeout=15s; \
 	fi
 
 .PHONY: test/k8s-%
 test/k8s-%: test/k8s/deploy-workload-%
 	# verify that we are able to delete the deployment
 	kubectl --context=kind-$(KIND_CLUSTER_NAME) delete -f test/k8s/deploy.yaml
-	kubectl --context=kind-$(KIND_CLUSTER_NAME) wait deployment wasi-demo --for delete --timeout=60s
+	kubectl --context=kind-$(KIND_CLUSTER_NAME) wait deployment wasi-demo --for delete --timeout=180s
 
 .PHONY: test/k8s-oci-%
 test/k8s-oci-%: test/k8s/deploy-workload-oci-%
 	# verify that we are able to delete the deployment
 	kubectl --context=kind-$(KIND_CLUSTER_NAME) delete -f test/k8s/deploy.oci.yaml
-	kubectl --context=kind-$(KIND_CLUSTER_NAME) wait deployment wasi-demo --for delete --timeout=60s
+	kubectl --context=kind-$(KIND_CLUSTER_NAME) wait deployment wasi-demo --for delete --timeout=180s
 
 .PHONY: test/k8s/clean
 test/k8s/clean: bin/kind
@@ -297,13 +297,13 @@ test/k3s-%: dist/img.tar bin/k3s dist-%
 	sudo bin/k3s kubectl get pods --all-namespaces
 	sudo bin/k3s kubectl apply -f test/k8s/deploy.yaml
 	sudo bin/k3s kubectl get pods --all-namespaces
-	sudo bin/k3s kubectl wait deployment wasi-demo --for condition=Available=True --timeout=120s
+	sudo bin/k3s kubectl wait deployment wasi-demo --for condition=Available=True --timeout=360s
 	# verify that we are still running after some time	
 	sleep 5s
-	sudo bin/k3s kubectl wait deployment wasi-demo --for condition=Available=True --timeout=5s
+	sudo bin/k3s kubectl wait deployment wasi-demo --for condition=Available=True --timeout=15s
 	sudo bin/k3s kubectl get pods -o wide
 	sudo bin/k3s kubectl delete -f test/k8s/deploy.yaml
-	sudo bin/k3s kubectl wait deployment wasi-demo --for delete --timeout=60s
+	sudo bin/k3s kubectl wait deployment wasi-demo --for delete --timeout=180s
 
 .PHONY: test/k3s-oci-%
 test/k3s-oci-%: dist/img-oci.tar bin/k3s dist-%
@@ -311,20 +311,20 @@ test/k3s-oci-%: dist/img-oci.tar bin/k3s dist-%
 	sudo bin/k3s kubectl get pods --all-namespaces
 	sudo bin/k3s kubectl apply -f test/k8s/deploy.oci.yaml
 	sudo bin/k3s kubectl get pods --all-namespaces
-	sudo bin/k3s kubectl wait deployment wasi-demo --for condition=Available=True --timeout=120s
+	sudo bin/k3s kubectl wait deployment wasi-demo --for condition=Available=True --timeout=360s
 	# verify that we are still running after some time	
 	sleep 5s
-	sudo bin/k3s kubectl wait deployment wasi-demo --for condition=Available=True --timeout=5s
+	sudo bin/k3s kubectl wait deployment wasi-demo --for condition=Available=True --timeout=15s
 	sudo bin/k3s kubectl get pods -o wide
 	@if [ "$*" = "wasmtime" ]; then \
 		set -e; \
 		echo "checking for pre-compiled labels and ensuring can scale"; \
 		sudo bin/k3s ctr -n k8s.io content ls | grep "runwasi.io/precompiled"; \
 		sudo bin/k3s kubectl scale deployment wasi-demo --replicas=4; \
-		sudo bin/k3s kubectl wait deployment wasi-demo --for condition=Available=True --timeout=5s; \
+		sudo bin/k3s kubectl wait deployment wasi-demo --for condition=Available=True --timeout=15s; \
 	fi
 	sudo bin/k3s kubectl delete -f test/k8s/deploy.oci.yaml
-	sudo bin/k3s kubectl wait deployment wasi-demo --for delete --timeout=60s
+	sudo bin/k3s kubectl wait deployment wasi-demo --for delete --timeout=180s
 
 .PHONY: test/k3s/clean
 test/k3s/clean: bin/k3s/clean;