diff --git a/VERSION.txt b/VERSION.txt
index c59541f10a6c..802fbebe9d26 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.0.30
\ No newline at end of file
+5.0.31
\ No newline at end of file
diff --git a/app/Http/Controllers/MigrationController.php b/app/Http/Controllers/MigrationController.php
index ca17e3970cf1..35f691762c2a 100644
--- a/app/Http/Controllers/MigrationController.php
+++ b/app/Http/Controllers/MigrationController.php
@@ -320,7 +320,8 @@ class MigrationController extends BaseController
             $migration_file = $request->file($company->company_index)
                 ->storeAs(
                     'migrations',
-                    $request->file($company->company_index)->getClientOriginalName()
+                    $request->file($company->company_index)->getClientOriginalName(),
+                    'local'
                 );
 
             if (app()->environment() == 'testing') {
@@ -328,7 +329,9 @@ class MigrationController extends BaseController
             }
 
             try {
-                StartMigration::dispatch(base_path("storage/app/public/$migration_file"), $user, $fresh_company)->delay(now()->addSeconds(5));
+                // StartMigration::dispatch(base_path("storage/app/public/$migration_file"), $user, $fresh_company)->delay(now()->addSeconds(5));
+                info($migration_file);
+                StartMigration::dispatch($migration_file, $user, $fresh_company);
             } catch (\Exception $e) {
                 info($e->getMessage());
             }
diff --git a/app/Jobs/Util/StartMigration.php b/app/Jobs/Util/StartMigration.php
index 78eabfe608da..17cefe69ee07 100644
--- a/app/Jobs/Util/StartMigration.php
+++ b/app/Jobs/Util/StartMigration.php
@@ -85,8 +85,7 @@ class StartMigration implements ShouldQueue
         $this->company->save();
 
         $zip = new ZipArchive();
-        $archive = $zip->open($this->filepath);
-
+        $archive = $zip->open(storage_path("app/{$this->filepath}"));
         $filename = pathinfo($this->filepath, PATHINFO_FILENAME);
 
         try {
@@ -94,14 +93,14 @@ class StartMigration implements ShouldQueue
                 throw new ProcessingMigrationArchiveFailed('Processing migration archive failed. Migration file is possibly corrupted.');
             }
 
-            $zip->extractTo(storage_path("migrations/{$filename}"));
+            $zip->extractTo(storage_path("app/migrations/{$filename}"));
             $zip->close();
 
             if (app()->environment() == 'testing') {
                 return true;
             }
 
-            $file = storage_path("migrations/$filename/migration.json");
+            $file = storage_path("app/migrations/$filename/migration.json");
 
             if (! file_exists($file)) {
                 throw new NonExistingMigrationFile('Migration file does not exist, or it is corrupted.');
diff --git a/app/Utils/Traits/AppSetup.php b/app/Utils/Traits/AppSetup.php
index debd5750c5e6..8b7d80c21a81 100644
--- a/app/Utils/Traits/AppSetup.php
+++ b/app/Utils/Traits/AppSetup.php
@@ -128,13 +128,14 @@ trait AppSetup
             }
         }
 
-        // This should never happen, but this is login just in case.
-        // Variables that will be replaced (updated with different content) should already be in .env file.
+        $words_count = count(explode(' ', trim($value)));
 
         if (is_null($position)) {
-            $env[] = "{$property}=" . $value . "\n";
+            $words_count > 1 ? $env[] = "{$property}=" . '"' . $value . '"' . "\n" : $env[] = "{$property}=" . $value . "\n";
+        } else if ($words_count > 1) {
+            $env[$position] = "{$property}=" . '"' . $value . '"' . "\n"; // If value of variable is more than one word, surround with quotes.
         } else {
-            $env[$position] = "{$property}=" . $value . "\n";
+            $env[$position] = "{$property}=" . $value . "\n"; // Just a normal variable update, with prexisting keys.
         }
 
         try {
diff --git a/config/ninja.php b/config/ninja.php
index 605279060207..53e91347349e 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -12,7 +12,7 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/').'/',
     'app_domain' => env('APP_DOMAIN', ''),
-    'app_version' => '5.0.30',
+    'app_version' => '5.0.31',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),