diff --git a/tasks/main.yml b/tasks/main.yml
index 4dafbdf080d2dd7a00ed574cf88d4ddda366dab2..1592e37822a667d35883906012f7fb661b5827a2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -51,7 +51,16 @@
       with_items: '{{ drupal_settings|default([]) }}'
       loop_control:
         loop_var: drupal
-      when: limit_site is not defined or limit_site == 'no' or drupal.id is not defined or limit_site == drupal.id
+      when: siteproject is not defined and (limit_site is not defined or limit_site == 'no' or drupal.id is not defined or limit_site == drupal.id)
+      tags:
+        - deploy
+
+    - name: Collect Drupal Configuration NG
+      include_tasks: collect_config/main.yml
+      with_items: '{{ drupal_settings|default([]) }}'
+      loop_control:
+        loop_var: drupal
+      when: limit_site is not defined and (siteproject is not defined or siteproject == 'no' or drupal.siteproject is not defined or (siteproject == drupal.siteproject and drupal.src.git.branch == 'master'))
       tags:
         - deploy