diff --git a/labs/osbash/lib/osbash/lib.fedora-20-x86_64 b/labs/osbash/lib/osbash/lib.fedora-20-x86_64
index 7a38ab24..52066af4 100644
--- a/labs/osbash/lib/osbash/lib.fedora-20-x86_64
+++ b/labs/osbash/lib/osbash/lib.fedora-20-x86_64
@@ -13,9 +13,9 @@ VM_BASE_MEM=1024
 readonly ISO_URL=http://mirror.switch.ch/ftp/mirror/fedora/linux/releases/20/Fedora/x86_64/iso/Fedora-20-x86_64-DVD.iso
 readonly ISO_MD5=9a190c8b2bd382c2d046dbc855cd2f2b
 
-readonly _KS_ssh=http://git.openstack.org/cgit/openstack/training-guides/plain/labs/lib/osbash/netboot/ks-ssh-v2.cfg
-readonly _KS_vbadd=http://git.openstack.org/cgit/openstack/training-guides/plain/labs/lib/osbash/netboot/ks-vbadd.cfg
-readonly _KS_all=http://git.openstack.org/cgit/openstack/training-guides/plain/labs/lib/osbash/netboot/ks-all-v2.cfg
+readonly _KS_ssh=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/ks-ssh-v2.cfg
+readonly _KS_vbadd=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/ks-vbadd.cfg
+readonly _KS_all=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/ks-all-v2.cfg
 
 readonly _BOOT_ARGS="linux ks=%s"
 
diff --git a/labs/osbash/lib/osbash/lib.ubuntu-12.04.4-server-amd64 b/labs/osbash/lib/osbash/lib.ubuntu-12.04.4-server-amd64
index e751dc3e..786b5025 100644
--- a/labs/osbash/lib/osbash/lib.ubuntu-12.04.4-server-amd64
+++ b/labs/osbash/lib/osbash/lib.ubuntu-12.04.4-server-amd64
@@ -10,9 +10,9 @@
 readonly ISO_URL=http://releases.ubuntu.com/12.04/ubuntu-12.04.4-server-amd64.iso
 
 # Note: Ubuntu 12.04 LTS cannot pull a preseed file over HTTPS
-readonly _PS_ssh=http://git.openstack.org/cgit/openstack/training-guides/plain/labs/lib/osbash/netboot/preseed-ssh-v2.cfg
-readonly _PS_vbadd=http://git.openstack.org/cgit/openstack/training-guides/plain/labs/lib/osbash/netboot/preseed-vbadd.cfg
-readonly _PS_all=http://git.openstack.org/cgit/openstack/training-guides/plain/labs/lib/osbash/netboot/preseed-all-v2.cfg
+readonly _PS_ssh=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/preseed-ssh-v2.cfg
+readonly _PS_vbadd=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/preseed-vbadd.cfg
+readonly _PS_all=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/preseed-all-v2.cfg
 
 readonly _BOOT_ARGS="/install/vmlinuz
     noapic
diff --git a/labs/osbash/lib/osbash/lib.ubuntu-14.04-server-amd64 b/labs/osbash/lib/osbash/lib.ubuntu-14.04-server-amd64
index c06d57df..dbd402c0 100644
--- a/labs/osbash/lib/osbash/lib.ubuntu-14.04-server-amd64
+++ b/labs/osbash/lib/osbash/lib.ubuntu-14.04-server-amd64
@@ -10,9 +10,9 @@
 readonly ISO_URL=http://releases.ubuntu.com/14.04/ubuntu-14.04.3-server-amd64.iso
 readonly ISO_MD5=9e5fecc94b3925bededed0fdca1bd417
 
-readonly _PS_ssh=http://git.openstack.org/cgit/openstack/training-guides/plain/labs/lib/osbash/netboot/preseed-ssh-v2.cfg
-readonly _PS_vbadd=http://git.openstack.org/cgit/openstack/training-guides/plain/labs/lib/osbash/netboot/preseed-vbadd.cfg
-readonly _PS_all=http://git.openstack.org/cgit/openstack/training-guides/plain/labs/lib/osbash/netboot/preseed-all-v2.cfg
+readonly _PS_ssh=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/preseed-ssh-v2.cfg
+readonly _PS_vbadd=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/preseed-vbadd.cfg
+readonly _PS_all=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/preseed-all-v2.cfg
 
 readonly _BOOT_ARGS="/install/vmlinuz
     noapic
diff --git a/labs/osbash/lib/osbash/netboot/ks-all-v2.cfg b/labs/osbash/lib/osbash/netboot/ks-all-v2.cfg
index 65283a12..58861910 100644
--- a/labs/osbash/lib/osbash/netboot/ks-all-v2.cfg
+++ b/labs/osbash/lib/osbash/netboot/ks-all-v2.cfg
@@ -46,7 +46,7 @@ logvol / --fstype=ext4 --name=root --vgname=ROOTDISK --size=1 --grow
 %post --interpreter=/bin/bash
 DIR=/home/osbash/.ssh
 mkdir $DIR
-wget -O $DIR/authorized_keys https://git.openstack.org/cgit/openstack/training-guides/plain/labs/lib/osbash-ssh-keys/osbash_key.pub
+wget -O $DIR/authorized_keys https://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash-ssh-keys/osbash_key.pub
 chmod 700 $DIR
 chmod 400 $DIR/authorized_keys
 chown -R osbash:osbash $DIR
diff --git a/labs/osbash/lib/osbash/netboot/ks-ssh-v2.cfg b/labs/osbash/lib/osbash/netboot/ks-ssh-v2.cfg
index fdd8cc22..ac85ad9c 100644
--- a/labs/osbash/lib/osbash/netboot/ks-ssh-v2.cfg
+++ b/labs/osbash/lib/osbash/netboot/ks-ssh-v2.cfg
@@ -45,7 +45,7 @@ logvol / --fstype=ext4 --name=root --vgname=ROOTDISK --size=1 --grow
 %post --interpreter=/bin/bash
 DIR=/home/osbash/.ssh
 mkdir $DIR
-wget -O $DIR/authorized_keys https://git.openstack.org/cgit/openstack/training-guides/plain/labs/lib/osbash-ssh-keys/osbash_key.pub
+wget -O $DIR/authorized_keys https://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash-ssh-keys/osbash_key.pub
 chmod 700 $DIR
 chmod 400 $DIR/authorized_keys
 chown -R osbash:osbash $DIR
diff --git a/labs/osbash/lib/osbash/netboot/preseed-all-v2.cfg b/labs/osbash/lib/osbash/netboot/preseed-all-v2.cfg
index ed59a5d4..2182b822 100644
--- a/labs/osbash/lib/osbash/netboot/preseed-all-v2.cfg
+++ b/labs/osbash/lib/osbash/netboot/preseed-all-v2.cfg
@@ -117,4 +117,4 @@ d-i debian-installer/add-kernel-opts string vga=0x301 nomodeset
 # still a usable /target directory. You can chroot to /target and use it
 # directly, or use the apt-install and in-target commands to easily install
 # packages and run commands in the target system.
-d-i preseed/late_command string echo "DIR=/home/osbash/.ssh; mkdir \$DIR; wget -O \$DIR/authorized_keys https://git.openstack.org/cgit/openstack/training-guides/plain/labs/lib/osbash-ssh-keys/osbash_key.pub ; chmod 700 \$DIR; chmod 400 \$DIR/authorized_keys; chown -R osbash:osbash \$DIR; echo 'osbash ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers; echo 'Defaults:osbash !requiretty' >> /etc/sudoers; apt-get -y purge virtualbox-guest-dkms virtualbox-guest-utils; mount /dev/sr1 /mnt; /mnt/VBoxLinuxAdditions.run; umount /mnt; echo -e '#!/bin/bash\nexec > /root/bootstrap.log 2>&1\nset -x\nSCR=/media/sf_bootstrap/autostart/*activate_autostart.sh\nwhile [ ! -f \$SCR ];do sleep 1;done\nbash \$SCR\nrm -v \$SCR' > /etc/rc2.d/S40osbash; chmod 755 /etc/rc2.d/S40osbash;" | chroot /target /bin/bash;
+d-i preseed/late_command string echo "DIR=/home/osbash/.ssh; mkdir \$DIR; wget -O \$DIR/authorized_keys https://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash-ssh-keys/osbash_key.pub ; chmod 700 \$DIR; chmod 400 \$DIR/authorized_keys; chown -R osbash:osbash \$DIR; echo 'osbash ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers; echo 'Defaults:osbash !requiretty' >> /etc/sudoers; apt-get -y purge virtualbox-guest-dkms virtualbox-guest-utils; mount /dev/sr1 /mnt; /mnt/VBoxLinuxAdditions.run; umount /mnt; echo -e '#!/bin/bash\nexec > /root/bootstrap.log 2>&1\nset -x\nSCR=/media/sf_bootstrap/autostart/*activate_autostart.sh\nwhile [ ! -f \$SCR ];do sleep 1;done\nbash \$SCR\nrm -v \$SCR' > /etc/rc2.d/S40osbash; chmod 755 /etc/rc2.d/S40osbash;" | chroot /target /bin/bash;
diff --git a/labs/osbash/lib/osbash/netboot/preseed-ssh-v2.cfg b/labs/osbash/lib/osbash/netboot/preseed-ssh-v2.cfg
index 558cd64c..0b3a5215 100644
--- a/labs/osbash/lib/osbash/netboot/preseed-ssh-v2.cfg
+++ b/labs/osbash/lib/osbash/netboot/preseed-ssh-v2.cfg
@@ -117,4 +117,4 @@ d-i debian-installer/add-kernel-opts string vga=0x301 nomodeset
 # still a usable /target directory. You can chroot to /target and use it
 # directly, or use the apt-install and in-target commands to easily install
 # packages and run commands in the target system.
-d-i preseed/late_command string echo "DIR=/home/osbash/.ssh; mkdir \$DIR; wget -O \$DIR/authorized_keys https://git.openstack.org/cgit/openstack/training-guides/plain/labs/lib/osbash-ssh-keys/osbash_key.pub ; chmod 700 \$DIR; chmod 400 \$DIR/authorized_keys; chown -R osbash:osbash \$DIR; echo 'osbash ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers; echo 'Defaults:osbash !requiretty' >> /etc/sudoers;" | chroot /target /bin/bash;
+d-i preseed/late_command string echo "DIR=/home/osbash/.ssh; mkdir \$DIR; wget -O \$DIR/authorized_keys https://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash-ssh-keys/osbash_key.pub ; chmod 700 \$DIR; chmod 400 \$DIR/authorized_keys; chown -R osbash:osbash \$DIR; echo 'osbash ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers; echo 'Defaults:osbash !requiretty' >> /etc/sudoers;" | chroot /target /bin/bash;