diff --git a/src/Client/Update/UpdateOptions.php b/src/Client/Update/UpdateOptions.php
index c182a12ea..393c05ffa 100644
--- a/src/Client/Update/UpdateOptions.php
+++ b/src/Client/Update/UpdateOptions.php
@@ -17,19 +17,27 @@ final class UpdateOptions
 
     private function __construct(
         public readonly string $updateName,
+        LifecycleStage $lifecycleStage,
     ) {
         $this->updateId = null;
         $this->firstExecutionRunId = null;
-        $this->waitPolicy = WaitPolicy::new()->withLifecycleStage(LifecycleStage::StageUnspecified);
+        $this->waitPolicy = WaitPolicy::new()->withLifecycleStage($lifecycleStage);
         $this->resultType = null;
     }
 
     /**
      * @param non-empty-string $updateName Name of the update handler. Usually it is a method name.
+     * @param LifecycleStage $lifecycleStage Specifies at what point in the update request life cycles
+     *        this request should return. By default, it is set to {@see LifecycleStage::StageAccepted} that
+     *        means that the handle will return immediately after successful validation of the Update call.
+     *        However, also note that the processing Workflow worker must be available. Otherwise, the request
+     *        may block indefinitely or fail due to a timeout.
+     *
+     * @link https://docs.temporal.io/workflows#update
      */
-    public static function new(string $updateName): self
+    public static function new(string $updateName, LifecycleStage $lifecycleStage = LifecycleStage::StageAccepted): self
     {
-        return new self($updateName);
+        return new self($updateName, $lifecycleStage);
     }
 
     /**
diff --git a/tests/Unit/DTO/UpdateTestCase.php b/tests/Unit/DTO/UpdateTestCase.php
new file mode 100644
index 000000000..394522afb
--- /dev/null
+++ b/tests/Unit/DTO/UpdateTestCase.php
@@ -0,0 +1,79 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Temporal\Tests\Unit\DTO;
+
+use Temporal\Client\Update\LifecycleStage;
+use Temporal\Client\Update\UpdateOptions;
+use Temporal\Client\Update\WaitPolicy;
+use Temporal\Tests\Unit\AbstractUnit;
+
+class UpdateTestCase extends AbstractUnit
+{
+    public function testCreateWithDefaults(): void
+    {
+        $options = UpdateOptions::new('test-update');
+
+        self::assertSame('test-update', $options->updateName);
+        self::assertSame(LifecycleStage::StageAccepted, $options->waitPolicy->lifecycleStage);
+    }
+
+    public function testCreateWithCustomWaitPolicy(): void
+    {
+        $options = UpdateOptions::new('test-update', LifecycleStage::StageCompleted);
+
+        self::assertSame('test-update', $options->updateName);
+        self::assertSame(LifecycleStage::StageCompleted, $options->waitPolicy->lifecycleStage);
+    }
+
+    public function testWithUpdateName(): void
+    {
+        $options = UpdateOptions::new('test-update');
+        $new = $options->withUpdateName('test-update-2');
+
+        self::assertNotSame($options, $new);
+        self::assertSame('test-update', $options->updateName);
+        self::assertSame('test-update-2', $new->updateName);
+    }
+
+    public function testWithWaitPolicy(): void
+    {
+        $options = UpdateOptions::new('test-update');
+        $new = $options->withWaitPolicy(WaitPolicy::new()->withLifecycleStage(LifecycleStage::StageCompleted));
+
+        self::assertNotSame($options, $new);
+        self::assertSame(LifecycleStage::StageAccepted, $options->waitPolicy->lifecycleStage);
+        self::assertSame(LifecycleStage::StageCompleted, $new->waitPolicy->lifecycleStage);
+    }
+
+    public function testWithUpdateId(): void
+    {
+        $options = UpdateOptions::new('test-update');
+        $new = $options->withUpdateId('test-update-id');
+
+        self::assertNotSame($options, $new);
+        self::assertNull($options->updateId);
+        self::assertSame('test-update-id', $new->updateId);
+    }
+
+    public function testWithResultType(): void
+    {
+        $options = UpdateOptions::new('test-update');
+        $new = $options->withResultType('array');
+
+        self::assertNotSame($options, $new);
+        self::assertNull($options->resultType);
+        self::assertSame('array', $new->resultType);
+    }
+
+    public function testWithFirstExecutionRunId(): void
+    {
+        $options = UpdateOptions::new('test-update');
+        $new = $options->withFirstExecutionRunId('test-run-id');
+
+        self::assertNotSame($options, $new);
+        self::assertNull($options->firstExecutionRunId);
+        self::assertSame('test-run-id', $new->firstExecutionRunId);
+    }
+}