diff --git a/roles/OpenVPN-Server/vars/main.yml b/roles/OpenVPN-Server/vars/main.yml
index aa8c96e976916b26b79f510be2b7c548e77ff879..0118883ff89c549e9482c6c75e34aa36ade35715 100644
--- a/roles/OpenVPN-Server/vars/main.yml
+++ b/roles/OpenVPN-Server/vars/main.yml
@@ -1,7 +1,7 @@
 ---
 x509_csr_args: "--server"
 x509_cacert_file: "/etc/ssl/certs/ca.crt"
-x509_key_file: "/etc/ssl/private/server.key"
-x509_cert_file: "/etc/ssl/certs/server.crt"
+x509_key_file: "/etc/openvpn/private/server.key"
+x509_cert_file: "/etc/openvpn/certs/server.crt"
 x509_common_name: "{{ ansible_fqdn }}_OpenVPN_Server"
-dhparms_file: "/etc/ssl/private/dh.pem"
+dhparms_file: "/etc/openvpn/private/dh.pem"
diff --git a/roles/easy-rsa-certificate/meta/main.yml b/roles/easy-rsa-certificate/meta/main.yml
index 837a763b2876b919420ce91f0d9fdcd0cfe6afd2..fb87b0894c8bb8124740abb184a4c19f142d922b 100644
--- a/roles/easy-rsa-certificate/meta/main.yml
+++ b/roles/easy-rsa-certificate/meta/main.yml
@@ -1,4 +1,5 @@
 ---
+allow_duplicates: yes
 dependencies:
   - {role: easy-rsa-common }
 
diff --git a/roles/ldapserver/vars/main.yml b/roles/ldapserver/vars/main.yml
index 12de2dcaca370ee05727f4f9758c841b48465526..a94437139fc51855a70dff6ad7143258fb21b714 100644
--- a/roles/ldapserver/vars/main.yml
+++ b/roles/ldapserver/vars/main.yml
@@ -1,4 +1,3 @@
 ---
- ldapDomain: dc=imbl,dc=massive,dc=org,dc=au
  ldapuser:  ldap
  ldapgroup: ldap