diff --git a/roles/php-fpm/handlers/main.yml b/roles/php-fpm/handlers/main.yml
index 2ce2736..1cf2b27 100644
--- a/roles/php-fpm/handlers/main.yml
+++ b/roles/php-fpm/handlers/main.yml
@@ -1,5 +1,10 @@
 ---
+# For Debian 8
 - name: restart php5-fpm
   service: name=php5-fpm state=restarted
 
+# For Ubuntu 16.04
+- name: restart php7.0-fpm
+  service: name=php7.0-fpm state=restarted
+
 # vim: set ts=2 sw=2:
diff --git a/roles/php-fpm/tasks/Debian.yml b/roles/php-fpm/tasks/Debian.yml
new file mode 100644
index 0000000..af91ad0
--- /dev/null
+++ b/roles/php-fpm/tasks/Debian.yml
@@ -0,0 +1,30 @@
+---
+- name: Install php5-fpm and deps
+  apt: name={{ item }} state=present update_cache=yes
+  with_items:
+    - php5-fpm
+    # for WordPress
+    - php5-mysql
+    - php5-gd
+    - php5-curl
+  tags: php-fpm
+
+- name: Copy php5-fpm pool config
+  template: src=pool.conf.j2 dest=/etc/php5/fpm/pool.d/{{ item.domain_name }}.conf owner=root group=root mode=0644
+  with_items: "{{ nginx_vhosts }}"
+  when: nginx_vhosts is defined
+  notify: restart php5-fpm
+  tags: php-fpm
+
+- name: Remove default www pool
+  file: path=/etc/php5/fpm/pool.d/www.conf state=absent
+  notify: restart php5-fpm
+  tags: php-fpm
+
+# re-configure php.ini
+- name: Update php.ini
+  template: src=php.ini.j2 dest=/etc/php5/fpm/php.ini owner=root group=root mode=0644
+  notify: restart php5-fpm
+  tags: php-fpm
+
+# vim: set ts=2 sw=2:
diff --git a/roles/php-fpm/tasks/Ubuntu.yml b/roles/php-fpm/tasks/Ubuntu.yml
new file mode 100644
index 0000000..4946d13
--- /dev/null
+++ b/roles/php-fpm/tasks/Ubuntu.yml
@@ -0,0 +1,30 @@
+---
+- name: Install php7.0-fpm and deps
+  apt: name={{ item }} state=present update_cache=yes
+  with_items:
+    - php7.0-fpm
+    # for WordPress
+    - php7.0-mysql
+    - php7.0-gd
+    - php7.0-curl
+  tags: php-fpm
+
+- name: Copy php-fpm pool config
+  template: src=php7.0-pool.conf.j2 dest=/etc/php/7.0/fpm/pool.d/{{ item.domain_name }}.conf owner=root group=root mode=0644
+  with_items: "{{ nginx_vhosts }}"
+  when: nginx_vhosts is defined
+  notify: restart php7.0-fpm
+  tags: php-fpm
+
+- name: Remove default www pool
+  file: path=/etc/php/7.0/fpm/pool.d/www.conf state=absent
+  notify: restart php7.0-fpm
+  tags: php-fpm
+
+# re-configure php.ini
+- name: Update php.ini
+  template: src=php7.0-php.ini.j2 dest=/etc/php/7.0/fpm/php.ini owner=root group=root mode=0644
+  notify: restart php7.0-fpm
+  tags: php-fpm
+
+# vim: set ts=2 sw=2:
diff --git a/roles/php-fpm/tasks/main.yml b/roles/php-fpm/tasks/main.yml
index e12d210..46c3776 100644
--- a/roles/php-fpm/tasks/main.yml
+++ b/roles/php-fpm/tasks/main.yml
@@ -1,30 +1,11 @@
 ---
-- name: Install php5-fpm and deps 
-  apt: name={{ item }} state=present update_cache=yes
-  with_items:
-    - php5-fpm
-    # for WordPress
-    - php5-mysql
-    - php5-gd
-    - php5-curl
+
+- include: Debian.yml
+  when: ansible_distribution == 'Debian'
   tags: php-fpm
 
-- name: Copy php5-fpm pool config
-  template: src=pool.conf.j2 dest=/etc/php5/fpm/pool.d/{{ item.domain_name }}.conf owner=root group=root mode=0644
-  with_items: "{{ nginx_vhosts }}"
-  when: nginx_vhosts is defined
-  notify: restart php5-fpm
-  tags: php-fpm
-
-- name: Remove default www pool
-  file: path=/etc/php5/fpm/pool.d/www.conf state=absent
-  notify: restart php5-fpm
-  tags: php-fpm
-
-# re-configure php.ini
-- name: Update php.ini
-  template: src=php.ini.j2 dest=/etc/php5/fpm/php.ini owner=root group=root mode=0644
-  notify: restart php5-fpm
+- include: Ubuntu.yml
+  when: ansible_distribution == 'Ubuntu'
   tags: php-fpm
 
 # vim: set ts=2 sw=2: