diff --git a/roles/copy-wheels/files/wheel-copy.sh b/roles/copy-wheels/files/wheel-copy.sh
index fe7b810fe5..f9ee0fffa0 100755
--- a/roles/copy-wheels/files/wheel-copy.sh
+++ b/roles/copy-wheels/files/wheel-copy.sh
@@ -22,10 +22,6 @@ for f in $WHEELHOUSE_DIR/*; do
 
     DEST_DIR="${PACKAGENAME:0:1}/$PACKAGENAME"
 
-    # Create the index file
-    # NOTE(ianw) : remove temporary "--output" when working
-    /usr/local/bin/wheel-indexer.py --debug --output "index.html.tmp" $f
-
     # Create the mirror directories in AFS /s/split style. This
     # depends on the existence of a mod_rewrite script which unmunges
     # the path, and is required because AFS has a practical folder size
diff --git a/roles/copy-wheels/files/wheel-index.sh b/roles/copy-wheels/files/wheel-index.sh
index e34de1780d..5118ca41d8 100755
--- a/roles/copy-wheels/files/wheel-index.sh
+++ b/roles/copy-wheels/files/wheel-index.sh
@@ -20,6 +20,11 @@ REGEX="([^/])\/(\1[^/]+)$"
 for f in $FILES; do
     if [[ $f =~ $REGEX ]]; then
         echo "      <li><a href=\"./${BASH_REMATCH[2]}/\">${BASH_REMATCH[2]}</a></li>" >> $TMP_INDEX_FILE
+
+        # Run the indexer over this directory
+        # NOTE(ianw) : remove temporary "--output" when working
+        /usr/local/bin/wheel-indexer.py --debug --output "index.html.tmp" $MIRROR_ROOT/$f
+
     fi
 done
 
diff --git a/roles/copy-wheels/tasks/main.yaml b/roles/copy-wheels/tasks/main.yaml
index 46f1c14247..052cc087af 100644
--- a/roles/copy-wheels/tasks/main.yaml
+++ b/roles/copy-wheels/tasks/main.yaml
@@ -14,6 +14,7 @@
     group: root
     mode: '0755'
   loop:
+    - wheel-index.sh
     - wheel-copy.sh
     - wheel-indexer.py
   become: yes
@@ -22,7 +23,7 @@
   command: '/usr/local/bin/wheel-copy.sh {{ wheel_dir }} {{ afs_dir }}'
 
 - name: Rebuild top-level mirror index
-  script: wheel-index.sh {{ afs_dir }}
+  command: '/usr/local/bin/wheel-index.sh {{ afs_dir }}'
   # With multiple python2/3 builds, we only need one host to generate
   # the final index.  All hosts should be finished copying under
   # linear strategy.