diff --git a/test/common.sh b/test/common.sh
index 5f4ecbea58..1ac62e2dbf 100644
--- a/test/common.sh
+++ b/test/common.sh
@@ -52,7 +52,7 @@ fi
 
 export KIND_K8S_VERSION="${KIND_K8S_VERSION:-"v1.28.0"}"
 tools_k8s_version=$(convert_to_tools_ver "${KIND_K8S_VERSION#v*}")
-kind_version=0.15.0
+kind_version=0.20.0
 goarch=amd64
 
 if [[ "$OSTYPE" == "linux-gnu" ]]; then
diff --git a/test/e2e/setup.sh b/test/e2e/setup.sh
index 15210adafc..e4797784e9 100755
--- a/test/e2e/setup.sh
+++ b/test/e2e/setup.sh
@@ -56,11 +56,11 @@ function delete_cluster {
 function test_cluster {
   local flags="$@"
 
-  docker pull memcached:1.4.36-alpine
-  kind load docker-image --name $KIND_CLUSTER memcached:1.4.36-alpine
+  docker pull memcached:1.6.23-alpine
+  kind load docker-image --name $KIND_CLUSTER memcached:1.6.23-alpine
 
-  docker pull busybox:1.28
-  kind load docker-image --name $KIND_CLUSTER busybox:1.28
+  docker pull busybox:1.36.1
+  kind load docker-image --name $KIND_CLUSTER busybox:1.36.1
 
   go test $(dirname "$0")/grafana $flags -timeout 30m
   go test $(dirname "$0")/deployimage $flags -timeout 30m
@@ -70,11 +70,12 @@ function test_cluster {
 }
 
 function build_sample_external_plugin {
-  # TODO: Dynamically set exteranl plugin destination based on OS platform
-  # EXTERNAL_PLUGIN_DESTINATION_PREFIX="${HOME}/Library/Application Support/kubebuilder/plugins"
-  # For Linux:
-  XDG_CONFIG_HOME="${HOME}/.config"
-  EXTERNAL_PLUGIN_DESTINATION_PREFIX="$XDG_CONFIG_HOME/kubebuilder/plugins"
+  if [ "$(uname -s)" == "Darwin" ]; then
+    EXTERNAL_PLUGIN_DESTINATION_PREFIX="${HOME}/Library/Application Support/kubebuilder/plugins"
+  else
+    XDG_CONFIG_HOME="${HOME}/.config"
+    EXTERNAL_PLUGIN_DESTINATION_PREFIX="$XDG_CONFIG_HOME/kubebuilder/plugins"
+  fi
 
   PLUGIN_NAME="sampleexternalplugin"
   PLUGIN_VERSION="v1"