diff --git a/chart/orkestra/templates/configmap.yaml b/chart/orkestra/templates/configmap.yaml
index cc69fe5..11e6f29 100644
--- a/chart/orkestra/templates/configmap.yaml
+++ b/chart/orkestra/templates/configmap.yaml
@@ -11,7 +11,7 @@ data:
         {{ $repo.name }}:
             url: {{ $repo.url }}
             {{ if $repo.username }}
-            username: { {$repo.username }}
+            username: {{ $repo.username }}
             {{ end }}
             {{ if $repo.password }}
             password: {{ $repo.password }}
diff --git a/pkg/workflow/argo.go b/pkg/workflow/argo.go
index 4e1395c..7acba20 100644
--- a/pkg/workflow/argo.go
+++ b/pkg/workflow/argo.go
@@ -430,9 +430,7 @@ func (a *argo) updateWorkflowTemplates(tpls ...v1alpha12.Template) {
 
 func defaultExecutor() v1alpha12.Template {
 	return v1alpha12.Template{
-		Name: helmReleaseExecutor,
-		// FIXME (nitishm) : Hack
-		// Replace with the actual service account in use
+		Name:               helmReleaseExecutor,
 		ServiceAccountName: os.Getenv("SERVICE_ACCOUNT_NAME"),
 		Inputs: v1alpha12.Inputs{
 			Parameters: []v1alpha12.Parameter{