diff --git a/post-install.yml b/post-install.yml
index dfeb82b2..8abfc42e 100644
--- a/post-install.yml
+++ b/post-install.yml
@@ -86,6 +86,29 @@
         mode: 0775
         recurse: yes
 
+    - name: Chown default.settings.yml
+      file:
+        dest: "{{ drupal_core_path }}/sites/default/default.settings.php"
+        state: file
+        owner: "{{ webserver_app_user }}"
+        group: "{{ webserver_app_user }}"
+        mode: 0664
+
+    - name: Chown default.services.yml
+      file:
+        dest: "{{ drupal_core_path }}/sites/default/default.services.yml"
+        state: file
+        owner: "{{ webserver_app_user }}"
+        group: "{{ webserver_app_user }}"
+        mode: 0664
+
+    - name: Remove drupal scaffolding
+      composer:
+        command: remove
+        arguments: "drupal/core-composer-scaffold"
+        working_dir: "{{ drupal_composer_install_dir }}"
+      ignore_errors: yes
+
     - name: Clear cache
       command: "{{ drush_path }} --root {{ drupal_core_path }} -y cr"