diff --git a/app/Commands/Incident/ReportIncidentCommand.php b/app/Commands/Incident/ReportIncidentCommand.php
index 56fcecda..6da77d25 100644
--- a/app/Commands/Incident/ReportIncidentCommand.php
+++ b/app/Commands/Incident/ReportIncidentCommand.php
@@ -78,10 +78,10 @@ final class ReportIncidentCommand
         'name'             => 'required|string',
         'status'           => 'required|int',
         'message'          => 'string',
-        'visible'          => 'boolean',
+        'visible'          => 'bool',
         'component_id'     => 'int',
         'component_status' => 'int',
-        'notify'           => 'boolean',
+        'notify'           => 'bool',
         'incident_date'    => 'string',
     ];
 
diff --git a/app/Commands/Incident/ReportMaintenanceCommand.php b/app/Commands/Incident/ReportMaintenanceCommand.php
index 80de430b..f1ea0fc3 100644
--- a/app/Commands/Incident/ReportMaintenanceCommand.php
+++ b/app/Commands/Incident/ReportMaintenanceCommand.php
@@ -49,7 +49,7 @@ final class ReportMaintenanceCommand
     public $rules = [
         'name'      => 'required|string',
         'message'   => 'string',
-        'notify'    => 'boolean',
+        'notify'    => 'bool',
         'timestamp' => 'string',
     ];
 
diff --git a/app/Commands/Incident/UpdateIncidentCommand.php b/app/Commands/Incident/UpdateIncidentCommand.php
index ded9453f..07387ff9 100644
--- a/app/Commands/Incident/UpdateIncidentCommand.php
+++ b/app/Commands/Incident/UpdateIncidentCommand.php
@@ -87,10 +87,10 @@ final class UpdateIncidentCommand
         'name'             => 'string',
         'status'           => 'int',
         'message'          => 'string',
-        'visible'          => 'boolean',
+        'visible'          => 'bool',
         'component_id'     => 'int',
         'component_status' => 'int',
-        'notify'           => 'boolean',
+        'notify'           => 'bool',
     ];
 
     /**
diff --git a/app/Commands/Metric/AddMetricCommand.php b/app/Commands/Metric/AddMetricCommand.php
index 7a1a28b8..fc2070eb 100644
--- a/app/Commands/Metric/AddMetricCommand.php
+++ b/app/Commands/Metric/AddMetricCommand.php
@@ -71,7 +71,7 @@ final class AddMetricCommand
         'name'          => 'required|string',
         'suffix'        => 'required|string',
         'description'   => 'string',
-        'display_chart' => 'boolean',
+        'display_chart' => 'bool',
         'default_value' => 'int',
         'calc_type'     => 'int',
         'display_chart' => 'int',
diff --git a/app/Commands/Metric/UpdateMetricCommand.php b/app/Commands/Metric/UpdateMetricCommand.php
index 40c63733..be4002cc 100644
--- a/app/Commands/Metric/UpdateMetricCommand.php
+++ b/app/Commands/Metric/UpdateMetricCommand.php
@@ -80,7 +80,7 @@ final class UpdateMetricCommand
         'name'          => 'string',
         'suffix'        => 'string',
         'description'   => 'string',
-        'display_chart' => 'boolean',
+        'display_chart' => 'bool',
         'default_value' => 'numeric',
         'calc_type'     => 'int|in:0,1',
         'display_chart' => 'int',
diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index 7e690cec..2ea8dff0 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -105,7 +105,7 @@ class SetupController extends Controller
             'settings.app_domain'   => 'required',
             'settings.app_timezone' => 'required',
             'settings.app_locale'   => 'required',
-            'settings.show_support' => 'boolean',
+            'settings.show_support' => 'bool',
         ]);
 
         if ($v->passes()) {
@@ -131,7 +131,7 @@ class SetupController extends Controller
             'settings.app_domain'   => 'required',
             'settings.app_timezone' => 'required',
             'settings.app_locale'   => 'required',
-            'settings.show_support' => 'boolean',
+            'settings.show_support' => 'bool',
             'user.username'         => ['required', 'regex:/\A(?!.*[:;]-\))[ -~]+\z/'],
             'user.email'            => 'email|required',
             'user.password'         => 'required',
diff --git a/app/Models/Incident.php b/app/Models/Incident.php
index d2262170..cc75570a 100644
--- a/app/Models/Incident.php
+++ b/app/Models/Incident.php
@@ -66,7 +66,7 @@ class Incident extends Model implements HasPresenter
         'component_id' => 'int',
         'name'         => 'required',
         'status'       => 'required|int',
-        'visible'      => 'required|boolean',
+        'visible'      => 'required|bool',
         'message'      => 'required',
     ];
 
diff --git a/app/Models/Metric.php b/app/Models/Metric.php
index 8949d28c..622350ab 100644
--- a/app/Models/Metric.php
+++ b/app/Models/Metric.php
@@ -73,7 +73,7 @@ class Metric extends Model implements HasPresenter
     public $rules = [
         'name'          => 'required',
         'suffix'        => 'required',
-        'display_chart' => 'boolean',
+        'display_chart' => 'bool',
         'default_value' => 'numeric',
         'places'        => 'numeric|min:0|max:4',
     ];