diff --git a/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary b/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary
index 8752f048..fab8a834 100755
--- a/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary
+++ b/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary
@@ -8,10 +8,8 @@ if [ -n "$SUBARCH" ]; then
     exit 0
 fi
 
-. config/functions
-
 # This is the directory created by 031-0-create-root-dir.binary
 rootfs_dir=rootfs.dir
 
 cp $rootfs_dir.manifest livecd.ubuntu-cpc.rootfs.manifest
-(cd "$rootfs_dir/" && tar -c *) | xz > "livecd.ubuntu-cpc.rootfs.tar.xz"
+(cd $rootfs_dir/ && tar -c *) | xz > livecd.ubuntu-cpc.rootfs.tar.xz
diff --git a/live-build/ubuntu-cpc/hooks/031-2-root-squashfs.binary b/live-build/ubuntu-cpc/hooks/031-2-root-squashfs.binary
index 5d2b0901..f4c2ac3d 100755
--- a/live-build/ubuntu-cpc/hooks/031-2-root-squashfs.binary
+++ b/live-build/ubuntu-cpc/hooks/031-2-root-squashfs.binary
@@ -20,10 +20,10 @@ fi
 # This is the directory created by 031-0-create-root-dir.binary
 rootfs_dir=rootfs.dir
 
-squashfs_f="${PWD}/livecd.ubuntu-cpc.squashfs"
+squashfs_f="$PWD/livecd.ubuntu-cpc.squashfs"
 
-cp $rootfs_dir.manifest "${squashfs_f}.manifest"
+cp $rootfs_dir.manifest $squashfs_f.manifest
 
-(cd "$rootfs_dir" &&
-      mksquashfs . ${squashfs_f} \
+(cd $rootfs_dir &&
+      mksquashfs . $squashfs_f \
         -no-progress -xattrs -comp xz )