diff --git a/roles/easy-rsa-CA-server/tasks/buildServerCert.yml b/roles/easy-rsa-CA-server/tasks/buildServerCert.yml
index 595c7a6e4deb96c855826fdf05493df403230e8e..1a35032965f45ca8ae1c12b88e433138af60939b 100644
--- a/roles/easy-rsa-CA-server/tasks/buildServerCert.yml
+++ b/roles/easy-rsa-CA-server/tasks/buildServerCert.yml
@@ -1,9 +1,6 @@
 --- 
 - name: "Creating Server certificate"
-  shell: " cd /etc/easy-rsa/2.0; source ./vars; export EASY_RSA=\"${EASY_RSA:-.}\"; \"$EASY_RSA/pkitool\"  --server {{ server }}; cp /etc/easy-rsa/2.0/keys/{{ server }}.crt /etc/easy-rsa/2.0/keys/dummy_server.crt"
-  args:
-    chdir: /etc/easy-rsa/2.0/keys/
-    creates: dummy_server.crt  ## Todo: {{ server }}.crt does not work
+  shell: "cd /etc/easy-rsa/2.0; source ./vars; export EASY_RSA=\"${EASY_RSA:-.}\"; \"$EASY_RSA/pkitool\" --server {{ server }} creates=/etc/easy-rsa/2.0/keys/{{ server }}.crt"
 
 - name: "Generating Diffie-Hellman Parameters"
   shell: "cd /etc/easy-rsa/2.0; source ./vars; ./build-dh"