diff --git a/plugins/scheduler-k3s/templates/chart/cron-job.yaml b/plugins/scheduler-k3s/templates/chart/cron-job.yaml
index 412e57916..1a04c31d2 100644
--- a/plugins/scheduler-k3s/templates/chart/cron-job.yaml
+++ b/plugins/scheduler-k3s/templates/chart/cron-job.yaml
@@ -1,5 +1,8 @@
-{{- $processName := "CRON_ID" }}
-{{- $config := index .Values.processes "CRON_ID" }}
+{{- $processName, $config := range .Values.processes }}
+# Only process cron jobs
+{{- if not (and (hasKey $config "cron") (hasKey $config.cron "id")) }}
+{{- continue }}
+{{- end }}
 ---
 apiVersion: batch/v1
 kind: CronJob
@@ -113,3 +116,4 @@ spec:
   successfulJobsHistoryLimit: 10
   suspend: false
   timeZone: Etc/UTC
+{{- end }}
diff --git a/plugins/scheduler-k3s/templates/chart/keda-secret.yaml b/plugins/scheduler-k3s/templates/chart/keda-secret.yaml
index 3e40bcc62..83177b2c8 100644
--- a/plugins/scheduler-k3s/templates/chart/keda-secret.yaml
+++ b/plugins/scheduler-k3s/templates/chart/keda-secret.yaml
@@ -1,5 +1,5 @@
 {{- if .Capabilities.APIVersions.Has "keda.sh/v1alpha1" -}}
-{{- $config := index .Values.global.keda.authentications "AUTH_NAME" }}
+{{- $authName, $config := range .Values.global.keda.authentications }}
 ---
 apiVersion: v1
 kind: Secret
diff --git a/plugins/scheduler-k3s/templates/chart/keda-trigger-authentication.yaml b/plugins/scheduler-k3s/templates/chart/keda-trigger-authentication.yaml
index c39b94b0a..fc40fa6be 100644
--- a/plugins/scheduler-k3s/templates/chart/keda-trigger-authentication.yaml
+++ b/plugins/scheduler-k3s/templates/chart/keda-trigger-authentication.yaml
@@ -1,5 +1,5 @@
 {{- if .Capabilities.APIVersions.Has "keda.sh/v1alpha1" -}}
-{{- $config := index .Values.global.keda.authentications "AUTH_NAME" }}
+{{- $authName, $config := range .Values.global.keda.authentications }}
 ---
 apiVersion: keda.sh/v1alpha1
 kind: TriggerAuthentication
diff --git a/plugins/scheduler-k3s/triggers.go b/plugins/scheduler-k3s/triggers.go
index d81094cbe..89827cdeb 100644
--- a/plugins/scheduler-k3s/triggers.go
+++ b/plugins/scheduler-k3s/triggers.go
@@ -368,7 +368,7 @@ func TriggerSchedulerDeploy(scheduler string, appName string, imageTag string) e
 		Processes: map[string]ProcessValues{},
 	}
 
-	for authName := range kedaValues.Authentications {
+	if len(kedaValues.Authentications) > 0 {
 		templateFiles := []string{"keda-secret", "keda-trigger-authentication"}
 		for _, templateName := range templateFiles {
 			b, err := templates.ReadFile(fmt.Sprintf("templates/chart/%s.yaml", templateName))
@@ -376,9 +376,8 @@ func TriggerSchedulerDeploy(scheduler string, appName string, imageTag string) e
 				return fmt.Errorf("Error reading %s template: %w", templateName, err)
 			}
 
-			filename := filepath.Join(chartDir, "templates", fmt.Sprintf("%s-%s.yaml", templateName, authName))
-			contents := strings.ReplaceAll(string(b), "AUTH_NAME", authName)
-			err = os.WriteFile(filename, []byte(contents), os.FileMode(0644))
+			filename := filepath.Join(chartDir, "templates", fmt.Sprintf("%s.yaml", templateName))
+			err = os.WriteFile(filename, b, os.FileMode(0644))
 			if err != nil {
 				return fmt.Errorf("Error writing %s template: %w", templateName, err)
 			}
@@ -613,15 +612,16 @@ func TriggerSchedulerDeploy(scheduler string, appName string, imageTag string) e
 			Volumes:     processVolumes,
 		}
 		values.Processes[cronEntry.ID] = processValues
+	}
 
+	if len(cronEntries) > 0 {
 		b, err := templates.ReadFile("templates/chart/cron-job.yaml")
 		if err != nil {
 			return fmt.Errorf("Error reading cron job template: %w", err)
 		}
 
-		cronFile := filepath.Join(chartDir, "templates", fmt.Sprintf("cron-job-%s.yaml", cronEntry.ID))
-		contents := strings.ReplaceAll(string(b), "CRON_ID", cronEntry.ID)
-		err = os.WriteFile(cronFile, []byte(contents), os.FileMode(0644))
+		cronFile := filepath.Join(chartDir, "templates", "cron-job.yaml")
+		err = os.WriteFile(cronFile, b, os.FileMode(0644))
 		if err != nil {
 			return fmt.Errorf("Error writing cron job template: %w", err)
 		}