diff --git a/scripts/create_image_live_from_rootfs.sh b/scripts/create_image_live_from_rootfs.sh
index bf436d6..cf38f15 100755
--- a/scripts/create_image_live_from_rootfs.sh
+++ b/scripts/create_image_live_from_rootfs.sh
@@ -38,6 +38,11 @@ server_env="build_method=$build_method rootfs_url=$rootfs_url signal_build_done_
 server_id=$(create_server "$server_type" "$server_creation_opts" "$server_name" 50G "$server_env" "$bootscript_id")
 [ $? -eq 0 ] || exiterr
 
+function finish {
+    rm_server $server_id
+}
+trap finish EXIT
+
 boot_server $server_id || exiterr
 
 wait_for_port $server_id $signal_port || exiterr
@@ -48,4 +53,4 @@ _scw wait $server_id
 
 image_from_volume $server_id $arch "$image_name" "$image_bootscript" >$OUTPUT_ID_TO || exiterr
 
-rm_server $server_id
+finish