diff --git a/roles/OpenVPN-Client/tasks/copyCerts.yml b/roles/OpenVPN-Client/tasks/copyCerts.yml
index 1f7416f9e5ac16a1cbf4dff13f82ca3c05c1c450..24a47f90bafad34954e65ee2a261510befdb0d76 100644
--- a/roles/OpenVPN-Client/tasks/copyCerts.yml
+++ b/roles/OpenVPN-Client/tasks/copyCerts.yml
@@ -4,31 +4,34 @@
   name: "Check if CA certificate exist"
   register: CAcert
   stat: path=/etc/easy-rsa/2.0/keys/ca.crt
-  delegate_to: 127.0.0.1
+  delegate_to: "{{ server }}"
 - 
-  copy: "src=/etc/easy-rsa/2.0/keys/ca.crt dest=/etc/openvpn/ca.crt owner=root group=root mode=644 force=yes"
+  synchronize: "src=/etc/easy-rsa/2.0/keys/ca.crt dest=/etc/openvpn/ca.crt  mode=push rsync_path='sudo rsync'"
   name: "Copying CA certificate"
   when: "CAcert.stat.exists  == true"
+  delegate_to: "{{ server }}"
 - 
   failed_when: "ClientCert.stat.exists  == false"
   name: "Check if Client certificate exist"
   register: ClientCert
   stat: "path=/etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.crt"
-  delegate_to: 127.0.0.1
+  delegate_to: "{{ server }}"
 - 
-  copy: "src=/etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.crt dest=/etc/openvpn/{{ inventory_hostname }}.crt owner=root group=root mode=644 force=yes"
+  synchronize: "src=/etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.crt dest=/etc/openvpn/{{ inventory_hostname }}.crt rsync_path='sudo rsync'  mode=push"
   name: "Copying Client certificate"
   when: "ClientCert.stat.exists  == true"
+  delegate_to: "{{ server }}"
 - 
   failed_when: "ClientKey.stat.exists  == false"
   name: "Check if Server key exist"
   register: ClientKey
   stat: "path=/etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.key"
-  delegate_to: 127.0.0.1
+  delegate_to: "{{ server }}"
 - 
-  copy: "src=/etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.key dest=/etc/openvpn/{{ inventory_hostname }}.key owner=root group=root mode=600 force=yes"
+  synchronize: "src=/etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.key dest=/etc/openvpn/{{ inventory_hostname }}.key  mode=push rsync_path='sudo rsync'"
   name: "Copying Client key"
   when: "ClientKey.stat.exists  == true"
+  delegate_to: "{{ server }}"
 - 
   copy: "src=client.conf dest=/etc/openvpn/client.conf owner=root group=root mode=644"
   name: "Copying client.conf to the OpenVPN client"
diff --git a/roles/OpenVPN-Client/vars/main.yml b/roles/OpenVPN-Client/vars/main.yml
index fcfcae3cb9bb9ae77499cf215eb1e20924a0f88e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/roles/OpenVPN-Client/vars/main.yml
+++ b/roles/OpenVPN-Client/vars/main.yml
@@ -1,2 +0,0 @@
----
-server: "{{ ansible_nodename }}"
diff --git a/roles/OpenVPN-Server/vars/main.yml b/roles/OpenVPN-Server/vars/main.yml
index 9e36a34ff9de1c5dfe1c0aebc797f8624202b116..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/roles/OpenVPN-Server/vars/main.yml
+++ b/roles/OpenVPN-Server/vars/main.yml
@@ -1,4 +0,0 @@
----
-ansible_ssh_user: "ec2-user"
-ansible_ssh_private_key_file: "/home/sgeadmin/.ssh/shahaan.pem"
-
diff --git a/roles/easy-rsa-CA-client/tasks/buildClientCert.yml b/roles/easy-rsa-CA-client/tasks/buildClientCert.yml
index 3536ba446c41420b56097923faca9c15e180347a..1b586ff8a6d9c41a1ff8f9c595d04b31511c5410 100644
--- a/roles/easy-rsa-CA-client/tasks/buildClientCert.yml
+++ b/roles/easy-rsa-CA-client/tasks/buildClientCert.yml
@@ -1,11 +1,11 @@
 --- 
 - 
-  delegate_to: "127.0.0.1"
+  delegate_to: "vm-118-138-240-224.erc.monash.edu.au"
   name: "Check if certificate exist"
   register: cert
   stat: "path=/etc/easy-rsa/2.0/keys/{{ client }}.crt"
 - 
-  delegate_to: "127.0.0.1"
+  delegate_to: "vm-118-138-240-224.erc.monash.edu.au"
   name: "Creating Client certificate"
   shell: ' cd /etc/easy-rsa/2.0; source ./vars; export EASY_RSA="${EASY_RSA:-.}"; "$EASY_RSA"/pkitool --csr {{ client }} ;"$EASY_RSA"/pkitool --sign {{ client }}'
 
diff --git a/roles/easy-rsa-CA-client/vars/main.yml b/roles/easy-rsa-CA-client/vars/main.yml
index 53a74063f16eb5de15d6a7958c52af02813569c3..77a2fd2eba9b3c72fd8dc9e62734c8d2d88948b4 100644
--- a/roles/easy-rsa-CA-client/vars/main.yml
+++ b/roles/easy-rsa-CA-client/vars/main.yml
@@ -1,5 +1,2 @@
 --- 
-ansible_ssh_private_key_file: /home/sgeadmin/.ssh/shahaan.pem
-ansible_ssh_user: ec2-user
 client: "{{ inventory_hostname }}"
-server: "{{ ansible_nodename }}"
diff --git a/roles/easy-rsa-CA-server/vars/main.yml b/roles/easy-rsa-CA-server/vars/main.yml
index e7f31bcfb26bd903ae95bb3ffa8eed9e83949243..4de6c095d965425e88179e26f8cc2053ba90737c 100644
--- a/roles/easy-rsa-CA-server/vars/main.yml
+++ b/roles/easy-rsa-CA-server/vars/main.yml
@@ -1,5 +1,2 @@
 ---
-ansible_ssh_user: "ec2-user"
-ansible_ssh_private_key_file: "/home/sgeadmin/.ssh/shahaan.pem"
-server: "{{ inventory_hostname }}"
 client: "{{ inventory_hostname }}"
diff --git a/roles/easy-rsa-CA/vars/main.yml b/roles/easy-rsa-CA/vars/main.yml
index e7f31bcfb26bd903ae95bb3ffa8eed9e83949243..4de6c095d965425e88179e26f8cc2053ba90737c 100644
--- a/roles/easy-rsa-CA/vars/main.yml
+++ b/roles/easy-rsa-CA/vars/main.yml
@@ -1,5 +1,2 @@
 ---
-ansible_ssh_user: "ec2-user"
-ansible_ssh_private_key_file: "/home/sgeadmin/.ssh/shahaan.pem"
-server: "{{ inventory_hostname }}"
 client: "{{ inventory_hostname }}"