diff --git a/cl-lxc b/cl-lxc
index 714a44d..2914fe9 100755
--- a/cl-lxc
+++ b/cl-lxc
@@ -549,6 +549,7 @@ update_prepare() {
 	cl-update -s
 	einfo $"Launching package update"
 	lxc-attach $name_lxc -- cl-update -f
+	rm -rf "$path_lxc/rootfs/var/calculate/{tmp/*,templates/*}"
 
 	ebegin $"Stopping container"
 	lxc-stop $name_lxc
@@ -592,6 +593,7 @@ upgrade_lxc() {
 		reflink='--reflink'
 	fi
 	cp -a $reflink $path_lxc_prepare $path_work/$name_upgrading/rootfs$num_next
+	rm -rf $path_work/$name_upgrading/rootfs$num_next/var/calculate/*
 	eend
 
 	ebegin $"Copying network settings from main container"
@@ -608,7 +610,7 @@ upgrade_lxc() {
 cat << EOL > $path_work/$name_upgrading/rootfs$num_next/etc/local.d/firststart.start
 cl-core --method setup_system --no-progress --usenew-conf --network on
 openrc
-#rm /etc/local.d/firststart.start
+rm /etc/local.d/firststart.start
 EOL
 	chmod 755 $path_work/$name_upgrading/rootfs$num_next/etc/local.d/firststart.start
 	eend
