diff --git a/tasks/main.yml b/tasks/main.yml
index 62f92bfa32570fc94f23549ae09205a58dd86f33..b7f6dae31ba91e7723d6571539e495bb0d573853 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -25,32 +25,10 @@
   - name: "Renew Existing Cert"
     include: '../../letsencrypt/tasks/renew.yml'
 
-  - name: "Build HaCerts"
+  - name: "Build HaProxy Certs"
     include: 'buildcerts.yml'
 
-  - name: "Set directory permissions to current user"
-    file:
-      path: '/etc/letsencrypt'
-      owner: '{{ ansible_env.SUDO_USER }}'
-      recurse: yes
-    tags: 'Certs'
-    when: proxy_active
-
   tags: 'Certs'
   when: 'proxy_active and "letsencrypt" not in excluded_roles'
 
-- block:
-
-  - name: "Pull Certs from active Proxy"
-    include: 'pullcerts.yml'
-    tags: 'Certs'
-
-  when: 'not proxy_active and "letsencrypt" not in excluded_roles'
-
-- name: "Set directory permissions to root"
-  file:
-    path: '/etc/letsencrypt'
-    owner: 'root'
-    recurse: yes
-  tags: 'Certs'
-  when: 'proxy_active and "letsencrypt" not in excluded_roles'
+- include_tasks: 'proxypool.yml'
diff --git a/tasks/proxypool.yml b/tasks/proxypool.yml
new file mode 100644
index 0000000000000000000000000000000000000000..4db3c9da6d9709a899958b99564b0c79062f659d
--- /dev/null
+++ b/tasks/proxypool.yml
@@ -0,0 +1,23 @@
+---
+# file: roles/haproxy/tasks/proxypool.yml
+
+- name: "Set directory permissions to current user"
+  file:
+    path: '/etc/letsencrypt'
+    owner: '{{ ansible_env.SUDO_USER }}'
+    recurse: yes
+  tags: 'Certs'
+  when: 'proxy_active is defined and proxy_active and "letsencrypt" not in excluded_roles'
+
+- name: "Pull Certs from active Proxy"
+  include: 'pullcerts.yml'
+  tags: 'Certs'
+  when: 'proxy_active is defined and not proxy_active and "letsencrypt" not in excluded_roles'
+
+- name: "Set directory permissions to root"
+  file:
+    path: '/etc/letsencrypt'
+    owner: 'root'
+    recurse: yes
+  tags: 'Certs'
+  when: 'proxy_active is defined and proxy_active and "letsencrypt" not in excluded_roles'