diff --git a/Earthfile b/Earthfile
index 9e879f17d..f6e2c64be 100644
--- a/Earthfile
+++ b/Earthfile
@@ -692,9 +692,9 @@ arm-image:
     ENV RECOVERY_SIZE="10000"
     ENV DEFAULT_ACTIVE_SIZE="4500"
   ELSE IF [[ "$FLAVOR" =~ ^ubuntu* ]]
-    ENV STATE_SIZE="6900"
-    ENV RECOVERY_SIZE="4600"
     ENV DEFAULT_ACTIVE_SIZE="2700"
+    ENV STATE_SIZE="8100" # Has to be DEFAULT_ACTIVE_SIZE * 3 due to upgrade
+    ENV RECOVERY_SIZE="5400" # Has to be DEFAULT_ACTIVE_SIZE * 2 due to upgrade
   ELSE
     ENV STATE_SIZE="6200"
     ENV RECOVERY_SIZE="4200"
@@ -735,9 +735,9 @@ prepare-arm-image:
     ENV RECOVERY_SIZE="10000"
     ENV DEFAULT_ACTIVE_SIZE="4500"
   ELSE IF [[ "$FLAVOR" =~ ^ubuntu* ]]
-    ENV STATE_SIZE="6900"
-    ENV RECOVERY_SIZE="4600"
-    ENV DEFAULT_ACTIVE_SIZE="2500"
+    ENV DEFAULT_ACTIVE_SIZE="2700"
+    ENV STATE_SIZE="8100" # Has to be DEFAULT_ACTIVE_SIZE * 3 due to upgrade
+    ENV RECOVERY_SIZE="5400" # Has to be DEFAULT_ACTIVE_SIZE * 2 due to upgrade
   ELSE
     ENV STATE_SIZE="6200"
     ENV RECOVERY_SIZE="4200"