diff --git a/roles/compute-node/tasks/i40e_driver.yml b/roles/compute-node/tasks/i40e_driver.yml
index 78bd3ef..69c1e96 100644
--- a/roles/compute-node/tasks/i40e_driver.yml
+++ b/roles/compute-node/tasks/i40e_driver.yml
@@ -3,8 +3,6 @@
   unarchive:
     src=files/i40e-1.4.25.tar.gz
     dest=/home/{{ ansible_user }}
-    owner={{ ansible_user }}
-    group={{ ansible_user }}
 
 - name: Build i40e Driver
   command: make
diff --git a/roles/head-node/files/commands/cord-registry b/roles/head-node/files/commands/cord-registry
index c4faacb..45b6cdd 100755
--- a/roles/head-node/files/commands/cord-registry
+++ b/roles/head-node/files/commands/cord-registry
@@ -63,7 +63,7 @@
             for i in $(curl -sSL http://$REG/v2/_catalog | jq '.repositories | .[]' | sed -e 's/"//g'); do
                 /bin/echo -n "$COMMA{\"registry\":\"${REG}/$i\",\"tags\":["
                 C2=
-                for t in $(curl -sSL http://$REG/v2/redis/tags/list | jq '.tags | .[]' | sed -e 's/"//g'); do
+                for t in $(curl -sSL http://$REG/v2/$i/tags/list | jq '.tags | .[]' | sed -e 's/"//g'); do
                     echo -n "${C2}\"$t\""
                     C2=","
                 done
@@ -75,7 +75,7 @@
             OUT=$(mktemp)
             echo "REPOSITORY,TAG" > $OUT
             for i in $(curl -sSL http://$REG/v2/_catalog | jq '.repositories | .[]' | sed -e 's/"//g'); do
-                for t in $(curl -sSL http://$REG/v2/redis/tags/list | jq '.tags | .[]' | sed -e 's/"//g'); do
+                for t in $(curl -sSL http://$REG/v2/$i/tags/list | jq '.tags + [] | .[]' | sed -e 's/"//g'); do
                     /bin/echo -e "${REG}/$i,$t" >> $OUT
                 done
             done