diff --git a/tasks/main.yml b/tasks/main.yml
index 82fab0e..8ba8229 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -9,7 +9,7 @@
   #Step1 - Check if certificate file is in place
 - name: Check that the host certificate exists
   stat:
-    path: /etc/ssl/private/{{inventory_hostname}}.{{local_domainname}}.key
+    path: /etc/ssl/private/{{ inventory_hostname }}.{{ local_domainname }}.key
   register: stat_result
   tags: certificate
 
diff --git a/templates/requestCertificate.sh.j2 b/templates/requestCertificate.sh.j2
index 4d98c09..328f7ea 100644
--- a/templates/requestCertificate.sh.j2
+++ b/templates/requestCertificate.sh.j2
@@ -4,7 +4,7 @@ curl --request POST --data '{"key": "'$VAULT_UNSEAL_KEY1'"}'  $VAULT_ADDR/v1/sys
 curl --request POST --data '{"key": "'$VAULT_UNSEAL_KEY2'"}'  $VAULT_ADDR/v1/sys/unseal
 curl --request POST --data '{"key": "'$VAULT_UNSEAL_KEY3'"}'  $VAULT_ADDR/v1/sys/unseal
 
-CERTNAME=$(hostname).{{local_domainname}}
+CERTNAME=$(hostname).{{ local_domainname }}
 curl --header "X-Vault-Token: $VAULT_TOKEN" \
 --request POST \
 --data '{"common_name": "'$CERTNAME'", "ttl": "43800h"}' \
@@ -19,9 +19,9 @@ jq .data.ca_chain[0] certificateResult.txt  |  sed "s/\"//g" | sed "s/\\\n/\n/g"
 jq .data.ca_chain[1] certificateResult.txt  |  sed "s/\"//g" | sed "s/\\\n/\n/g" >> ca.crt.tmp
 grep ca.crt.tmp -v -e null > ca.crt
 
-mv cert.pem /etc/ssl/private/$(hostname).{{local_domainname}}.key
-mv cert.crt /etc/ssl/certs/$(hostname).{{local_domainname}}.crt
-mv ca.crt /etc/ssl/certs/{{local_domainname}}-CA-chain.crt
+mv cert.pem /etc/ssl/private/$(hostname).{{ local_domainname }}.key
+mv cert.crt /etc/ssl/certs/$(hostname).{{ local_domainname }}.crt
+mv ca.crt /etc/ssl/certs/{{ local_domainname }}-CA-chain.crt
 
 
 #rm certificateResult.txt