diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 896d5ccad..4f5c3c517 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -54,18 +54,28 @@ jobs:
       run: |
         pio upgrade
 
-    - name: Build for tbeam
-      run: platformio run -e tbeam
-    - name: Build for heltec
-      run: platformio run -e heltec
-    - name: Build for wisblock RAK4631
-      run: platformio run -e rak4631
+    # We now run integration test before other build steps (to quickly see runtime failures)
     - name: Build for native
       run: platformio run -e native
     - name: Integration test
       run: |
         .pio/build/native/program &
-        sleep 30 # 5 seconds was not enough
+        sleep 20 # 5 seconds was not enough
         echo "Simulator started, launching python test..."
         python3 -c 'from meshtastic.test import testSimulator; testSimulator()'
 
+    # - name: Build for tbeam
+    #   run: platformio run -e tbeam
+    # - name: Build for heltec
+    #   run: platformio run -e heltec
+    # - name: Build for wisblock RAK4631
+    #   run: platformio run -e rak4631
+
+    - name: Build everything
+      run: bin/build-all.sh
+
+    - name: Store release zip as an artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: firmware
+        path: release/archive/firmware-*.zip 
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 982b81300..826eaac58 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,10 +14,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="58922733-b05b-4b90-9655-b9b18914977a" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.github/workflows/main.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.github/workflows/main.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/mesh/mesh-pb-constants.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/src/mesh/mesh-pb-constants.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/mqtt/MQTT.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/mqtt/MQTT.h" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -102,7 +99,7 @@
       <workItem from="1617279002260" duration="1626000" />
       <workItem from="1617425689081" duration="1896000" />
       <workItem from="1617437366919" duration="1182000" />
-      <workItem from="1618544034975" duration="586000" />
+      <workItem from="1618544034975" duration="1185000" />
     </task>
     <servers />
   </component>
diff --git a/bin/build-all.sh b/bin/build-all.sh
index 9ad4d58d0..be3889aeb 100755
--- a/bin/build-all.sh
+++ b/bin/build-all.sh
@@ -4,8 +4,8 @@ set -e
 
 VERSION=`bin/buildinfo.py`
 
-BOARDS_ESP32="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec tbeam0.7"
-#BOARDS_ESP32=tbeam
+#BOARDS_ESP32="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec tbeam0.7"
+BOARDS_ESP32=tbeam
 
 # FIXME note nrf52840dk build is for some reason only generating a BIN file but not a HEX file nrf52840dk-geeksville is fine
 BOARDS_NRF52="rak4631"