diff --git a/tasks/package.yml b/tasks/install_apt.yml
similarity index 84%
rename from tasks/package.yml
rename to tasks/install_apt.yml
index f8f1fad..e8230f9 100644
--- a/tasks/package.yml
+++ b/tasks/install_apt.yml
@@ -1,4 +1,4 @@
-# file: nginx/tasks/package.yml
+# file: nginx/tasks/install_apt.yml
 
 - name: Nginx | Make sure the ansible required dependencies are installed
   apt:
@@ -15,5 +15,3 @@
     state: present
   notify:
     - restart nginx
-
-- include: directories.yml
diff --git a/tasks/source.yml b/tasks/install_source.yml
similarity index 97%
rename from tasks/source.yml
rename to tasks/install_source.yml
index 9ebfcf8..203c5b9 100644
--- a/tasks/source.yml
+++ b/tasks/install_source.yml
@@ -1,4 +1,4 @@
-# file: nginx/tasks/source.yml
+# file: nginx/tasks/install_source.yml
 
 - include: user.yml
 - include: directories.yml
diff --git a/tasks/install_yum.yml b/tasks/install_yum.yml
new file mode 100644
index 0000000..11d7abd
--- /dev/null
+++ b/tasks/install_yum.yml
@@ -0,0 +1,13 @@
+# file: nginx/tasks/install_yum.yml
+
+- name: Nginx | Add the nginx repository
+  template:
+    src: nginx.repo.j2
+    dest: /etc/yum.repos.d/nginx.repo
+
+- name: Nginx | Make sure nginx is installed (package)
+  yum:
+    pkg: nginx
+    state: present
+  notify:
+    - restart nginx
diff --git a/tasks/main.yml b/tasks/main.yml
index f4fcfd3..fb4b398 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,9 +1,12 @@
 # file: nginx/tasks/main.yml
 
-- include: package.yml
-  when: nginx_install_method == "package"
-- include: source.yml
+- include: install_apt.yml
+  when: nginx_install_method == "package" and ansible_pkg_mgr == "apt"
+- include: install_yum.yml
+  when: nginx_install_method == "package" and ansible_pkg_mgr == "yum"
+- include: install_source.yml
   when: nginx_install_method == "source"
+- include: directories.yml
 - include: scripts.yml
 - include: configure.yml
 - include: default_site.yml
diff --git a/templates/nginx.repo.j2 b/templates/nginx.repo.j2
new file mode 100644
index 0000000..9e8cdc0
--- /dev/null
+++ b/templates/nginx.repo.j2
@@ -0,0 +1,5 @@
+[nginx]
+name=nginx repo
+baseurl=http://nginx.org/packages/{{ ansible_distribution | lower }}/{{ ansible_distribution_major_version }}/$basearch/
+gpgcheck=0
+enabled=1