diff --git a/charts/gha-runner-scale-set-dev/tests/autoscaling_runner_set_test.go b/charts/gha-runner-scale-set-dev/tests/autoscaling_runner_set_test.go
deleted file mode 100644
index 943d1939..00000000
--- a/charts/gha-runner-scale-set-dev/tests/autoscaling_runner_set_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package tests
-
-import (
-	"testing"
-
-	"github.com/gruntwork-io/terratest/modules/helm"
-	"github.com/gruntwork-io/terratest/modules/logger"
-)
-
-func TestAutoscalingRunnerSetLabels(t *testing.T) {
-	t.Parallel()
-
-	t.Run("should set default labels", func(t *testing.T) {
-		t.Parallel()
-
-		options := &helm.Options{
-			Logger: logger.Discard,
-		}
-	})
-}
diff --git a/charts/gha-runner-scale-set-dev/tests/autoscaling_runner_set_test.yaml b/charts/gha-runner-scale-set-dev/tests/autoscaling_runner_set_test.yaml
index e5ce211e..3d9c5ded 100644
--- a/charts/gha-runner-scale-set-dev/tests/autoscaling_runner_set_test.yaml
+++ b/charts/gha-runner-scale-set-dev/tests/autoscaling_runner_set_test.yaml
@@ -6,4 +6,13 @@ tests:
     set:
       scaleset.name: "test"
       auth.url: "https://github.com/org"
-      auth.githubToken: "gh_"
+      auth.githubToken: "gh_token12345"
+      controllerServiceAccount.name: "arc"
+      controllerServiceAccount.namespace: "arc-system"
+    release:
+      name: "test-name"
+      namespace: "test-namespace"
+    asserts:
+      - equal:
+          path: metadata.labels["app.kubernetes.io/name"]
+          value: "test-name"
diff --git a/charts/gha-runner-scale-set-dev/tests/tests_test.go b/charts/gha-runner-scale-set-dev/tests/tests_test.go
deleted file mode 100644
index 3aa2ce18..00000000
--- a/charts/gha-runner-scale-set-dev/tests/tests_test.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package tests
-
-import (
-	"path/filepath"
-	"strings"
-
-	"github.com/gruntwork-io/terratest/modules/random"
-)
-
-var chartPath string
-
-func init() {
-	var err error
-	chartPath, err = filepath.Abs("../../gha-runner-scale-set-dev")
-	if err != nil {
-		panic(err)
-	}
-}
-
-// generateNamespace generates namespace with given prefix
-// If prefix is not specified, a default prefix "test-" is used
-func generateNamespace(prefix string) string {
-	if prefix == "" {
-		prefix = "test-"
-	}
-	return prefix + strings.ToLower(random.UniqueId())
-}
diff --git a/charts/gha-runner-scale-set-dev/values.yaml b/charts/gha-runner-scale-set-dev/values.yaml
index 8c6db8e2..a501c7c7 100644
--- a/charts/gha-runner-scale-set-dev/values.yaml
+++ b/charts/gha-runner-scale-set-dev/values.yaml
@@ -140,28 +140,10 @@ runner:
 #       key: ca.crt
 #   runnerMountPath: /usr/local/share/ca-certificates/
 
-## keyVault object if applied switches from the kubernetes secrets to the vault provider defined in `keyVault.type`
-## Secret name is used to resolve the secret inside the vault
-# keyVault:
-# Available values: "azure_key_vault"
-# type: ""
-# Configuration related to azure key vault
-# azure_key_vault:
-#   url: ""
-#   client_id: ""
-#   tenant_id: ""
-#   certificate_path: ""
-# proxy:
-#   http:
-#     url: http://proxy.com:1234
-#     credentialSecretRef: proxy-auth # a secret with `username` and `password` keys
-#   https:
-#     url: http://proxy.com:1234
-#     credentialSecretRef: proxy-auth # a secret with `username` and `password` keys
-#   noProxy:
-#     - example.com
-#     - example.org
-
+## controllerServiceAccount is the service account of the controller
+controllerServiceAccount:
+  namespace: ""
+  name: ""
 ## listenerMetrics are configurable metrics applied to the listener.
 ## In order to avoid helm merging these fields, we left the metrics commented out.
 ## When configuring metrics, please uncomment the listenerMetrics object below.