diff --git a/awx/main/models/credential.py b/awx/main/models/credential.py
index fbdcbcafe8..5eddacd225 100644
--- a/awx/main/models/credential.py
+++ b/awx/main/models/credential.py
@@ -581,10 +581,8 @@ class CredentialType(CommonModelNameNotUnique):
             safe_env[env_var] = Template(tmpl).render(**safe_namespace)
 
         extra_vars = {}
-        safe_extra_vars = {}
         for var_name, tmpl in self.injectors.get('extra_vars', {}).items():
             extra_vars[var_name] = Template(tmpl).render(**namespace)
-            safe_extra_vars[var_name] = Template(tmpl).render(**safe_namespace)
 
         def build_extra_vars_file(vars, private_dir):
             handle, path = tempfile.mkstemp(dir = private_dir)
@@ -594,12 +592,9 @@ class CredentialType(CommonModelNameNotUnique):
             os.chmod(path, stat.S_IRUSR)
             return path
 
+        path = build_extra_vars_file(extra_vars, private_data_dir)
         if extra_vars:
-            path = build_extra_vars_file(extra_vars, private_data_dir)
             args.extend(['-e', '@%s' % path])
-
-        if safe_extra_vars:
-            path = build_extra_vars_file(safe_extra_vars, private_data_dir)
             safe_args.extend(['-e', '@%s' % path])