diff --git a/app/Http/Requestes/CropYieldRequest.php b/app/Http/Requestes/CropYieldRequest.php
index ae490d1..2ca260c 100644
--- a/app/Http/Requestes/CropYieldRequest.php
+++ b/app/Http/Requestes/CropYieldRequest.php
@@ -20,9 +20,9 @@ class CropYieldRequest extends FormRequest
             'quarter' => 'required|integer|min:1|max:4',
             'crop_id' => 'required|integer|min:0',
             'base_id' => 'required|integer|min:0',
-            'yield' => 'required|regex:/^\d+(\.\d{1,2})?$/',
-            'cultivated' => 'required|regex:/^\d+(\.\d{1,2})?$/',
-            'output' => 'required|regex:/^\d+(\.\d{1,2})?$/',
+            'yield' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
+            'cultivated' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
+            'output' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
         ];
     }
 
diff --git a/app/Http/Requestes/CropYieldUpdateRequest.php b/app/Http/Requestes/CropYieldUpdateRequest.php
index 83e7f4c..930b70b 100644
--- a/app/Http/Requestes/CropYieldUpdateRequest.php
+++ b/app/Http/Requestes/CropYieldUpdateRequest.php
@@ -19,9 +19,9 @@ class CropYieldUpdateRequest extends FormRequest
             'time_year' => 'required|date_format:Y',
             'crop_id' => 'required|integer|min:0',
             'base_id' => 'required|integer|min:0',
-            'yield' => 'required|regex:/^\d+(\.\d{1,2})?$/',
-            'cultivated' => 'required|regex:/^\d+(\.\d{1,2})?$/',
-            'output' => 'required|regex:/^\d+(\.\d{1,2})?$/',
+            'yield' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
+            'cultivated' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
+            'output' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'],
         ];
     }