@@ -4,10 +4,12 @@
 
 use Exception;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Cache;
 use ProcessMaker\Events\BuildScriptExecutor;
 use ProcessMaker\Exception\InvalidDockerImageException;
 use ProcessMaker\Facades\Docker;
 use ProcessMaker\Models\ScriptExecutor;
+use UnexpectedValueException;
 
 class BuildScriptExecutors extends Command
 {
@@ -157,6 +159,36 @@ public function buildExecutor()
         $command = Docker::command() .
             " build --build-arg SDK_DIR=./sdk -t {$image} -f {$packagePath}/Dockerfile.custom {$packagePath}";
 
+        $this->execCommand($command);
+
+        $isNayra = $scriptExecutor->language === 'nayra';
+        if ($isNayra) {
+            $instanceName = config('app.instance');
+            $this->info('Stop existing nayra container');
+            $this->execCommand(Docker::command() . " stop {$instanceName}_nayra 2>&1 || true");
+            $this->execCommand(Docker::command() . " rm {$instanceName}_nayra 2>&1 || true");
+            $this->info('Bring up the nayra container');
+            $this->execCommand(Docker::command() . ' run -d --name ' . $instanceName . '_nayra ' . $image);
+            $this->info('Get IP address of the nayra container');
+            $ip = '';
+            for ($i = 0; $i < 10; $i++) {
+                $ip = exec(Docker::command() . " inspect --format '{{ .NetworkSettings.IPAddress }}' {$instanceName}_nayra");
+                if ($ip) {
+                    $this->info('Nayra container IP: ' . $ip);
+                    Cache::forever('nayra_ips', [$ip]);
+                    $this->sendEvent(0, 'done');
+                    break;
+                }
+                sleep(1);
+            }
+            if (!$ip) {
+                throw new UnexpectedValueException('Could not get IP address of the nayra container');
+            }
+        }
+    }
+
+    private function execCommand(string $command)
+    {
         if ($this->userId) {
             $this->runProc(
                 $command,
 
@@ -2,11 +2,14 @@
 
 namespace ProcessMaker\ScriptRunners;
 
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
 use ProcessMaker\GenerateAccessToken;
 use ProcessMaker\Models\EnvironmentVariable;
 use ProcessMaker\Models\ScriptDockerBindingFilesTrait;
 use ProcessMaker\Models\ScriptDockerCopyingFilesTrait;
+use ProcessMaker\Models\ScriptDockerNayraTrait;
 use ProcessMaker\Models\ScriptExecutor;
 use ProcessMaker\Models\User;
 use RuntimeException;
@@ -15,6 +18,9 @@ abstract class Base
 {
     use ScriptDockerCopyingFilesTrait;
     use ScriptDockerBindingFilesTrait;
+    use ScriptDockerNayraTrait;
+
+    const NAYRA_LANG = 'php-nayra';
 
     private $tokenId = '';
 
@@ -38,7 +44,7 @@ abstract public function config($code, array $dockerConfig);
     /**
      * Set the script executor
      *
-     * @var \ProcessMaker\Models\User
+     * @var \ProcessMaker\Models\ScriptExecutor
      */
     private $scriptExecutor;
 
@@ -70,13 +76,25 @@ public function run($code, array $data, array $config, $timeout, ?User $user)
         // Create tokens for the SDK if a user is set
         $token = null;
         if ($user) {
-            $token = new GenerateAccessToken($user);
-            $environmentVariables[] = 'API_TOKEN=' . $token->getToken();
+            $expires = Carbon::now()->addWeek();
+            $accessToken = Cache::remember('script-runner-' . $user->id, $expires, function () use ($user) {
+                $user->removeOldRunScriptTokens();
+                $token = new GenerateAccessToken($user);
+                return $token->getToken();
+            });
+            $environmentVariables[] = 'API_TOKEN=' . $accessToken;
             $environmentVariables[] = 'API_HOST=' . config('app.docker_host_url') . '/api/1.0';
             $environmentVariables[] = 'APP_URL=' . config('app.docker_host_url');
             $environmentVariables[] = 'API_SSL_VERIFY=' . (config('app.api_ssl_verify') ? '1' : '0');
         }
 
+        // Nayra Executor
+        $isNayra = $this->scriptExecutor->language === self::NAYRA_LANG;
+        if ($isNayra) {
+            $response = $this->handleNayraDocker($code, $data, $config, $timeout, $environmentVariables);
+            return json_decode($response, true);
+        }
+
         if ($environmentVariables) {
             $parameters = '-e ' . implode(' -e ', $environmentVariables);
         } else {