diff --git a/VERSION.txt b/VERSION.txt
index 2054231b6a..1358c237c3 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.9.7
\ No newline at end of file
+5.9.8
\ No newline at end of file
diff --git a/app/Providers/StaticServiceProvider.php b/app/Providers/StaticServiceProvider.php
index 5cdd13a58f..d6a08547b2 100644
--- a/app/Providers/StaticServiceProvider.php
+++ b/app/Providers/StaticServiceProvider.php
@@ -21,6 +21,7 @@ use App\Models\Language;
 use App\Models\Timezone;
 use App\Models\DateFormat;
 use App\Models\PaymentTerm;
+use App\Models\DatetimeFormat;
 use Illuminate\Support\ServiceProvider;
 use App\DataMapper\EmailTemplateDefaults;
 
@@ -88,6 +89,10 @@ class StaticServiceProvider extends ServiceProvider
             return Size::query()->orderBy('id')->get();
         });
 
+        /** @return \Illuminate\Support\Collection<DatetimeFormat> */
+        app()->singleton('datetime_formats', function ($app) {
+            return DatetimeFormat::query()->orderBy('id')->get();
+        });
 
         app()->singleton('templates', function ($app) {
             return [
diff --git a/app/Utils/Statics.php b/app/Utils/Statics.php
index aa8021c3d8..9adcaf3c33 100644
--- a/app/Utils/Statics.php
+++ b/app/Utils/Statics.php
@@ -143,6 +143,11 @@ class Statics
                 return $currency->name;
             })->values();
 
+            $data['sizes'] = app('sizes');
+            $data['datetime_formats'] = app('datetime_formats');
+            $data['gateways'] = app('gateways');
+            $dat['timezones'] = app('timezones');
+            
             $data['templates'] = app('templates');
         }
 
diff --git a/config/ninja.php b/config/ninja.php
index 47d49a2575..40fdded8d1 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -17,8 +17,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION', '5.9.7'),
-    'app_tag' => env('APP_TAG', '5.9.7'),
+    'app_version' => env('APP_VERSION', '5.9.8'),
+    'app_tag' => env('APP_TAG', '5.9.8'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),