diff --git a/roles/bookstack/tasks/conf.yml b/roles/bookstack/tasks/conf.yml
index b72f8ed..b96a6d3 100644
--- a/roles/bookstack/tasks/conf.yml
+++ b/roles/bookstack/tasks/conf.yml
@@ -36,8 +36,10 @@
 
 - name: Deploy permission script
   template: src=perms.sh.j2 dest={{ bookstack_root_dir }}/perms.sh mode=755
+  register: bookstack_perm_script
   tags: bookstack
 
 - name: Apply permissions
   command: "{{ bookstack_root_dir }}/perms.sh"
+  when: bookstack_perm_script.changed or bookstack_install_mode != 'none'
   tags: bookstack
diff --git a/roles/composer/meta/main.yml b/roles/composer/meta/main.yml
index 8360d69..52d815d 100644
--- a/roles/composer/meta/main.yml
+++ b/roles/composer/meta/main.yml
@@ -1,4 +1,4 @@
 ---
 
 dependencies:
-  - role: httpd_common
+  - role: httpd_php
diff --git a/roles/composer/tasks/cleanup.yml b/roles/composer/tasks/cleanup.yml
new file mode 100644
index 0000000..333fe2a
--- /dev/null
+++ b/roles/composer/tasks/cleanup.yml
@@ -0,0 +1,5 @@
+---
+
+- name: Remove manually installed composer
+  file: path=/usr/local/bin/composer state=absent
+  tags: web
diff --git a/roles/composer/tasks/install.yml b/roles/composer/tasks/install.yml
index 8594ed8..4a80a1d 100644
--- a/roles/composer/tasks/install.yml
+++ b/roles/composer/tasks/install.yml
@@ -1,31 +1,7 @@
 ---
 
-- name: Install dependencies
-  yum:
+- name: Install composer
+  package:
     name:
-      - git
-  tags: composer
-
-- name: download composer
-  get_url:
-    url: https://getcomposer.org/installer
-    dest: /tmp/installer
-  tags: composer
-
-- name: install composer
-  shell: cat /tmp/installer | php74 -- --install-dir=/usr/local/bin
-  args:
-    creates: /usr/local/bin/composer
-  tags: composer
-
-- name: rename composer.phar to composer
-  shell: mv /usr/local/bin/composer.phar /usr/local/bin/composer
-  args:
-    creates: /usr/local/bin/composer
-  tags: composer
-
-- name: make composer executable
-  file: 
-    path: /usr/local/bin/composer
-    mode: 755
-  tags: composer
+      - composer
+  tags: web
diff --git a/roles/composer/tasks/main.yml b/roles/composer/tasks/main.yml
index ce1965c..6392c89 100644
--- a/roles/composer/tasks/main.yml
+++ b/roles/composer/tasks/main.yml
@@ -1,3 +1,4 @@
 ---
 
 - include: install.yml
+- include: cleanup.yml
diff --git a/roles/repo_remi/tasks/main.yml b/roles/repo_remi/tasks/main.yml
index edafb83..d4ff390 100644
--- a/roles/repo_remi/tasks/main.yml
+++ b/roles/repo_remi/tasks/main.yml
@@ -12,7 +12,7 @@
   yum: name=remi-release state=absent
   tags: repo
 
-- name: Configure Remi Safe repository
+- name: Configure Remi repository
   yum_repository:
     name: remi
     description: Remi's RPM repository for Enterprise Linux
@@ -21,3 +21,8 @@
     gpgkey: "{{ repo_remi_gpg_url }}"
   tags: repo
 
+# Note : we use a template here because yum_repository doesn't support module_hotfix attribute
+- name: Configure Remi modular repository
+  template: src=remi-modular.repo.j2 dest=/etc/yum.repos.d/remi-modular.repo
+  when: ansible_distribution_major_version is version('8','>=')
+  tags: repo
diff --git a/roles/repo_remi/templates/remi-modular.repo.j2 b/roles/repo_remi/templates/remi-modular.repo.j2
new file mode 100644
index 0000000..d5de783
--- /dev/null
+++ b/roles/repo_remi/templates/remi-modular.repo.j2
@@ -0,0 +1,6 @@
+[remi-modular]
+baseurl = http://rpms.remirepo.net/enterprise/$releasever/modular/$basearch/
+gpgcheck = 1
+gpgkey = {{ repo_remi_gpg_url }}
+name = Remi's Modular repository for Enterprise Linux
+module_hotfixes = true