diff --git a/tests/uat/aws/eks-cluster-config.yaml.template b/tests/uat/aws/eks-cluster-config.yaml.template
index 3bb9a864b..bb1e340d6 100644
--- a/tests/uat/aws/eks-cluster-config.yaml.template
+++ b/tests/uat/aws/eks-cluster-config.yaml.template
@@ -28,7 +28,7 @@ iam:
   withOIDC: true
   serviceAccounts:
   - metadata:
-      name: janitor
+      name: janitor-provider
       namespace: nvsentinel
     attachPolicyARNs:
     - arn:aws:iam::aws:policy/AmazonEC2ReadOnlyAccess
@@ -49,7 +49,7 @@ iam:
         - sts:GetCallerIdentity
         - sts:DecodeAuthorizationMessage
         Resource: "*"
-    roleName: ${CLUSTER_NAME}-janitor
+    roleName: ${CLUSTER_NAME}-janitor-provider
     roleOnly: true
 
 addons:
diff --git a/tests/uat/aws/nvsentinel-values.yaml b/tests/uat/aws/nvsentinel-values.yaml
index 7dc405677..f900e7447 100644
--- a/tests/uat/aws/nvsentinel-values.yaml
+++ b/tests/uat/aws/nvsentinel-values.yaml
@@ -31,6 +31,8 @@ global:
     enabled: true
   janitor:
     enabled: true
+  janitorProvider:
+    enabled: true
   mongodbStore:
     enabled: true
   
@@ -74,7 +76,7 @@ csp-health-monitor:
 kubernetes-object-monitor:
   logLevel: debug
 
-janitor:
+janitor-provider:
   csp:
     provider: aws
     aws:
diff --git a/tests/uat/gcp/nvsentinel-values.yaml b/tests/uat/gcp/nvsentinel-values.yaml
index 94a1f8c6b..cea02d8fc 100644
--- a/tests/uat/gcp/nvsentinel-values.yaml
+++ b/tests/uat/gcp/nvsentinel-values.yaml
@@ -31,6 +31,8 @@ global:
     enabled: true
   janitor:
     enabled: true
+  janitorProvider:
+    enabled: true
   mongodbStore:
     enabled: true
   
@@ -80,7 +82,7 @@ csp-health-monitor:
 kubernetes-object-monitor:
   logLevel: debug
 
-janitor:
+janitor-provider:
   csp:
     provider: gcp
 
diff --git a/tests/uat/install-apps.sh b/tests/uat/install-apps.sh
index 92bd4590d..b199a7e33 100755
--- a/tests/uat/install-apps.sh
+++ b/tests/uat/install-apps.sh
@@ -280,18 +280,18 @@ install_nvsentinel() {
         local aws_account_id
         aws_account_id=$(aws sts get-caller-identity --query Account --output text)
         
-        local janitor_role_name="${CLUSTER_NAME}-janitor"
+        local janitor_provider_role_name="${CLUSTER_NAME}-janitor-provider"
         
         extra_set_args+=(
-            "--set" "janitor.csp.aws.region=$AWS_REGION"
-            "--set" "janitor.csp.aws.accountId=$aws_account_id"
-            "--set" "janitor.csp.aws.iamRoleName=$janitor_role_name"
+            "--set" "janitor-provider.csp.aws.region=$AWS_REGION"
+            "--set" "janitor-provider.csp.aws.accountId=$aws_account_id"
+            "--set" "janitor-provider.csp.aws.iamRoleName=$janitor_provider_role_name"
         )
     elif [[ "$CSP" == "gcp" ]]; then
         extra_set_args+=(
-            "--set" "janitor.csp.gcp.project=$GCP_PROJECT_ID"
-            "--set" "janitor.csp.gcp.zone=$GCP_ZONE"
-            "--set" "janitor.csp.gcp.serviceAccount=$GCP_SERVICE_ACCOUNT"
+            "--set" "janitor-provider.csp.gcp.project=$GCP_PROJECT_ID"
+            "--set" "janitor-provider.csp.gcp.zone=$GCP_ZONE"
+            "--set" "janitor-provider.csp.gcp.serviceAccount=$GCP_SERVICE_ACCOUNT"
         )
     else
         log "Janitor extra args not defined for: $CSP"
diff --git a/tests/uat/kind/nvsentinel-values.yaml b/tests/uat/kind/nvsentinel-values.yaml
index f2f11888d..8730401ec 100644
--- a/tests/uat/kind/nvsentinel-values.yaml
+++ b/tests/uat/kind/nvsentinel-values.yaml
@@ -31,6 +31,8 @@ global:
     enabled: true
   janitor:
     enabled: true
+  janitorProvider:
+    enabled: true
   mongodbStore:
     enabled: true
   
@@ -83,7 +85,7 @@ csp-health-monitor:
 kubernetes-object-monitor:
   logLevel: debug
 
-janitor:
+janitor-provider:
   csp:
     provider: kind