diff --git a/roles/jasons_ssh_ca/handlers/main.yml b/roles/jasons_ssh_ca/handlers/main.yml
index 875ea0a1df436812a61a5919059d0eb5b59e8884..53ca43d6f6ad089c3324ad822ddbd1244e0c52bd 100644
--- a/roles/jasons_ssh_ca/handlers/main.yml
+++ b/roles/jasons_ssh_ca/handlers/main.yml
@@ -1,5 +1,6 @@
 ---
-- name: restart ssh debian
-  service: name=ssh state=restarted
+- include_vars: "{{ ansible_os_family }}_{{ ansible_architecture }}.yml"
+
+- name: restart ssh
+  service: name={{ sshd_name }} state=restarted
   sudo: true
-  when: ansible_os_family == "Debian"
diff --git a/roles/jasons_ssh_ca/tasks/main.yml b/roles/jasons_ssh_ca/tasks/main.yml
index 4be9b14f7956c86fe584366c0df3dbd9d703fe97..1823b183ec4157eead145d1c594e9d45b6630133 100644
--- a/roles/jasons_ssh_ca/tasks/main.yml
+++ b/roles/jasons_ssh_ca/tasks/main.yml
@@ -10,5 +10,4 @@
     line: TrustedUserCAKeys /etc/ssh/server_ca.pub
     state: present
   sudo: true
-  notify: restart ssh debian
-  when: ansible_os_family == "Debian"
+  notify: restart ssh
diff --git a/roles/jasons_ssh_ca/vars/Debian_x86_64.yml b/roles/jasons_ssh_ca/vars/Debian_x86_64.yml
new file mode 100644
index 0000000000000000000000000000000000000000..dab5767eff4ff8af6dbf92d8ff95241e2b085c1e
--- /dev/null
+++ b/roles/jasons_ssh_ca/vars/Debian_x86_64.yml
@@ -0,0 +1,2 @@
+sshd_name: "ssh"
+
diff --git a/roles/jasons_ssh_ca/vars/RedHat_x86_64.yml b/roles/jasons_ssh_ca/vars/RedHat_x86_64.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6c1671efa53e4a0f1d231d98ac0799f99e336470
--- /dev/null
+++ b/roles/jasons_ssh_ca/vars/RedHat_x86_64.yml
@@ -0,0 +1,2 @@
+sshd_name: "sshd"
+
diff --git a/roles/openssh/tasks/installSsh.yml b/roles/openssh/tasks/installSsh.yml
index cc73e0a15de85821c517251a38c3f0aef9090ab3..3dd138834575ec3066e2bdf795bb74b65a3e4a48 100644
--- a/roles/openssh/tasks/installSsh.yml
+++ b/roles/openssh/tasks/installSsh.yml
@@ -19,6 +19,7 @@
   shell: tar zxf /tmp/openssh-{{ ssh_version }}.tar.gz 
   args:
     chdir: /tmp
+    creates: /tmp/openssh-{{ ssh_version }}/ssh
 
 - name: build ssh 
   shell: ./configure --prefix={{ ssh_dir }} --with-ipv4-default --with-md5-passwords --with-pam && make