diff --git a/roles/easy-rsa-CA-client/tasks/buildClientCert.yml b/roles/easy-rsa-CA-client/tasks/buildClientCert.yml
index 599e91ccbbf44afa4fde019851c394643ca36286..7525599eef81727423c123026334eb0a3caa45b9 100644
--- a/roles/easy-rsa-CA-client/tasks/buildClientCert.yml
+++ b/roles/easy-rsa-CA-client/tasks/buildClientCert.yml
@@ -1,14 +1,10 @@
 --- 
-- 
-  delegate_to: "{{ server }}"
-  name: "Check if certificate exist"
-  register: cert
-  stat: "path=/etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.crt"
 - 
   delegate_to: "{{ server }}"
   name: "Creating Client certificate"
   shell: " cd /etc/easy-rsa/2.0; source ./vars; export EASY_RSA=\"${EASY_RSA:-.}\"; \"$EASY_RSA\"/pkitool --csr {{ inventory_hostname }} ;\"$EASY_RSA\"/pkitool --sign {{ inventory_hostname }}"
-  when: "cert.stat.exists  == false"
+  args:
+   creates: /etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.crt
 - 
   delegate_to: "{{ server }}"
   fetch: "src=/etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.crt dest=certDir/ fail_on_missing=yes validate_md5=yes flat=yes"
diff --git a/roles/easy-rsa-CA-client/tasks/main.yml b/roles/easy-rsa-CA-client/tasks/main.yml
index 113c15215645b741b6727af4e783ee1fe0beca50..73fc5d8700f83f489084aa0b075e86c0e3750c17 100644
--- a/roles/easy-rsa-CA-client/tasks/main.yml
+++ b/roles/easy-rsa-CA-client/tasks/main.yml
@@ -1,7 +1,3 @@
 --- 
--
-  include: installEasyRsa.yml
--
-  include: copyConfigurationFile.yml
 - 
   include: buildClientCert.yml