diff --git a/defaults/main.yml b/defaults/main.yml
index 79c9b36..e1e5597 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -8,12 +8,17 @@
     gpgcheck: "1",
     gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-apigee",
     priority: "$apigeepriority",
-    exclude: "$apigeeexclude" }
+    exclude: "$apigeeexclude",
+    repo_filename: "apigee" }
 - { name: "Apigee Thirdparty Repo",
     baseurl: "$apigeeprotocol$apigeecredentialswithat$apigeerepohost$apigeerepobasepath/thirdparty/$releasever",
     repo_id: "apigee-thirdparty",
     gpgcheck: "0",
     gpgkey: "",
     priority: "$apigeepriority",
-    exclude: "" }
-
+    exclude: "" ,
+    repo_filename: "apigee" }
+- { name: "Artifactory",
+    repo_id: "Artifactory",
+    baseurl: "https://oneartifactory.verizon.com/artifactory/dl-fedoraproject-org-epel7-x86_64",
+    gpgcheck: "0" }
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
index f888277..adba210 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,17 +1,7 @@
 ---
 # tasks file for apigee-opdk-yum-repository-proxy-config
-- 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 }}"
-     proxy: "{{ https_proxy }}"
-     file: '{{ apigee_yum_repo_filename }}'
-  with_items: "{{ apigee_yum_repositories }}"
+- include: with_proxy.yml
   when: https_proxy is defined
+
+- include: with_no_proxy.yml
+  when: https_proxy is not defined
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
new file mode 100644
index 0000000..4c58eb9
--- /dev/null
+++ b/tasks/with_no_proxy.yml
@@ -0,0 +1,14 @@
+---
+- 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 }}'
+  with_items: "{{ apigee_yum_repositories }}"
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
new file mode 100644
index 0000000..58372e5
--- /dev/null
+++ b/tasks/with_proxy.yml
@@ -0,0 +1,15 @@
+---
+- 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 }}"
+     proxy: "{{ https_proxy }}"
+     file: '{{ item.repo_filename }}'
+  with_items: "{{ apigee_yum_repositories }}"