diff --git a/.github/workflows/test-powerfail-simulator.yml b/.github/workflows/test-powerfail-simulator.yml
index 3892dc19f..1d99a3ba7 100644
--- a/.github/workflows/test-powerfail-simulator.yml
+++ b/.github/workflows/test-powerfail-simulator.yml
@@ -17,7 +17,7 @@ jobs:
 
       - name: make clean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config
         run: |
@@ -63,16 +63,12 @@ jobs:
       # TEST with NVM_FLASH_WRITEONCE enabled
       - name: make clean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config with NVM_FLASH_WRITEONCE
         run: |
           cp config/examples/sim-nvm-writeonce.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-internal-flash-with-update
@@ -109,16 +105,12 @@ jobs:
       # TEST with NVM_FLASH_WRITEONCE AND FLAGS_HOME enabled
       - name: make clean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config with NVM_FLASH_WRITEONCE and FLAGS_HOME
         run: |
           cp config/examples/sim-nvm-writeonce-flags-home.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-internal-flash-with-update
@@ -155,16 +147,12 @@ jobs:
       # TEST with NVM_FLASH_WRITEONCE AND FLAGS_HOME AND FLAGS_INVERT enabled
       - name: make clean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config with NVM_FLASH_WRITEONCE and FLAGS_HOME and FLAGS_INVERT
         run: |
           cp config/examples/sim-nvm-writeonce-flags-home-invert.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-external-flash-with-update
@@ -201,16 +189,12 @@ jobs:
       # TEST with DELTA updates
       - name: make clean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config with DELTA updates
         run: |
           cp config/examples/sim-delta-update.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-internal-flash-with-delta-update
@@ -254,16 +238,12 @@ jobs:
      # TEST with encryption (aes128)
       - name: make clean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config with encrypted updates
         run: |
           cp config/examples/sim-encrypt-update.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-external-flash-with-enc-update
@@ -299,15 +279,11 @@ jobs:
      # TEST with encryption (aes128) and delta updates
       - name: make clean
         run: |
-          make distclean
+          make keysclean
       - name: Select config with encrypted updates
         run: |
           cp config/examples/sim-encrypt-delta-update.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-external-flash-with-enc-delta-update
@@ -336,16 +312,12 @@ jobs:
      # TEST with encryption (aes128) and NVM_FLASH_WRITEONCE
       - name: make clean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config with encrypted updates
         run: |
           cp config/examples/sim-encrypt-nvm-writeonce-update.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-external-flash-with-enc-update
@@ -463,15 +435,11 @@ jobs:
      # TEST with encryption (aes128) and NVM_FLASH_WRITEONCE and DELTA updates
       - name: make clean
         run: |
-          make distclean
+          make keysclean
       - name: Select config with encrypted updates
         run: |
           cp config/examples/sim-encrypt-delta-nvm-writeonce-update.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-external-flash-with-enc-delta-update
@@ -499,15 +467,11 @@ jobs:
     # TEST with backup disabled
       - name: make clean
         run: |
-          make distclean
+          make keysclean
       - name: Select config with backup disabled
         run: |
           cp config/examples/sim-nobackup.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-internal-flash-with-update
@@ -527,15 +491,11 @@ jobs:
     # TEST with backup disabled + NVM_FLASH_WRITEONCE
       - name: make clean
         run: |
-          make distclean
+          make keysclean
       - name: Select config with backup disabled + NVM WRITEONCE
         run: |
           cp config/examples/sim-nobackup-nvm-writeonce.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-internal-flash-with-update
@@ -555,15 +515,11 @@ jobs:
     # TEST with backup disabled + FLAGS_HOME
       - name: make clean
         run: |
-          make distclean
+          make keysclean
       - name: Select config with backup disabled + FLAGS_HOME
         run: |
           cp config/examples/sim-nobackup-flags-home.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf
         run: |
           make clean && make test-sim-internal-flash-with-update
@@ -584,16 +540,12 @@ jobs:
     # TEST with FLASH_MULTI_SECTOR_ERASE
       - name: make clean
         run: |
-          make distclean
+          make keysclean
 
       - name: Select config
         run: |
           cp config/examples/sim.config .config
 
-      - name: Build tools
-        run: |
-          make -C tools/keytools && make -C tools/bin-assemble
-
       - name: Build wolfboot.elf (FLASH_MULTI_SECTOR_ERASE=1)
         run: |
           make clean && make test-sim-internal-flash-with-update FLASH_MULTI_SECTOR_ERASE=1