diff --git a/roles/easy-rsa-CA-server/tasks/buildServerCert.yml b/roles/easy-rsa-CA-server/tasks/buildServerCert.yml
index 9f7c8aea3b7c19732301f3569bfb32fc6dadfd91..122a4064fe55058d2ac33b9c4d84892d650ebdff 100644
--- a/roles/easy-rsa-CA-server/tasks/buildServerCert.yml
+++ b/roles/easy-rsa-CA-server/tasks/buildServerCert.yml
@@ -2,10 +2,10 @@
 - 
   name: "Check if certificate exist"
   register: cert
-  stat: "path=/etc/easy-rsa/2.0/keys/{{ server }}.crt"
+  stat: "path=/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 {{ server }}"
+  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"
diff --git a/setupPKI.yml b/setupPKI.yml
new file mode 100644
index 0000000000000000000000000000000000000000..cb48020044f37514b1d2b0a5faa92cec917c494c
--- /dev/null
+++ b/setupPKI.yml
@@ -0,0 +1,12 @@
+--- 
+- 
+  hosts: openvpn-clients
+  remote_user: ec2-user
+  roles: 
+    - easy-rsa-CA-client
+    - OpenVPN-Client
+  sudo: true
+  vars: 
+    ansible_ssh_private_key_file: /root/.ssh/shahaan.pem
+    ansible_ssh_user: ec2-user
+    server: "vm-118-138-240-224.erc.monash.edu.au"