diff --git a/scripts/metobs_config.sh b/scripts/metobs_config.sh
index 1138cba120246715e22ec75ffa5d84e1fdb4dfea..5a835d71f7647e0529db6e4f65d93d6ee4f0194a 100644
--- a/scripts/metobs_config.sh
+++ b/scripts/metobs_config.sh
@@ -28,7 +28,7 @@ day_before() {
 }
 
 work_dir() {
-    mktemp -d --tmpdir="$WORKDIR" "work_$1_"
+    mktemp -d --tmpdir="$WORKDIR" "work_$1_XXXXXXXXXX" || oops "Could not create work directory: $1"
 }
 
 cache_level_00_file() {
diff --git a/scripts/run_tower_level_b1.sh b/scripts/run_tower_level_b1.sh
index 0a2be60dc1622b108c6b3f3bd7cf34cfa4a413e1..fe99113cc1fb95bd921266fd3b5b612b66dcbe1d 100755
--- a/scripts/run_tower_level_b1.sh
+++ b/scripts/run_tower_level_b1.sh
@@ -59,6 +59,9 @@ fi
     log_info "Moving Level B1 quicklooks from temp directory to cache"
     $ENV/bin/python -m metobscommon.archive.incoming -vv -l $logfile --dates=${DATE} b1 aoss.tower "$tmp_dir/aoss_tower.*.png" || oops "Quicklook archive failed"
 
+    # Delete the working directory
+    rm -rf $tmp_dir || oops "Could not delete working directory: $tmp_dir"
+
     log_info "Done"
 
 ) 200>$LOCK