diff --git a/scripts/ibmcloud-login.sh b/scripts/ibmcloud-login.sh
index 8c91f97..34c45d3 100755
--- a/scripts/ibmcloud-login.sh
+++ b/scripts/ibmcloud-login.sh
@@ -8,4 +8,6 @@ if [[ -z "${APIKEY}" ]]; then
   exit 1
 fi
 
+ibmcloud config --check-version=false
+
 ibmcloud login -r "${REGION}" -g "${RESOURCE_GROUP}" --apikey "${APIKEY}"
diff --git a/test/stages/stage-logdna-bind.tf b/test/stages/stage-logdna-bind.tf
index 1f777b8..8b52e5e 100644
--- a/test/stages/stage-logdna-bind.tf
+++ b/test/stages/stage-logdna-bind.tf
@@ -7,6 +7,6 @@ module "logdna-bind" {
   cluster_id               = module.dev_cluster.id
   cluster_name             = module.dev_cluster.name
   cluster_config_file_path = module.dev_cluster.config_file_path
-  tools_namespace          = module.dev_capture_state.namespace
+  tools_namespace          = module.dev_tools_namespace.name
   name                     = module.logdna.name
 }
diff --git a/test/stages/stage1b-capture-state.tf b/test/stages/stage1b-capture-state.tf
deleted file mode 100644
index bafa7b3..0000000
--- a/test/stages/stage1b-capture-state.tf
+++ /dev/null
@@ -1,8 +0,0 @@
-module "dev_capture_state" {
-  source = "github.com/ibm-garage-cloud/terraform-k8s-capture-state"
-
-  cluster_type             = "ocp4"
-  cluster_config_file_path = module.dev_cluster.config_file_path
-  namespace                = module.dev_tools_namespace.name
-  output_path              = "${path.cwd}/cluster-state/before"
-}