diff --git a/suricata/on_boot.d/25-suricata.sh b/suricata/on_boot.d/25-suricata.sh
index 954d27a..dca4bd1 100644
--- a/suricata/on_boot.d/25-suricata.sh
+++ b/suricata/on_boot.d/25-suricata.sh
@@ -2,21 +2,30 @@
 
 APP_PID="/run/suricata.pid"
 
-echo "#!/bin/sh
-CUSTOM_RULES=\"/mnt/data/suricata-rules\"
+cat <<"EOF" > /tmp/suricata.sh
+#!/bin/sh
+CUSTOM_RULES="/mnt/data/suricata-rules"
 
-for file in \"\$CUSTOM_RULES\"/*.rules
+for file in $(find ${CUSTOM_RULES} -name '*.rules' -print)
 do
-    if [ -f \"\$file\" ]; then
-        cp \"\$file\" \"/run/ips/rules/\$(basename \"\$file\")\"
-        echo \" - \$(basename \"\$file\")\" >> /run/ips/config/rules.yaml
+    if [ -f "${file}" ]; then
+        bname=$(basename ${file})
+        cp "${file}" "/run/ips/rules/${bname}"
+        # Check if the existing filename is already in the rules.yaml based upon a previous update
+        grep -wq "${bname}" /run/ips/config/rules.yaml 
+        # Don't add twice if it is in the file already
+        if [ $? -ne 0 ]; then 
+            echo " - ${bname}" >> /run/ips/config/rules.yaml
+        fi
     fi
 done
 CONTAINER=suricata
-if podman container exists \${CONTAINER}; then
-  podman rm -f \${CONTAINER}
+if podman container exists ${CONTAINER}; then
+  podman rm -f ${CONTAINER}
 fi
-podman run --network=host --privileged --name \${CONTAINER} --rm -it -v /run:/var/run/ -v /run:/run  -v /usr/share/ubios-udapi-server/ips/:/usr/share/ubios-udapi-server/ips/ jasonish/suricata:5.0.3-arm64v8 /usr/bin/suricata \"\$@\"" > /tmp/suricata.sh
+podman run --network=host --privileged --name ${CONTAINER} --rm -it -v /run:/var/run/ -v /run:/run  -v /usr/share/ubios-udapi-server/ips/:/usr/share/ubios-udapi-server/ips/ jasonish/suricata:5.0.3-arm64v8 /usr/bin/suricata "$@" 
+
+EOF
 
 chmod +x /tmp/suricata.sh
 cp /usr/bin/suricata /tmp/suricata.backup # In case you want to move back without rebooting
@@ -25,4 +34,4 @@ ln -f -s /tmp/suricata.sh /usr/bin/suricata
 if [ ! -z "$APP_PID" ]; then
   killall -9 suricata
   rm -f APP_PID
-fi
\ No newline at end of file
+fi