diff --git a/defaults/main.yml b/defaults/main.yml
index 9a753ca..693cfe6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -49,9 +49,13 @@ repo_build_apt_packages:
   - python-dev
   - swig
 
-repo_build_pip_default_index: "https://pypi.python.org/simple"
-repo_build_pip_extra_indexes:
-  - "https://pypi.python.org/simple"
+# Optionally set this to change the default index from pypi to an alternative
+#repo_build_pip_default_index: "https://pypi.python.org/simple"
+
+# Optionally set this to a list of extra indexes to be used when building wheels
+#repo_build_pip_extra_indexes:
+#  - "https://pypi.python.org/simple"
+
 # TODO(odyssey4me): Deprecate this var for Mitaka & mark for removal
 #                   in Newton.
 # repo_build_pip_extra_index: "https://pypi.python.org/simple"
diff --git a/tasks/repo_build.yml b/tasks/repo_build.yml
index 797b3c7..d32566d 100644
--- a/tasks/repo_build.yml
+++ b/tasks/repo_build.yml
@@ -20,12 +20,12 @@
               --find-links {{ repo_build_global_links_path }} \
               --find-links {{ repo_build_output }} \
               --constraint {{ repo_build_release_path }}/{{ repo_build_release_tag }}/requirements_constraints.txt \
-              --index-url {{ repo_build_pip_default_index }} \
-              --trusted-host {{ repo_build_pip_default_index | netloc_no_port }} \
+              {% if repo_build_pip_default_index is defined %}--index-url {{ repo_build_pip_default_index }} \
+              --trusted-host {{ repo_build_pip_default_index | netloc_no_port }} \{% endif %}
               {% if repo_build_pip_extra_index is defined %}--extra-index-url {{ repo_build_pip_extra_index }} \
               --trusted-host {{ repo_build_pip_extra_index | netloc_no_port }} \{% endif %}
-              --extra-index-url {{ repo_build_pip_extra_indexes | join(' --extra-index-url ') }} \
-              --trusted-host {{ repo_build_pip_extra_indexes | map('netloc_no_port') | join(' --trusted-host ') }} \
+              {% if repo_build_pip_extra_indexes is defined %}--extra-index-url {{ repo_build_pip_extra_indexes | join(' --extra-index-url ') }} \
+              --trusted-host {{ repo_build_pip_extra_indexes | map('netloc_no_port') | join(' --trusted-host ') }} \{% endif %}
               --build {{ repo_build_dir }} \
               --log /var/log/repo/repo_builder.log \
               --requirement {{ repo_build_release_path }}/{{ repo_build_release_tag }}/requirements_global_requirements.txt
@@ -40,12 +40,12 @@
               --find-links {{ repo_build_global_links_path }} \
               --find-links {{ repo_build_output }} \
               --constraint {{ repo_build_release_path }}/{{ repo_build_release_tag }}/requirements_constraints.txt \
-              --index-url {{ repo_build_pip_default_index }} \
-              --trusted-host {{ repo_build_pip_default_index | netloc_no_port }} \
+              {% if repo_build_pip_default_index is defined %}--index-url {{ repo_build_pip_default_index }} \
+              --trusted-host {{ repo_build_pip_default_index | netloc_no_port }} \{% endif %}
               {% if repo_build_pip_extra_index is defined %}--extra-index-url {{ repo_build_pip_extra_index }} \
               --trusted-host {{ repo_build_pip_extra_index | netloc_no_port }} \{% endif %}
-              --extra-index-url {{ repo_build_pip_extra_indexes | join(' --extra-index-url ') }} \
-              --trusted-host {{ repo_build_pip_extra_indexes | map('netloc_no_port') | join(' --trusted-host ') }} \
+              {% if repo_build_pip_extra_indexes is defined %}--extra-index-url {{ repo_build_pip_extra_indexes | join(' --extra-index-url ') }} \
+              --trusted-host {{ repo_build_pip_extra_indexes | map('netloc_no_port') | join(' --trusted-host ') }} \{% endif %}
               --build {{ repo_build_dir }} \
               --log /var/log/repo/repo_builder.log \
               --requirement {{ repo_build_release_path }}/{{ repo_build_release_tag }}/requirements_local_filtered.txt
diff --git a/templates/op-release-script.sh.j2 b/templates/op-release-script.sh.j2
index b999bad..7dcf87e 100644
--- a/templates/op-release-script.sh.j2
+++ b/templates/op-release-script.sh.j2
@@ -57,4 +57,5 @@ build_repo "${DIRECTORY}" "${NAME_LOWER}" "${RAW_NAME}"
 unset PKG_DIRECTORY
 unset PKG_LOWER
 
-{% endfor %}
\ No newline at end of file
+{% endfor %}
+