diff --git a/tasks/main.yml b/tasks/main.yml
index 201b66b..45dca82 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,7 +1,20 @@
 ---
 # tasks file for apigee-opdk-yum-repository-proxy-config
-- include: with_proxy.yml
-  when: yum_repositories is defined and https_proxy is defined and https_proxy | trim != '' and http_proxy is defined and http_proxy | trim != ''
-
-- include: with_no_proxy.yml
-  when: yum_repositories is defined and (https_proxy is not defined or https_proxy | trim == '') and (http_proxy is not defined or http_proxy | trim == '')
+- name: Configure Apigee Yum repositories
+  yum_repository:
+     enabled: "{{ item.enabled | default(true) }}"
+     state: "{{ item.state | default('present') }}"
+     name: "{{ item.repo_id }}"
+     description: "{{ item.name }}"
+     baseurl: "{{ item.baseurl }}"
+     gpgcheck: "{{ item.gpgcheck }}"
+     gpgkey: "{{ item.gpgkey }}"
+     priority: "{{ item.priority }}"
+     exclude: "{{ item.exclude }}"
+     file: '{{ item.repo_filename }}'
+     sslverify: '{{ item.sslverify }}'
+  with_items: "{{ yum_repositories }}"
+  environment:
+    http_proxy: "{{ http_proxy }}"
+    https_proxy: "{{ https_proxy }}"
+    no_proxy: "{{ no_proxy }}"
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
deleted file mode 100644
index 3e18ca1..0000000
--- a/tasks/with_no_proxy.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- name: Configure Apigee Yum repositories
-  yum_repository:
-     enabled: "{{ item.enabled | default(true} }}"
-     state: "{{ item.state | default('present') }}"
-     name: "{{ item.repo_id }}"
-     description: "{{ item.name }}"
-     baseurl: "{{ item.baseurl }}"
-     gpgcheck: "{{ item.gpgcheck }}"
-     gpgkey: "{{ item.gpgkey }}"
-     priority: "{{ item.priority }}"
-     exclude: "{{ item.exclude }}"
-     file: '{{ item.repo_filename }}'
-     sslverify: '{{ item.sslverify }}'
-  with_items: "{{ yum_repositories }}"
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
deleted file mode 100644
index 463e9bc..0000000
--- a/tasks/with_proxy.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: Configure Apigee Yum repositories
-  yum_repository:
-     enabled: true
-     state: present
-     name: "{{ item.repo_id }}"
-     description: "{{ item.name }}"
-     baseurl: "{{ item.baseurl }}"
-     gpgcheck: "{{ item.gpgcheck }}"
-     gpgkey: "{{ item.gpgkey }}"
-     priority: "{{ item.priority }}"
-     exclude: "{{ item.exclude }}"
-     file: '{{ item.repo_filename }}'
-     sslverify: '{{ item.sslverify }}'
-  with_items: "{{ yum_repositories }}"
-  environment:
-    http_proxy: "{{ http_proxy }}"
-    https_proxy: "{{ https_proxy }}"
-    no_proxy: "{{ no_proxy }}"