diff --git a/samples/base-qcow2.json b/samples/base-qcow2.json
index 0dd7ccab..79673e73 100644
--- a/samples/base-qcow2.json
+++ b/samples/base-qcow2.json
@@ -39,8 +39,8 @@
             "uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
             "vfs_type": "ext4",
             "path": "/",
-            "freq": "1",
-            "passno": "1"
+            "freq": 1,
+            "passno": 1
           }
         ]
       }
diff --git a/samples/base-rawfs.json b/samples/base-rawfs.json
index 53bce3c3..0682832f 100644
--- a/samples/base-rawfs.json
+++ b/samples/base-rawfs.json
@@ -40,8 +40,8 @@
             "uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
             "vfs_type": "ext4",
             "path": "/",
-            "freq": "1",
-            "passno": "1"
+            "freq": 1,
+            "passno": 1
           }
         ]
       }
diff --git a/samples/base-rpm-qcow2.json b/samples/base-rpm-qcow2.json
index 10ade360..44e9ddec 100644
--- a/samples/base-rpm-qcow2.json
+++ b/samples/base-rpm-qcow2.json
@@ -1320,8 +1320,8 @@
             "uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
             "vfs_type": "ext4",
             "path": "/",
-            "freq": "1",
-            "passno": "1"
+            "freq": 1,
+            "passno": 1
           }
         ]
       }
diff --git a/samples/cloud-base.json b/samples/cloud-base.json
index 4cd8a013..03ae9ed6 100644
--- a/samples/cloud-base.json
+++ b/samples/cloud-base.json
@@ -42,8 +42,8 @@
             "uuid": "ea711a29-e460-4879-9d70-9da99ae021f9",
             "vfs_type": "ext4",
             "path": "/",
-            "freq": "1",
-            "passno": "1"
+            "freq": 1,
+            "passno": 1
           }
         ]
       }
diff --git a/samples/f30-aarch64.json b/samples/f30-aarch64.json
index dfb497ab..32959c39 100644
--- a/samples/f30-aarch64.json
+++ b/samples/f30-aarch64.json
@@ -54,16 +54,16 @@
             "uuid": "7acfe2cc-4134-482a-a9d4-4979a5a87569",
             "vfs_type": "ext4",
             "path": "/",
-            "freq": "1",
-            "passno": "1"
+            "freq": 1,
+            "passno": 1
           },
           {
             "uuid": "46BB-8120",
             "vfs_type": "vfat",
             "path": "/boot/efi",
             "options": "umask=0077,shortname=winnt",
-            "freq": "0",
-            "passno": "2"
+            "freq": 0,
+            "passno": 2
           }
         ]
       }
diff --git a/samples/f30-base-uefi.json b/samples/f30-base-uefi.json
index eedc67c1..3886f9de 100644
--- a/samples/f30-base-uefi.json
+++ b/samples/f30-base-uefi.json
@@ -56,16 +56,16 @@
             "uuid": "7acfe2cc-4134-482a-a9d4-4979a5a87569",
             "vfs_type": "ext4",
             "path": "/",
-            "freq": "1",
-            "passno": "1"
+            "freq": 1,
+            "passno": 1
           },
           {
             "uuid": "46BB-8120",
             "vfs_type": "vfat",
             "path": "/boot/efi",
             "options": "umask=0077,shortname=winnt",
-            "freq": "0",
-            "passno": "2"
+            "freq": 0,
+            "passno": 2
           }
         ]
       }
diff --git a/samples/f30-bootpart-hybrid.json b/samples/f30-bootpart-hybrid.json
index 98e49317..7529f57f 100644
--- a/samples/f30-bootpart-hybrid.json
+++ b/samples/f30-bootpart-hybrid.json
@@ -56,23 +56,23 @@
             "uuid": "08a41983-3328-4d1a-ae3c-1699e6d2a806",
             "vfs_type": "ext4",
             "path": "/boot",
-            "freq": "1",
-            "passno": "1"
+            "freq": 1,
+            "passno": 1
           },
           {
             "uuid": "7acfe2cc-4134-482a-a9d4-4979a5a87569",
             "vfs_type": "ext4",
             "path": "/",
-            "freq": "1",
-            "passno": "1"
+            "freq": 1,
+            "passno": 1
           },
           {
             "uuid": "46BB-8120",
             "vfs_type": "vfat",
             "path": "/boot/efi",
             "options": "umask=0077,shortname=winnt",
-            "freq": "0",
-            "passno": "2"
+            "freq": 0,
+            "passno": 2
           }
         ]
       }
diff --git a/samples/f30-ppc64le.json b/samples/f30-ppc64le.json
index fafe3d1e..3c7779fc 100644
--- a/samples/f30-ppc64le.json
+++ b/samples/f30-ppc64le.json
@@ -45,8 +45,8 @@
             "uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
             "vfs_type": "ext4",
             "path": "/",
-            "freq": "1",
-            "passno": "1"
+            "freq": 1,
+            "passno": 1
           }
         ]
       }
diff --git a/samples/f30-qcow2-gpt.json b/samples/f30-qcow2-gpt.json
index 89161c78..87c15694 100644
--- a/samples/f30-qcow2-gpt.json
+++ b/samples/f30-qcow2-gpt.json
@@ -49,8 +49,8 @@
             "uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
             "vfs_type": "ext4",
             "path": "/",
-            "freq": "1",
-            "passno": "1"
+            "freq": 1,
+            "passno": 1
           }
         ]
       }
diff --git a/samples/f30-qcow2-hybrid.json b/samples/f30-qcow2-hybrid.json
index e2db7c57..fd8fec42 100644
--- a/samples/f30-qcow2-hybrid.json
+++ b/samples/f30-qcow2-hybrid.json
@@ -56,16 +56,16 @@
             "uuid": "7acfe2cc-4134-482a-a9d4-4979a5a87569",
             "vfs_type": "ext4",
             "path": "/",
-            "freq": "1",
-            "passno": "1"
+            "freq": 1,
+            "passno": 1
           },
           {
             "uuid": "46BB-8120",
             "vfs_type": "vfat",
             "path": "/boot/efi",
             "options": "umask=0077,shortname=winnt",
-            "freq": "0",
-            "passno": "2"
+            "freq": 0,
+            "passno": 2
           }
         ]
       }
diff --git a/samples/f30-s390x.json b/samples/f30-s390x.json
index 6011ed6f..ad682107 100644
--- a/samples/f30-s390x.json
+++ b/samples/f30-s390x.json
@@ -57,8 +57,8 @@
             "uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
             "vfs_type": "ext4",
             "path": "/",
-            "freq": "1",
-            "passno": "1"
+            "freq": 1,
+            "passno": 1
           }
         ]
       }