diff --git a/roles/easy-rsa-CA-client/defaults/main.yml b/roles/easy-rsa-CA-client/defaults/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3e0df58c09e53df21c545b97c1da5cc4d737b935
--- /dev/null
+++ b/roles/easy-rsa-CA-client/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+key_email: shahaan.ayyub@monash.edu 
+key_ou: MCC-R@CMON
diff --git a/roles/easy-rsa-CA-server/defaults/main.yml b/roles/easy-rsa-CA-server/defaults/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3e0df58c09e53df21c545b97c1da5cc4d737b935
--- /dev/null
+++ b/roles/easy-rsa-CA-server/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+key_email: shahaan.ayyub@monash.edu 
+key_ou: MCC-R@CMON
diff --git a/roles/easy-rsa-CA-server/tasks/copyConfigurationFile.yml b/roles/easy-rsa-CA-server/tasks/copyConfigurationFile.yml
index c7c797f7b0ca337aa07742f2270f9093f40931cd..51940f2befeaf45bdf80756074675941b46ee180 100644
--- a/roles/easy-rsa-CA-server/tasks/copyConfigurationFile.yml
+++ b/roles/easy-rsa-CA-server/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 }}
+