diff --git a/.github/workflows/main2.yml b/.github/workflows/main2.yml
index 80a6b58a..bfb6448d 100644
--- a/.github/workflows/main2.yml
+++ b/.github/workflows/main2.yml
@@ -84,7 +84,16 @@ jobs:
       run:  |
         cd ${{ runner.temp }}
         git clone --branch v1.5.0 https://github.com/JuulLabs-OSS/mcuboot
-      
+
+    - name: Install imgtool dependencies
+      run:  pip3 install --user -r ${{ runner.temp }}/mcuboot/scripts/requirements.txt
+
+    - name: Install adafruit-nrfutil
+      run:  |
+        pip3 install --user wheel
+        pip3 install --user setuptools
+        pip3 install --user adafruit-nrfutil
+        
     #########################################################################################
     # Checkout
       
@@ -116,40 +125,30 @@ jobs:
         cd build
         make pinetime-mcuboot-app
 
-    - name: Install imgtool dependencies
-      run:  pip3 install --user -r ${{ runner.temp }}/mcuboot/scripts/requirements.txt
-
-    - name: Install adafruit-nrfutil
-      run:  |
-        pip3 install --user wheel
-        pip3 install --user setuptools
-        pip3 install --user adafruit-nrfutil
-        ~/.local/bin/adafruit-nrfutil --help
-        
     - name: Create firmware image
-      run:  ${{ runner.temp }}/mcuboot/scripts/imgtool.py create --align 4 --version 1.0.0 --header-size 32 --slot-size 475136 --pad-header build/src/pinetime-mcuboot-app.bin build/src/pinetime-mcuboot-app.img
+      run:  ${{ runner.temp }}/mcuboot/scripts/imgtool.py create --align 4 --version 1.0.0 --header-size 32 --slot-size 475136 --pad-header build/src/pinetime-mcuboot-app.bin build/src/pinetime-mcuboot-app-img.bin
 
     - name: Verify firmware image
-      run:  ${{ runner.temp }}/mcuboot/scripts/imgtool.py verify build/src/pinetime-mcuboot-app.img
+      run:  ${{ runner.temp }}/mcuboot/scripts/imgtool.py verify build/src/pinetime-mcuboot-app-img.bin
 
     - name: Create DFU package
-      run:  ~/.local/bin/adafruit-nrfutil dfu genpkg --dev-type 0x0052 --application build/src/pinetime-mcuboot-app.img build/src/pinetime-mcuboot-app-dfu.zip
+      run:  ~/.local/bin/adafruit-nrfutil dfu genpkg --dev-type 0x0052 --application build/src/pinetime-mcuboot-app-img.bin build/src/pinetime-mcuboot-app-dfu.zip
 
-    - name: Upload pinetime-mcuboot-app
+    - name: Upload DFU package
       uses: actions/upload-artifact@v2
       with:
         name: pinetime-mcuboot-app.img
         path: build/src/pinetime-mcuboot-app-dfu.zip
 
     #########################################################################################
-    # Make and Upload pinetime-app
+    # Make and Upload Standalone Firmware
       
     - name: Make pinetime-app
       run:  |
         cd build
         make pinetime-app
 
-    - name: Upload pinetime-app
+    - name: Upload standalone firmware
       uses: actions/upload-artifact@v2
       with:
         name: pinetime-app.out