diff --git a/roles/cmp-docker-oauth2/tasks/main.yml b/roles/cmp-docker-oauth2/tasks/main.yml
index 5ed999f9..faee448b 100644
--- a/roles/cmp-docker-oauth2/tasks/main.yml
+++ b/roles/cmp-docker-oauth2/tasks/main.yml
@@ -4,11 +4,10 @@
   include_role: 
     name: docker-compose
 
-- name: "set oauth2_proxy_application_id (Needed due to lazzy loading issue)"
-  set_fact:
-    oauth2_proxy_application_id: "{{ application_id }}"
-  when: applications | get_app_conf(application_id, 'features.oauth2', False)
-
-- name: "include the web-app-oauth2-proxy role {{domain}}"
-  include_tasks: "{{ playbook_dir }}/roles/web-app-oauth2-proxy/tasks/main.yml"
+- block:
+    - name: "set oauth2_proxy_application_id (Needed due to lazzy loading issue)"
+      set_fact:
+        oauth2_proxy_application_id: "{{ application_id }}"
+    - name: "include the web-app-oauth2-proxy role {{domain}}"
+      include_tasks: "{{ playbook_dir }}/roles/web-app-oauth2-proxy/tasks/main.yml"
   when: applications | get_app_conf(application_id, 'features.oauth2', False)
\ No newline at end of file