diff --git a/repo_maintenance/push-bb.org.sh b/repo_maintenance/push-bb.org.sh
index 8380fc71abcc4e9a179fbbcadeec8286fa02d51a..2add669ad4c052d05f5c9d781753c4acb373331d 100755
--- a/repo_maintenance/push-bb.org.sh
+++ b/repo_maintenance/push-bb.org.sh
@@ -22,7 +22,8 @@
 
 #yeah, i'm getting lazy..
 
-wfile="/tmp/5_4_bone_git_msg"
+wfile=$(mktemp /tmp/builder.XXXXXXXXX)
+echo "Working on temp $wfile ..."
 
 cat_files () {
 	if [ -f ../patches/git/AUFS ] ; then
@@ -99,3 +100,5 @@ if [ -e ${DIR}/version.sh ]; then
 	cd ${DIR}/
 fi
 
+echo "Deleting $wfile ..."
+rm -f "$wfile"
diff --git a/repo_maintenance/push-kernel-n-test.sh b/repo_maintenance/push-kernel-n-test.sh
index b22d8ed4c9adf2d36da029c0a034087718abe5a0..c91ffd9e8cf94f2c1d6090c71c3c384256acd3df 100755
--- a/repo_maintenance/push-kernel-n-test.sh
+++ b/repo_maintenance/push-kernel-n-test.sh
@@ -2,7 +2,8 @@
 
 #yeah, i'm getting lazy..
 
-wfile="/tmp/5_4_bone_git_msg"
+wfile=$(mktemp /tmp/builder.XXXXXXXXX)
+echo "Working on temp $wfile ..."
 
 cat_files () {
 	if [ -f ./patches/git/AUFS ] ; then
@@ -55,3 +56,5 @@ if [ -e ${DIR}/version.sh ]; then
 	${git_bin} push origin ${BRANCH}
 fi
 
+echo "Deleting $wfile ..."
+rm -f "$wfile"
diff --git a/repo_maintenance/push-n-tag-release.sh b/repo_maintenance/push-n-tag-release.sh
index 30f77ef15446e54ffa60d1ffa7eda07e15e778d3..693757ad886ce8324a39175af15cda716f2e6968 100755
--- a/repo_maintenance/push-n-tag-release.sh
+++ b/repo_maintenance/push-n-tag-release.sh
@@ -22,7 +22,8 @@
 
 #yeah, i'm getting lazy..
 
-wfile="/tmp/5_4_bone_git_msg"
+wfile=$(mktemp /tmp/builder.XXXXXXXXX)
+echo "Working on temp $wfile ..."
 
 cat_files () {
 	if [ -f ./patches/git/AUFS ] ; then
@@ -90,3 +91,5 @@ if [ -e ${DIR}/version.sh ]; then
 	cd ${DIR}/
 fi
 
+echo "Deleting $wfile ..."
+rm -f "$wfile"
diff --git a/tools/host_det.sh b/tools/host_det.sh
index 571ea1676990f3d2c1829a5d7073d8738a97c4ff..1177d7859f22bf5e62e835b38bbe292d3e2ccea9 100755
--- a/tools/host_det.sh
+++ b/tools/host_det.sh
@@ -433,13 +433,18 @@ debian_regs () {
 			warn_eol_distro=1
 			stop_pkg_search=1
 			;;
-		bionic|cosmic|disco|eoan)
-			#18.04 bionic: (EOL: April 2023) lts: bionic -> xyz
-			#18.10 cosmic: (EOL: July 2019)
-			#19.04 disco: (EOL: )
-			#19.10 eoan: (EOL: )
+		bionic|disco|eoan|focal)
+			#18.04 bionic: (EOL: April 2023) lts: bionic -> focal
+			#19.04 disco: (EOL: July, 2020)
+			#19.10 eoan: (EOL: January, 2020)
+			#20.04 focal: (EOL: ) lts: focal -> xyz
 			unset warn_eol_distro
 			;;
+		cosmic)
+			#18.10 cosmic: (EOL: July 18, 2019)
+			warn_eol_distro=1
+			stop_pkg_search=1
+			;;
 		yakkety|zesty|artful)
 			#16.10 yakkety: (EOL: July 20, 2017)
 			#17.04 zesty: (EOL: January 2018)