diff --git a/roles/easy-rsa-CA-server/tasks/buildServerCert.yml b/roles/easy-rsa-CA-server/tasks/buildServerCert.yml
index 122a4064fe55058d2ac33b9c4d84892d650ebdff..7de1e2229d8f0b56aa3216c6f13533b1a01d14c3 100644
--- a/roles/easy-rsa-CA-server/tasks/buildServerCert.yml
+++ b/roles/easy-rsa-CA-server/tasks/buildServerCert.yml
@@ -1,17 +1,11 @@
 --- 
 - 
-  name: "Check if certificate exist"
-  register: cert
-  stat: "path=/etc/easy-rsa/2.0/keys/{{ ansible_fqdn }}.crt"
-- 
+  args: 
+    creates: "/etc/easy-rsa/2.0/keys/{{ ansible_fqdn }}.crt"
   name: "Creating Server certificate"
   shell: " cd /etc/easy-rsa/2.0; source ./vars; export EASY_RSA=\"${EASY_RSA:-.}\"; \"$EASY_RSA/pkitool\"  --server {{ ansible_fqdn }}"
-  when: "cert.stat.exists == false"
-- 
-  name: "Check if Diffie Hellman parameters file exist"
-  register: dh
-  stat: path=/etc/easy-rsa/2.0/keys/dh512.pem
 - 
+  args: 
+    creates: /etc/easy-rsa/2.0/keys/dh512.pem
   name: "Generating Diffie-Hellman Parameters"
   shell: "cd /etc/easy-rsa/2.0; source ./vars; ./build-dh"
-  when: "dh.stat.exists == false"