diff --git a/roles/OpenVPN-Client/tasks/copyCerts.yml b/roles/OpenVPN-Client/tasks/copyCerts.yml
index 29ed4b42a8e40adc71f5008cfdc1a86d9596d424..d70ec908b6fdd7dc808570aeb165072cc36f1291 100644
--- a/roles/OpenVPN-Client/tasks/copyCerts.yml
+++ b/roles/OpenVPN-Client/tasks/copyCerts.yml
@@ -1,12 +1,12 @@
 --- 
 - 
-  copy: "src=/tmp/certDir/ca.crt dest=/etc/openvpn/ca.crt  mode=644 owner=root group=root"
+  copy: "src=/tmp/{{ inventory_hostname }}/ca.crt dest=/etc/openvpn/ca.crt  mode=644 owner=root group=root"
   name: "Copying CA certificate"
 - 
-  copy: "src=/tmp/certDir/{{ inventory_hostname }}.crt dest=/etc/openvpn/{{ inventory_hostname }}.crt mode=644 owner=root group=root"
+  copy: "src=/tmp/{{ inventory_hostname }}/{{ inventory_hostname }}.crt dest=/etc/openvpn/{{ inventory_hostname }}.crt mode=644 owner=root group=root"
   name: "Copying Client certificate"
 - 
-  copy: "src=/tmp/certDir/{{ inventory_hostname }}.key dest=/etc/openvpn/{{ inventory_hostname }}.key  mode=600 owner=root group=root"
+  copy: "src=/tmp/{{ inventory_hostname }}/{{ inventory_hostname }}.key dest=/etc/openvpn/{{ inventory_hostname }}.key  mode=600 owner=root group=root"
   name: "Copying Client key"
 - 
   copy: "src=client.conf dest=/etc/openvpn/client.conf owner=root group=root mode=644"
@@ -21,6 +21,6 @@
   name: "Starting openvpn"
   service: "name=openvpn enabled=yes state=started"
 - 
-  local_action: "command rm -rf /tmp/certDir/{{ inventory_hostname }}.cert"
+  local_action: "command rm -rf /tmp/{{ inventory_hostname }}"
   name: "Removing Cert Directory"
 
diff --git a/roles/easy-rsa-CA-client/tasks/buildClientCert.yml b/roles/easy-rsa-CA-client/tasks/buildClientCert.yml
index e8c1517c03bbb6ab64617c4ce57184a943022a6b..77d20a6130246aba00904dfd685ded1e85778b76 100644
--- a/roles/easy-rsa-CA-client/tasks/buildClientCert.yml
+++ b/roles/easy-rsa-CA-client/tasks/buildClientCert.yml
@@ -11,14 +11,14 @@
   when: "cert.stat.exists  == false"
 - 
   delegate_to: "{{ server }}"
-  fetch: "src=/etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.crt dest=/tmp/certDir/ fail_on_missing=yes validate_md5=yes flat=yes"
+  fetch: "src=/etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.crt dest=/tmp/{{ inventory_hostname }}/ fail_on_missing=yes validate_md5=yes flat=yes"
   name: "Copy the Client Certificate to the master node"
 - 
   delegate_to: "{{ server }}"
-  fetch: "src=/etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.key dest=/tmp/certDir/ fail_on_missing=yes validate_md5=yes flat=yes"
+  fetch: "src=/etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.key dest=/tmp/{{ inventory_hostname }}/ fail_on_missing=yes validate_md5=yes flat=yes"
   name: "Copy the Client Certificate to the master node"
 - 
   delegate_to: "{{ server }}"
-  fetch: "src=/etc/easy-rsa/2.0/keys/ca.crt dest=/tmp/certDir/ fail_on_missing=yes validate_md5=yes flat=yes"
+  fetch: "src=/etc/easy-rsa/2.0/keys/ca.crt dest=/tmp/{{ inventory_hostname }}/ fail_on_missing=yes validate_md5=yes flat=yes"
   name: "Copy the Client Certificate to the master node"
 
diff --git a/roles/easy-rsa-CA-client/tasks/copyConfigurationFile.yml b/roles/easy-rsa-CA-client/tasks/copyConfigurationFile.yml
index c7c797f7b0ca337aa07742f2270f9093f40931cd..98517f84b97ba8643d171b93df28d39e491f84b2 100644
--- a/roles/easy-rsa-CA-client/tasks/copyConfigurationFile.yml
+++ b/roles/easy-rsa-CA-client/tasks/copyConfigurationFile.yml
@@ -8,3 +8,10 @@
       - defaultConfig
     - paths:
       - /mnt/nectar-nfs/root/ansible-config-root/ansible_cluster_in_a_box/roles/easy-rsa-CA/files
+- 
+  name: "Editing key_email in config file"
+  replace: dest=/etc/easy-rsa/2.0/vars regexp="shahaan.ayyub@monash.edu" replace={{ key_email }}
+- 
+  name: "Editing key_ou in config file"
+  replace: dest=/etc/easy-rsa/2.0/vars regexp="MCC-R@CMON" replace={{ key_ou }}
+
diff --git a/roles/easy-rsa-CA-client/tasks/main.yml b/roles/easy-rsa-CA-client/tasks/main.yml
index 113c15215645b741b6727af4e783ee1fe0beca50..9f6d3148b754be19ae648e571aca356b60d36b8e 100644
--- a/roles/easy-rsa-CA-client/tasks/main.yml
+++ b/roles/easy-rsa-CA-client/tasks/main.yml
@@ -2,6 +2,6 @@
 -
   include: installEasyRsa.yml
 -
-  include: copyConfigurationFile.yml
+  include: copyConfigurationFile.yml 
 - 
   include: buildClientCert.yml