@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Validation\Rule;
 use ProcessMaker\Exception\ScriptLanguageNotSupported;
+use ProcessMaker\Facades\Docker;
 use ProcessMaker\Traits\Exportable;
 use ProcessMaker\Traits\HasVersioning;
 
@@ -196,7 +197,7 @@ public function dockerImageExists()
 
     public static function listOfExecutorImages($filterByLanguage = null)
     {
-        exec('docker images | awk \'{r=$1":"$2; print r}\'', $result);
+        exec(Docker::command() . ' images | awk \'{r=$1":"$2; print r}\'', $result);
 
         $instance = config('app.instance');
 
 
@@ -32,13 +32,15 @@
 
         'pusher' => [
             'driver' => 'pusher',
-            'key' => env('PUSHER_APP_KEY'),
-            'secret' => env('PUSHER_APP_SECRET'),
-            'app_id' => env('PUSHER_APP_ID'),
+            'key' => env('PUSHER_APP_KEY', 'app-key'),
+            'secret' => env('PUSHER_APP_SECRET', 'app-secret'),
+            'app_id' => env('PUSHER_APP_ID', 'app-id'),
             'options' => [
-                'cluster' => env('PUSHER_CLUSTER'),
-                'debug' => env('PUSHER_DEBUG', false),
-                'useTLS' => env('PUSHER_TLS', true),
+                'host' => env('PUSHER_HOST', '127.0.0.1'),
+                'port' => env('PUSHER_PORT', 6001),
+                'scheme' => env('PUSHER_SCHEME', 'http'),
+                'encrypted' => true,
+                'useTLS' => env('PUSHER_SCHEME') === 'https',
             ],
         ],
 
 
@@ -34,7 +34,7 @@ public function run(ClientRepository $clients)
             'is_administrator' => true,
         ], [
             'username' => self::$INSTALLER_ADMIN_USERNAME,
-            'password' => Hash::make(self::$INSTALLER_ADMIN_PASSWORD),
+            'password' => Hash::make(env('INSTALL_ADMIN_PASSWORD', self::$INSTALLER_ADMIN_PASSWORD)),
             'email' => self::$INSTALLER_ADMIN_EMAIL,
             'firstname' => self::$INSTALLER_ADMIN_FIRSTNAME,
             'lastname' => self::$INSTALLER_ADMIN_LASTNAME,
 
@@ -58,8 +58,13 @@
           broadcaster: "pusher",
           key: "{{config('broadcasting.connections.pusher.key')}}",
           cluster: "{{config('broadcasting.connections.pusher.options.cluster')}}",
+          wsHost: "{{config('broadcasting.connections.pusher.options.host')}}",
+          wsPort: "{{config('broadcasting.connections.pusher.options.port')}}",
+          wssPort: "{{config('broadcasting.connections.pusher.options.port')}}",
           forceTLS: {{config('broadcasting.connections.pusher.options.use_tls') ? 'true' : 'false'}},
-          debug: {{config('broadcasting.connections.pusher.options.debug') ? 'true' : 'false'}}
+          debug: {{config('broadcasting.connections.pusher.options.debug') ? 'true' : 'false'}},
+          enabledTransports: ['ws', 'wss'],
+          disableStats: true,
         };
       @endif
     @endif