diff --git a/.github/workflows/startos-iso.yaml b/.github/workflows/startos-iso.yaml
index 2871b5fb1..891c83fed 100644
--- a/.github/workflows/startos-iso.yaml
+++ b/.github/workflows/startos-iso.yaml
@@ -75,6 +75,9 @@ jobs:
         )[github.event.inputs.runner == 'fast']
       }}
     steps:
+      - name: Free space
+        run: df -h && rm -rf /opt/hostedtoolcache* && df -h
+
       - run: |
           sudo mount -t tmpfs tmpfs .
         if: ${{ github.event.inputs.runner == 'fast' && (matrix.platform == 'x86_64' || matrix.platform == 'x86_64-nonfree' || github.event.inputs.platform == matrix.platform) }}
@@ -103,7 +106,7 @@ jobs:
         id: npm-cache-dir
         run: |
           echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
-      - uses: buildjet/cache@v3
+      - uses: actions/cache@v3
         id: npm-cache
         with:
           path: ${{ steps.npm-cache-dir.outputs.dir }}
@@ -153,7 +156,7 @@ jobs:
       - run: sudo mount -t tmpfs tmpfs /var/tmp/debspawn
         if: ${{ github.event.inputs.runner == 'fast' && (matrix.platform == 'x86_64' || matrix.platform == 'x86_64-nonfree') }}
 
-      - uses: buildjet/cache@v3
+      - uses: actions/cache@v3
         with:
           path: /var/lib/debspawn
           key: ${{ runner.os }}-${{ matrix.platform }}-debspawn-init
@@ -162,7 +165,7 @@ jobs:
 
       - run: "mv embassy-os-deb/embassyos_0.3.x-1_*.deb startos-image-recipes/overlays/deb/"
 
-      - run: "rm -rf embassy-os-deb"
+      - run: "rm -rf embassy-os-deb ${{ steps.npm-cache-dir.outputs.dir }} $HOME/.cargo"
 
       - name: Run iso build
         working-directory: startos-image-recipes
diff --git a/backend/src/db/model.rs b/backend/src/db/model.rs
index e78ca4bab..0024f76c6 100644
--- a/backend/src/db/model.rs
+++ b/backend/src/db/model.rs
@@ -107,6 +107,7 @@ pub struct ServerInfo {
     pub lan_address: Url,
     pub tor_address: Url,
     #[model]
+    #[serde(default)]
     pub ip_info: BTreeMap<String, IpInfo>,
     #[model]
     #[serde(default)]
diff --git a/build/lib/motd b/build/lib/motd
index b4a4d255c..25c83a8a4 100644
--- a/build/lib/motd
+++ b/build/lib/motd
@@ -10,7 +10,7 @@ cat << "ASCII"
 ╰ ━ ━ ━ ╯ ╰ ━ ┻ ╯ ╰ ┻ ╯ ╰ ━ ┻ ━ ━ ━ ┻ ━ ━ ━ ╯
 ASCII
 printf "   %s (%s %s)\n" "$(uname -o)" "$(uname -r)" "$(uname -m)"
-printf "   $(embassy-cli --version | sed 's/StartOS CLI /StartOS v/g') - $(embassy-cli git-info)"
+printf "   $(start-cli --version | sed 's/StartOS CLI /StartOS v/g') - $(start-cli git-info)"
 if [ -n "$(cat /usr/lib/embassy/ENVIRONMENT.txt)" ]; then
     printf " ~ $(cat /usr/lib/embassy/ENVIRONMENT.txt)\n"
 else