diff --git a/.github/workflows/helm-publish.yml b/.github/workflows/helm-publish.yml
index 260e93f..7bf4702 100644
--- a/.github/workflows/helm-publish.yml
+++ b/.github/workflows/helm-publish.yml
@@ -1,10 +1,12 @@
 name: Builds and pushes Docker Images and Helm charts to Github Registry
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - develop
       - project/*
+      - feature/helm-chart-merge  # TODO: Remove this
     # XXX: To add tags: Update the -alpha logic
 
 permissions:
diff --git a/helm/templates/cronjobs/jobs.yaml b/helm/templates/cronjobs/jobs.yaml
index 14069a7..6ab5798 100644
--- a/helm/templates/cronjobs/jobs.yaml
+++ b/helm/templates/cronjobs/jobs.yaml
@@ -31,7 +31,7 @@ spec:
                 {{- toYaml (default $.Values.worker.defaultResources $job.resources) | nindent 16 }}
               envFrom:
                 - secretRef:
-                    name: {{ template "ifrcgo-risk-module.fullname" $ }}-api-secret
+                    name: {{ template "ifrcgo-risk-module.secretname" . }}
                 - configMapRef:
                     name: {{ template "ifrcgo-risk-module.fullname" $ }}-api-configmap
           {{- with $.Values.imagePullSecrets }}