diff --git a/stack.sh b/stack.sh
index b47729e..660a529 100755
--- a/stack.sh
+++ b/stack.sh
@@ -418,14 +418,13 @@ if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then
 
     # extract ami-tty/image, aki-tty/image & ari-tty/image
     mkdir -p $FILES/images
-    cd $FILES/images
-    tar -zxf $DEST/tty.tgz
+    tar -zxf $FILES/tty.tgz -C $FILES/images
 
     # add images to glance 
     # FIXME: kernel/ramdisk is hardcoded - use return result from add
-    glance add name="tty-kernel" is_public=true container_format=aki disk_format=aki < aki-tty/image 
-    glance add name="tty-ramdisk" is_public=true container_format=ari disk_format=ari < ari-tty/image 
-    glance add name="tty" is_public=true container_format=ami disk_format=ami kernel_id=1 ramdisk_id=2 < ami-tty/image
+    glance add name="tty-kernel" is_public=true container_format=aki disk_format=aki < $FILES/images/aki-tty/image 
+    glance add name="tty-ramdisk" is_public=true container_format=ari disk_format=ari < $FILES/images/ari-tty/image 
+    glance add name="tty" is_public=true container_format=ami disk_format=ami kernel_id=1 ramdisk_id=2 < $FILES/images/ami-tty/image
 fi
 
 # Using the cloud