diff --git a/roles/OpenVPN-Server/vars/main.yml b/roles/OpenVPN-Server/vars/main.yml
index 84cc2861a18390a45dafc791ee80de8bf1e3a132..7ce242bc8ee534ec24ad251b73a8375a5fdb5bde 100644
--- a/roles/OpenVPN-Server/vars/main.yml
+++ b/roles/OpenVPN-Server/vars/main.yml
@@ -1,6 +1,6 @@
 ---
 x509_csr_args: "--server"
-x509_cacert_file: "/etc/ssl/certs/cacert.pem"
+x509_cacert_file: "/etc/ssl/certs/ca.crt"
 x509_key_file: "/etc/ssl/private/server.key"
 x509_cert_file: "/etc/ssl/certs/server.pem"
 x509_common_name: "{{ ansible_fqdn }}_OpenVPN_Server"
diff --git a/roles/easy-rsa-certificate/tasks/buildCert.yml b/roles/easy-rsa-certificate/tasks/buildCert.yml
index e2f1517f767e040f51a19670e853344008ec99bf..265efd31645ca13347bd9b2d1122286ea16762bf 100644
--- a/roles/easy-rsa-certificate/tasks/buildCert.yml
+++ b/roles/easy-rsa-certificate/tasks/buildCert.yml
@@ -39,7 +39,7 @@
   when: needcert
 
 - name: "Creating CSR"
-  shell: " cd /etc/easy-rsa/2.0; source ./vars; export EASY_RSA=\"${EASY_RSA:-.}\"; \"$EASY_RSA\"/pkitool --csr {{ x509_csr_args }} {{ x509_common_name }}"
+  shell: " cd /etc/easy-rsa/2.0; . ./vars; export EASY_RSA=\"${EASY_RSA:-.}\"; \"$EASY_RSA\"/pkitool --csr {{ x509_csr_args }} {{ x509_common_name }}"
   args:
     creates: "/etc/easy-rsa/2.0/keys/{{ x509_common_name }}.key"
   when: needcert
@@ -58,7 +58,7 @@
 
 - name: "Sign Certificate"
   delegate_to: "{{ x509_ca_server }}"
-  shell:    "source ./vars; export EASY_RSA=\"${EASY_RSA:-.}\" ;\"$EASY_RSA\"/pkitool --sign {{ x509_sign_args }} {{ x509_common_name }}"
+  shell:    ". ./vars; export EASY_RSA=\"${EASY_RSA:-.}\" ;\"$EASY_RSA\"/pkitool --sign {{ x509_sign_args }} {{ x509_common_name }}"
   args:
     chdir: "/etc/easy-rsa/2.0"
     creates: "/etc/easy-rsa/2.0/keys/{{ x509_common_name }}.crt"
diff --git a/roles/easy-rsa-common/tasks/installEasyRsa.yml b/roles/easy-rsa-common/tasks/installEasyRsa.yml
index 9062831491020d4597030217af28bde6b8eb9392..a0317333f84ea9bce748c5a3642e8ee7e689aaaf 100644
--- a/roles/easy-rsa-common/tasks/installEasyRsa.yml
+++ b/roles/easy-rsa-common/tasks/installEasyRsa.yml
@@ -3,9 +3,31 @@
   name: "Installing easy-rsa"
   yum: "name=easy-rsa state=latest"
   sudo: True
+  when: ansible_os_family == 'RedHat'
+- 
+  name: "Installing easy-rsa"
+  apt: "name=openvpn state=latest"
+  sudo: True
+  when: ansible_os_family == 'Debian'
 - 
   name: "Moving easy-rsa to /etc"
   shell: "cp -rf /usr/share/easy-rsa /etc/"
   args:
     creates: /etc/easy-rsa
   sudo: True
+  when: ansible_os_family == 'RedHat'
+- 
+  name: "Moving easy-rsa to /etc"
+  shell: "cp -rf /usr/share/doc/openvpn/examples/easy-rsa /etc/"
+  args:
+    creates: /etc/easy-rsa
+  sudo: True
+  when: ansible_os_family == 'Debian'
+  register: installed
+
+- name: "Clean all"
+  shell: " cd /etc/easy-rsa/2.0; . ./vars; export EASY_RSA=\"${EASY_RSA:-.}\"; \"$EASY_RSA\"/clean-all"
+  args:
+    creates: "/etc/easy-rsa/2.0/keys/"
+  when: installed|changed
+  sudo: true