@@ -9,5 +9,5 @@ on:
 jobs:
   run:
     name: Run PM4-workflow
-    uses: processmaker/.github/.github/workflows/deploy-pm4.yml@main
+    uses: processmaker/.github/.github/workflows/deploy-pm4.yml@multitenancy
     secrets: inherit
@@ -3,8 +3,10 @@
 namespace ProcessMaker\Console\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Encryption\Encrypter;
 use Illuminate\Support\Env;
 use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\File;
 use ProcessMaker\Multitenancy\Tenant;
@@ -54,19 +56,22 @@ public function handle()
             return;
         }
 
+        $key = 'base64:' . base64_encode(
+            Encrypter::generateKey(config('app.cipher'))
+        );
+        $key = Crypt::encryptString($key);
+
         // insert into the tenants table
-        $tenant = Tenant::updateOrCreate([
+        $tenant = Tenant::create([
             'domain' => $domain,
-        ], [
             'name' => $this->option('name'),
             'database' => $this->option('database'),
             'username' => $this->option('username', null),
             'password' => $this->option('password', null),
-            'config' => ['app.url' => $this->option('url')],
+            'config' => ['app.url' => $this->option('url'), 'app.key' => $key],
         ]);
 
         // Setup storage
-
         $tenantStoragePath = base_path('storage/tenant_' . $tenant->id);
         $needsStorage = true;
 
@@ -112,20 +117,18 @@ public function handle()
         }
 
         // Setup database
-
-        $tenantDbExists = DB::select("SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '{$this->option('database')}'");
+        // DB::select("SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '{$this->option('database')}'");
+        DB::statement("CREATE DATABASE `{$this->option('database')}`");
 
         // Create the database
-        if (!$tenantDbExists) {
-            DB::statement("CREATE DATABASE `{$this->option('database')}`");
-            $this->tenantArtisan('migrate --seed --force', $tenant->id);
+        // SKIPPING - migrate/upgrade should be done on its own
+        // if (!$tenantDbExists) {
+        //     DB::statement("CREATE DATABASE `{$this->option('database')}`");
+        //     $this->tenantArtisan('migrate --seed --force', $tenant->id);
 
-            // Add passport keys
-            $this->tenantArtisan('passport:keys', $tenant->id);
-
-            // Call the upgrade commands
-            $this->tenantArtisan('upgrade', $tenant->id);
-        }
+        //     // Call the upgrade commands
+        //     $this->tenantArtisan('upgrade', $tenant->id);
+        // }
 
         // Crate the config cache subfolder
         //
 
@@ -3,6 +3,7 @@
 namespace ProcessMaker\Multitenancy;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\DB;
 use PDO;
 use Spatie\Multitenancy\Concerns\UsesMultitenancyConfig;
@@ -65,7 +66,13 @@ public function makeCurrent(IsTenant $tenant): void
         config($newConfig);
 
         // Set config from the entry in the tenants table
-        config($tenant->config);
+        $config = $tenant->config;
+        if (isset($config['app.key'])) {
+            // Decrypt using the landlord APP_KEY in the .env file.
+            // All encryption after this will use the tenant's key.
+            $config['app.key'] = Crypt::decryptString($config['app.key']);
+        }
+        config($config);
     }
 
     /**
 
@@ -54,7 +54,7 @@
             'driver' => env('DB_DRIVER', 'mysql'),
             'host' => env('DB_HOSTNAME', 'localhost'),
             'port' => env('DB_PORT'),
-            'database' => env('LANDLORD_DB_DATABASE', 'landlord'),
+            'database' => env('DB_DATABASE', 'landlord'),
             'username' => env('DB_USERNAME'),
             'password' => env('DB_PASSWORD'),
             'unix_socket' => env('DB_SOCKET', ''),