diff --git a/roles/web-opt-rdr-www/tasks/main.yml b/roles/web-opt-rdr-www/tasks/main.yml
index 84d97e19..f30bea45 100644
--- a/roles/web-opt-rdr-www/tasks/main.yml
+++ b/roles/web-opt-rdr-www/tasks/main.yml
@@ -13,29 +13,8 @@
     redirect_domain_mappings: "{{ REDIRECT_WWW_DOMAINS | map('regex_replace', '^www\\.(.+)$', '{ source: \"www.\\1\", target: \"\\1\" }') | map('from_yaml') | list }}"
   when: REDIRECT_WWW_FLAVOR == 'origin'
 
-- name: Cloudflare WWW Routines
-  when: DNS_PROVIDER == 'cloudflare'
-  block:
-    - name: Include DNS role to set redirects
-      include_role:
-        name: sys-dns-cloudflare-records
-      vars:
-        cloudflare_records: |
-          {%- set bare = REDIRECT_WWW_DOMAINS | map('regex_replace', '^www\\.(.+)$', '\\1') | list -%}
-          [
-          {%- for d in bare -%}
-            {
-              "type": "A",
-              "zone": "{{ d | to_zone }}",
-              "name": "{{ d }}",
-              "content": "{{ networks.internet.ip4 }}",
-              "proxied": {{ REDIRECT_WWW_FLAVOR == 'edge' }},
-              "ttl": 1
-            }{{ "," if not loop.last else "" }}
-          {%- endfor -%}
-          ]
-      when: REDIRECT_WWW_FLAVOR == 'origin'
-
-    - name: Include Cloudflare edge redirect
-      include_tasks: _01_cloudflare_edge_redirect.yml
-      when: REDIRECT_WWW_FLAVOR == 'edge'
+- name: Include Cloudflare edge redirect
+  include_tasks: _01_cloudflare_edge_redirect.yml
+  when: 
+    - DNS_PROVIDER == 'cloudflare'
+    - REDIRECT_WWW_FLAVOR == 'edge'