diff --git a/.env.example b/.env.example
index c3276d4253..ad1ca04795 100644
--- a/.env.example
+++ b/.env.example
@@ -102,7 +102,7 @@ SEND_REPORT_JOURNALS=true
 MAPBOX_API_KEY=
 
 # Firefly III currently supports two provider for live Currency Exchange Rates:
-# "fixer" is the default (for backward compatibility), and "ratesapi" is the new one.
+# "fixer", and "ratesapi".
 # RatesApi.IO (see https://ratesapi.io) is a FREE and OPEN SOURCE live currency exchange rates,
 # built compatible with Fixer.IO, based on data published by European Central Bank, and doesn't require API key.
 CER_PROVIDER=ratesapi
diff --git a/app/Console/Commands/Upgrade/UpgradeDatabase.php b/app/Console/Commands/Upgrade/UpgradeDatabase.php
index e20c9b958a..0faa9e4e31 100644
--- a/app/Console/Commands/Upgrade/UpgradeDatabase.php
+++ b/app/Console/Commands/Upgrade/UpgradeDatabase.php
@@ -52,6 +52,9 @@ class UpgradeDatabase extends Command
      */
     public function handle(): int
     {
+        $this->callInitialCommands();
+
+
         $commands = [
             // there are 12 upgrade commands.
             'firefly-iii:transaction-identifiers',
@@ -100,6 +103,17 @@ class UpgradeDatabase extends Command
             echo $result;
         }
 
+        // set new DB version.
+        // index will set FF3 version.
+        app('fireflyconfig')->set('ff3_version', (string)config('firefly.version'));
+
         return 0;
     }
+
+    private function callInitialCommands(): void
+    {
+        Artisan::call('migrate', ['--seed' => true]);
+        Artisan::call('firefly-iii:decrypt-all');
+        Artisan::call('generate-keys');
+    }
 }