diff --git a/defaults/main.yml b/defaults/main.yml
index 30a1f15..da887bc 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -13,4 +13,4 @@
 saml_cert_signing_request: server.csr
 saml_self_signed_cert: server.crt
 saml_self_encryption_type: sha256
-saml_expiry_days: 365
+saml_self_expiry_days: 365
diff --git a/tasks/create-private-key-and-self-signed-cert.yml b/tasks/create-private-key-and-self-signed-cert.yml
index 83cd5da..7e5e9ad 100644
--- a/tasks/create-private-key-and-self-signed-cert.yml
+++ b/tasks/create-private-key-and-self-signed-cert.yml
@@ -26,10 +26,14 @@
 - name: Generate certificate signing request for CA
   become: yes
   shell: "openssl req -x509 -sha256 -new -key {{ saml_server_key }} -out {{ saml_cert_signing_request }}"
+  args:
+    chdir: "{{ saml_folder }}"
 
 - name: Generate self-signed certificate with 365 days expiry-time
   become: yes
-  shell: "openssl x509 -{{ saml_self_encryption_type }} -days {{ saml_expiry_days }} -in {{ saml_cert_signing_request }} -signkey {{ saml_server_key }} -out {{ saml_self_signed_cert }}"
+  shell: "openssl x509 -{{ saml_self_encryption_type }} -days {{ saml_self_expiry_days }} -in {{ saml_cert_signing_request }} -signkey {{ saml_server_key }} -out {{ saml_self_signed_cert }}"
+  args:
+    chdir: "{{ saml_folder }}"
 
 - name: Collect certificate files
   find: