diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 05c138d1..35064c07 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -225,8 +225,14 @@ STATUS(){
 										toterrtime=`date +%s`-$(stat -c %Y ${FOLDER}/${nip}-${srvc}.down)
 									fi
 									if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "${NM_SERVICES[${srvc}]} is back UP! It was down for $(SHOW_TIME ${toterrtime})" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL}; fi
-									rm -f ${FOLDER}/${nip}-${srvc}.down
-									rm -f ${FOLDER}/${nip}-${srvc}.errtime
+
+									if [ "${srvc}" == "pdnsadmin" ] || [ "${srvc}" == "gitea" ]; then
+										rm -f ${FOLDER}/*-${srvc}.down
+										rm -f ${FOLDER}/*-${srvc}.errtime
+									else
+										rm -f ${FOLDER}/${nip}-${srvc}.down
+										rm -f ${FOLDER}/${nip}-${srvc}.errtime
+									fi
 								fi
 							fi
 						fi