diff --git a/.github/workflows/gen-diffs.yaml b/.github/workflows/gen-diffs.yaml
index da40787c2b..bd5930d6c4 100644
--- a/.github/workflows/gen-diffs.yaml
+++ b/.github/workflows/gen-diffs.yaml
@@ -21,12 +21,12 @@ jobs:
     - name: Install sshpass, kicad, and tk bindings
       run: |
         sudo bash misc/actions/add-ubuntu-latest-apt-mirrors.sh
-        sudo add-apt-repository --yes ppa:kicad/kicad-6.0-releases
+        sudo add-apt-repository --yes ppa:kicad/kicad-7.0-releases
         sudo apt-get install sshpass kicad python3-pip python3-tk scour librsvg2-bin
         pip install python-dateutil pygubu
 
     - name: Get KiCad-Diff
-      run: git clone https://github.com/leoheck/KiCad-Diff.git
+      run: git clone -b exit-nicely https://github.com/chuckwagoncomputing/KiCad-Diff.git
 
     - name: Set SSH variables
       env:
diff --git a/.github/workflows/gen-ibom.yaml b/.github/workflows/gen-ibom.yaml
index 978cd95642..953e74daec 100644
--- a/.github/workflows/gen-ibom.yaml
+++ b/.github/workflows/gen-ibom.yaml
@@ -3,6 +3,7 @@ name: Generate Interactive BOMs
 on:
   schedule:
     - cron: '0 0 * * *'
+  workflow_dispatch:
 
 jobs:
   generate:
@@ -18,6 +19,7 @@ jobs:
     - name: Install prerequisite software
       run: |
         sudo bash misc/actions/add-ubuntu-latest-apt-mirrors.sh
+        sudo add-apt-repository --yes ppa:kicad/kicad-7.0-releases
         sudo apt-get install kicad sshpass
 
     - name: Set SSH variables
diff --git a/.gitignore b/.gitignore
index 13a012f48f..724fd9b896 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ err.txt
 log.txt
 *.rusefi_binary
 *.msq
+*.kicad_prl
 
 # Eclipse
 .metadata/
diff --git a/hardware/InteractiveHtmlBom b/hardware/InteractiveHtmlBom
index f447335471..c444135ba2 160000
--- a/hardware/InteractiveHtmlBom
+++ b/hardware/InteractiveHtmlBom
@@ -1 +1 @@
-Subproject commit f447335471eef988353253b52fb4cc409a6f4d73
+Subproject commit c444135ba2fcab8e8dd4af5a25d8d068d8f9eb69
diff --git a/hardware/rusefi_lib b/hardware/rusefi_lib
index bb13948230..6f95125ede 160000
--- a/hardware/rusefi_lib
+++ b/hardware/rusefi_lib
@@ -1 +1 @@
-Subproject commit bb139482308d6d41c7682669ebdf1563fd54c0bd
+Subproject commit 6f95125ede0cd79ac943646ba923cc5db0515922
diff --git a/misc/jenkins/InteractiveHtmlBom/run.sh b/misc/jenkins/InteractiveHtmlBom/run.sh
index 038ba3a356..0575dbc45a 100644
--- a/misc/jenkins/InteractiveHtmlBom/run.sh
+++ b/misc/jenkins/InteractiveHtmlBom/run.sh
@@ -1,16 +1,17 @@
 #!/bin/bash
 
 INTERACTIVE_HTML_BOM_NO_DISPLAY="true"
-IBOM_CMD="python3 hardware/InteractiveHtmlBom/InteractiveHtmlBom/generate_interactive_bom.py --no-browser --name-format \"%f_latest\" --dest-dir ../ibom --include-nets"
-echo "IBOM_CMD=$IBOM_CMD"
+ibom() {
+  python3 hardware/InteractiveHtmlBom/InteractiveHtmlBom/generate_interactive_bom.py --no-browser --name-format "%f_latest" --dest-dir ../ibom --include-nets $@
+}
 
-pwd
-[ -e hardware/frankenso/frankenso.kicad_pcb ] || { echo "hardware/frankenso/frankenso.kicad_pcb not found. Was this invoked from wrong folder?"; exit -1; }
+echo "Current directory: $(pwd)"
+[ $(basename $(pwd)) = 'rusefi' ] || { echo "Not in 'rusefi' directory. Was this invoked from the wrong directory?"; exit 1; }
 
 for f in $(ls hardware/*/*.kicad_pcb); do
   if ls $(dirname $f)/$(basename $f .kicad_pcb).net 2>/dev/null; then
-    $IBOM_CMD --netlist-file $(ls $(dirname $f)/$(basename $f .kicad_pcb).net) $f
+    ibom --netlist-file $(ls $(dirname $f)/$(basename $f .kicad_pcb).net) $f
   else
-    $IBOM_CMD $f
+    ibom $f
   fi
 done
diff --git a/misc/jenkins/generate_ibom/gen_upload_ibom.sh b/misc/jenkins/generate_ibom/gen_upload_ibom.sh
index 6107f22ab6..56ea3adba4 100644
--- a/misc/jenkins/generate_ibom/gen_upload_ibom.sh
+++ b/misc/jenkins/generate_ibom/gen_upload_ibom.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo "Should be executed from project root folder. Will try to upload to $RUSEFI_FTP_SERVER"
+echo "Should be executed from project root folder. Will try to upload to $RUSEFI_SSH_SERVER"
 pwd
 # ibom is part of Doxygen job simply in order to reduce workspace HDD usage on my tiny build server
 bash misc/jenkins/InteractiveHtmlBom/run.sh