diff --git a/roles/docker-sphinx/templates/configuration.yml b/roles/docker-sphinx/vars/configuration.yml
similarity index 100%
rename from roles/docker-sphinx/templates/configuration.yml
rename to roles/docker-sphinx/vars/configuration.yml
diff --git a/roles/nginx-modifier-all/tasks/main.yml b/roles/nginx-modifier-all/tasks/main.yml
index 00ec6ded..b63a230c 100644
--- a/roles/nginx-modifier-all/tasks/main.yml
+++ b/roles/nginx-modifier-all/tasks/main.yml
@@ -1,9 +1,9 @@
 - name: "Activate Global CSS for {{domain}}"
   include_role:
     name: nginx-modifier-css
-  when: applications.get(application_id).get('features').get('css') | bool
+  when: applications | is_feature_enabled('css',application_id)
 
 - name: "Activate Global Matomo Tracking for {{domain}}"
   include_role:
     name: nginx-modifier-matomo
-  when: applications.get(application_id).get('features').get('matomo') | bool
\ No newline at end of file
+  when: applications | is_feature_enabled('matomo',application_id)
\ No newline at end of file