diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index dfb3ef5..c1c7a08 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -13,7 +13,7 @@ jobs:
   verify:
     if: ${{ !contains( github.event.pull_request.labels.*.name, 'skip ci' ) }}
     runs-on: ubuntu-latest
-    container: quay.io/ibmgaragecloud/cli-tools:v0.15
+    container: quay.io/ibmgaragecloud/cli-tools:v1.1-v1.8.4
 
     strategy:
       matrix:
diff --git a/chart/sonarqube/Chart.lock b/chart/sonarqube/Chart.lock
index 99e59eb..b816f40 100644
--- a/chart/sonarqube/Chart.lock
+++ b/chart/sonarqube/Chart.lock
@@ -6,8 +6,8 @@ dependencies:
   repository: https://charts.cloudnativetoolkit.dev
   version: 0.6.0
 - name: sonarqube
-  repository: https://oteemo.github.io/charts
-  version: 6.6.0
+  repository: https://SonarSource.github.io/helm-chart-sonarqube
+  version: 2025.3.0
 - name: ocp-route
   repository: https://charts.cloudnativetoolkit.dev
   version: 0.5.0
@@ -17,5 +17,5 @@ dependencies:
 - name: setup-job
   repository: https://charts.cloudnativetoolkit.dev
   version: 0.3.0
-digest: sha256:c979be3c4b11b954105666fe0b3d9da6f3cb02bfbd885f3c861a86a14be3615e
-generated: "2021-11-10T00:30:14.683721-06:00"
+digest: sha256:79bf929da92ded6f574dc41889dd1503ddebacf84a38a922141e8afd2ad9c98a
+generated: "2025-06-04T23:34:58.981132-05:00"
diff --git a/chart/sonarqube/Chart.yaml b/chart/sonarqube/Chart.yaml
index fe2f788..8cc71d4 100644
--- a/chart/sonarqube/Chart.yaml
+++ b/chart/sonarqube/Chart.yaml
@@ -29,8 +29,8 @@ dependencies:
     repository: https://charts.cloudnativetoolkit.dev
     alias: config-service-account
   - name: sonarqube
-    version: 6.6.0
-    repository: https://oteemo.github.io/charts
+    version: 2025.3.0
+    repository: https://SonarSource.github.io/helm-chart-sonarqube
   - name: ocp-route
     version: 0.5.0
     repository: https://charts.cloudnativetoolkit.dev
diff --git a/chart/sonarqube/charts/sonarqube-2025.3.0.tgz b/chart/sonarqube/charts/sonarqube-2025.3.0.tgz
new file mode 100644
index 0000000..a1ee137
Binary files /dev/null and b/chart/sonarqube/charts/sonarqube-2025.3.0.tgz differ
diff --git a/chart/sonarqube/charts/sonarqube-6.6.0.tgz b/chart/sonarqube/charts/sonarqube-6.6.0.tgz
deleted file mode 100644
index a8db9f9..0000000
Binary files a/chart/sonarqube/charts/sonarqube-6.6.0.tgz and /dev/null differ
diff --git a/main.tf b/main.tf
index d9f3d8a..1a6db36 100644
--- a/main.tf
+++ b/main.tf
@@ -120,9 +120,7 @@ locals {
   }
 }
 
-module "setup_clis" {
-  source = "github.com/cloud-native-toolkit/terraform-util-clis.git"
-
+data clis_check clis {
   clis = ["helm"]
 }
 
@@ -161,7 +159,7 @@ resource "null_resource" "print-chart" {
   }
 
   provisioner "local-exec" {
-    command = "${module.setup_clis.bin_dir}/helm template sonarqube ${local.chart_dir} -n ${var.releases_namespace}"
+    command = "${data.clis_check.clis.bin_dir}/helm template sonarqube ${local.chart_dir} -n ${var.releases_namespace}"
   }
 }
 
@@ -170,7 +168,7 @@ resource "null_resource" "sonarqube_helm" {
   count      = var.mode != "setup" ? 1 : 0
 
   triggers = {
-    bin_dir    = module.setup_clis.bin_dir
+    bin_dir    = data.clis_check.clis.bin_dir
     namespace  = var.releases_namespace
     kubeconfig = var.cluster_config_file
     name       = "sonarqube"
diff --git a/test/stages/stage1-cluster.tf b/test/stages/stage1-cluster.tf
index d7c7a5f..49d76f6 100644
--- a/test/stages/stage1-cluster.tf
+++ b/test/stages/stage1-cluster.tf
@@ -1,15 +1,8 @@
 module "dev_cluster" {
-  source = "github.com/cloud-native-toolkit/terraform-ibm-ocp-vpc.git"
+  source = "github.com/cloud-native-toolkit/terraform-ibm-cluster-login.git"
 
-  resource_group_name     = var.resource_group_name
-  region                  = var.region
-  ibmcloud_api_key        = var.ibmcloud_api_key
-  name                    = var.cluster_name
-  worker_count            = 2
-  name_prefix             = var.name_prefix
-  exists                  = true
-  cos_id                  = ""
-  vpc_subnet_count        = 1
-  vpc_name                = ""
-  vpc_subnets             = []
+  resource_group_name = var.resource_group_name
+  region = var.region
+  name = var.cluster_name
+  name_prefix = var.name_prefix
 }
diff --git a/test/stages/variables.tf b/test/stages/variables.tf
index 6d35ad5..d0384e4 100644
--- a/test/stages/variables.tf
+++ b/test/stages/variables.tf
@@ -29,6 +29,7 @@ variable "cluster_name" {
 variable "cluster_type" {
   type        = string
   description = "The type of cluster that should be created (openshift or kubernetes)"
+  default     = "ocp4"
 }
 
 variable "cluster_exists" {
diff --git a/versions.tf b/versions.tf
index d9b6f79..9adc25c 100644
--- a/versions.tf
+++ b/versions.tf
@@ -1,3 +1,9 @@
 terraform {
   required_version = ">= 0.12"
+
+  required_providers {
+    clis = {
+      source = "cloud-native-toolkit/clis"
+    }
+  }
 }