diff --git a/tasks/Debian.yml b/tasks/Debian.yml
index 87e28ca..0e49a99 100644
--- a/tasks/Debian.yml
+++ b/tasks/Debian.yml
@@ -45,17 +45,22 @@
     - "'deb' in riak_package"
     - not dist.stat.exists
 
-- name: Set the riak ulimit for non Ubuntu Xenial
+- name: Set the riak ulimit for Debian
+  copy: src=etc_security_limits.d_riak.conf dest=/etc/security/limits.conf
+  tags: Debian
+  when: 'ansible_distribution == "Debian"'
+
+- name: Set the riak ulimit for Ubuntu Trusty
   copy: src=etc_default_riak_ulimit dest=/etc/default/riak owner=riak group=riak
   tags: Debian
-  when: 'ansible_os_family == "Debian" and ansible_distribution_release != "xenial"'
+  when: 'ansible_distribution_release != "xenial" and ansible_distribution_release != "jessie"'
 
 - name: Set the riak ulimit for Ubuntu Xenial
   lineinfile: 'dest=/lib/systemd/system/riak.service line="LimitNOFILE=131072" insertafter="^RuntimeDirectory=riak"'
   tags: Debian
-  when: 'ansible_os_family == "Debian" and ansible_distribution_release == "xenial"'
+  when: 'ansible_distribution_release == "xenial" or ansible_distribution_release == "jessie"'
 
 - name: Reload systemd
   systemd: state=restarted daemon_reload=yes name=riak enabled=yes
   tags: Debian
-  when: 'ansible_os_family == "Debian" and ansible_distribution_release == "xenial"'
+  when: 'ansible_distribution_release == "xenial" or ansible_distribution_release == "jessie"'