diff --git a/tasks/main.yml b/tasks/main.yml
index 5db1b88..62d012f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,21 +1,9 @@
 ---
 # tasks file for external-port-connectivity-validator-server
-- name: Source server to connect from
-  debug:
-    msg: 'Source Server: {{ local_address }}'
+- name: Do not use proxy definitions
+  include: with_no_proxy.yml
+  when: http_proxy is not defined and https_proxy is not defined
 
-- name: Validate for open port {{ target_server }}:{{ check_port }}
-  uri:
-    url: 'http://{{ target_server }}:{{ check_port }}/check'
-  environment:
-    http_proxy: http://proxy.ebiz.verizon.com:80
-    https_proxy: http://proxy.ebiz.verizon.com:80
-
-- name: Shutdown validation server {{ target_server }}:{{ check_port }}
-  uri:
-    url: 'http://{{ target_server }}:{{ check_port }}/done'
-  register: done
-  failed_when: not done.failed
-  environment:
-    http_proxy: http://proxy.ebiz.verizon.com:80
-    https_proxy: http://proxy.ebiz.verizon.com:80
+- name: Use proxy definitions
+  include: with_proxy.yml
+  when: http_proxy is defined and https_proxy is defined
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
new file mode 100644
index 0000000..e831b85
--- /dev/null
+++ b/tasks/with_no_proxy.yml
@@ -0,0 +1,16 @@
+---
+---
+# tasks file for external-port-connectivity-validator-server
+- name: Source server to connect from
+  debug:
+    msg: 'Source Server: {{ local_address }}'
+
+- name: Validate for open port {{ target_server }}:{{ check_port }}
+  uri:
+    url: 'http://{{ target_server }}:{{ check_port }}/check'
+
+- name: Shutdown validation server {{ target_server }}:{{ check_port }}
+  uri:
+    url: 'http://{{ target_server }}:{{ check_port }}/done'
+  register: done
+  failed_when: not done.failed
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
new file mode 100644
index 0000000..49e19ea
--- /dev/null
+++ b/tasks/with_proxy.yml
@@ -0,0 +1,22 @@
+---
+---
+# tasks file for external-port-connectivity-validator-server
+- name: Source server to connect from
+  debug:
+    msg: 'Source Server: {{ local_address }}'
+
+- name: Validate for open port {{ target_server }}:{{ check_port }}
+  uri:
+    url: 'http://{{ target_server }}:{{ check_port }}/check'
+  environment:
+    http_proxy: "{{ http_proxy }}"
+    https_proxy: "{{ https_proxy }}"
+
+- name: Shutdown validation server {{ target_server }}:{{ check_port }}
+  uri:
+    url: 'http://{{ target_server }}:{{ check_port }}/done'
+  register: done
+  failed_when: not done.failed
+  environment:
+    http_proxy: "{{ http_proxy }}"
+    https_proxy: "{{ https_proxy }}"