diff --git a/toolkit/imageconfigs/files/osguard/repart.d/12-usr-a.conf b/toolkit/imageconfigs/files/osguard/repart.d/12-usr-a.conf
index 47bd86864c3..e4f13f8e878 100644
--- a/toolkit/imageconfigs/files/osguard/repart.d/12-usr-a.conf
+++ b/toolkit/imageconfigs/files/osguard/repart.d/12-usr-a.conf
@@ -1,5 +1,5 @@
 [Partition]
-Type=usr
+Type=linux-generic
 Label=usr-a
 SizeMinBytes=1G
 SizeMaxBytes=1G
diff --git a/toolkit/imageconfigs/files/osguard/repart.d/16-usr-b.conf b/toolkit/imageconfigs/files/osguard/repart.d/16-usr-b.conf
index d5983e152fd..1563e763204 100644
--- a/toolkit/imageconfigs/files/osguard/repart.d/16-usr-b.conf
+++ b/toolkit/imageconfigs/files/osguard/repart.d/16-usr-b.conf
@@ -1,5 +1,5 @@
 [Partition]
-Type=usr
+Type=linux-generic
 Label=usr-b
 SizeMinBytes=1G
 SizeMaxBytes=1G
diff --git a/toolkit/scripts/generate-repartd.sh b/toolkit/scripts/generate-repartd.sh
index a49e53d447d..4133d7fee5d 100755
--- a/toolkit/scripts/generate-repartd.sh
+++ b/toolkit/scripts/generate-repartd.sh
@@ -12,14 +12,7 @@ rm -f "$REPART_DIR"/*.conf
 
 emit_partition() {
     local num="$1" part="$2" type="$3" label="$4" size="$5"
-    # Set Type for root and root-hash partitions
-    if [[ "$part" =~ ^usr-(a|b)$ ]]; then
-        type_out="usr"
-    elif [[ "$part" =~ ^usr-hash-(a|b)$ ]]; then
-        type_out="usr-verity"
-    else
-        type_out="$type"
-    fi
+    type_out="$type"
     
     # Ensure label is never null
     if [[ -z "$label" || "$label" == "null" ]]; then