diff --git a/test/canary/scripts/install_controller_helm.sh b/test/canary/scripts/install_controller_helm.sh
index 9b1363a3..83f0016a 100755
--- a/test/canary/scripts/install_controller_helm.sh
+++ b/test/canary/scripts/install_controller_helm.sh
@@ -13,5 +13,6 @@ function install_helm_chart() {
     yq w -i helm/values.yaml "aws.region" $region
 
     kubectl create namespace $namespace
-    helm install -n $namespace ack-$service-controller helm
+    kubectl apply -f helm/crds
+    helm install -n $namespace ack-$service-controller --skip-crds helm
 }
\ No newline at end of file
diff --git a/test/canary/scripts/run_test.sh b/test/canary/scripts/run_test.sh
index 4546650f..9771e711 100755
--- a/test/canary/scripts/run_test.sh
+++ b/test/canary/scripts/run_test.sh
@@ -47,6 +47,9 @@ function cleanup {
   print_controller_logs
 
   helm delete -n $NAMESPACE ack-$SERVICE-controller
+  pushd $SERVICE_REPO_PATH
+    kubectl delete -f helm/crds
+  popd
   kubectl delete namespace $NAMESPACE
 
   cd $E2E_DIR
diff --git a/test/canary/scripts/setup_oidc.sh b/test/canary/scripts/setup_oidc.sh
index 691d8d75..fd0ff429 100755
--- a/test/canary/scripts/setup_oidc.sh
+++ b/test/canary/scripts/setup_oidc.sh
@@ -4,8 +4,8 @@
 # A function to get the OIDC_ID associated with an EKS cluster
 function get_oidc_id() {
   local cluster_name="$1"
-  local region = "$2"
-  eksctl utils associate-iam-oidc-provider --cluster $cluster_name --region $region --approve
+  local region="$2"
+  eksctl utils associate-iam-oidc-provider --cluster $cluster_name --region $region --approve > /dev/null
   local oidc_url=$(aws eks describe-cluster --region $region --name $cluster_name  --query "cluster.identity.oidc.issuer" --output text | cut -c9-)
   echo "${oidc_url}"
 }