diff --git a/apify-api/openapi/components/schemas/actors/Actor.yaml b/apify-api/openapi/components/schemas/actors/Actor.yaml
index 7b6614b51e..34cb6c6002 100644
--- a/apify-api/openapi/components/schemas/actors/Actor.yaml
+++ b/apify-api/openapi/components/schemas/actors/Actor.yaml
@@ -31,8 +31,8 @@ properties:
     example: My favourite actor!
   restartOnError:
     type: boolean
-    nullable: true
     example: false
+    deprecated: true # Use defaultRunOptions.restartOnError instead
   isPublic:
     type: boolean
     example: false
diff --git a/apify-api/openapi/components/schemas/actors/CreateActorRequest.yaml b/apify-api/openapi/components/schemas/actors/CreateActorRequest.yaml
index 4b6d5058a9..8631096eec 100644
--- a/apify-api/openapi/components/schemas/actors/CreateActorRequest.yaml
+++ b/apify-api/openapi/components/schemas/actors/CreateActorRequest.yaml
@@ -27,8 +27,8 @@ properties:
     example: My actor is the best
   restartOnError:
     type: boolean
-    nullable: true
     example: false
+    deprecated: true # Use defaultRunOptions.restartOnError instead
   versions:
     type: array
     items:
@@ -46,6 +46,4 @@ properties:
     description: ''
     nullable: true
   defaultRunOptions:
-    oneOf:
-      - nullable: true
-      - $ref: ./DefaultRunOptions.yaml
+    $ref: ./DefaultRunOptions.yaml
diff --git a/apify-api/openapi/components/schemas/actors/DefaultRunOptions.yaml b/apify-api/openapi/components/schemas/actors/DefaultRunOptions.yaml
index 64f6a6a3b2..7c8efa84dc 100644
--- a/apify-api/openapi/components/schemas/actors/DefaultRunOptions.yaml
+++ b/apify-api/openapi/components/schemas/actors/DefaultRunOptions.yaml
@@ -14,3 +14,6 @@ properties:
   memoryMbytes:
     type: number
     example: 2048
+  restartOnError:
+    type: boolean
+    example: false
diff --git a/apify-api/openapi/components/schemas/actors/UpdateActorRequest.yaml b/apify-api/openapi/components/schemas/actors/UpdateActorRequest.yaml
index 46a67727f2..5a4d7adb44 100644
--- a/apify-api/openapi/components/schemas/actors/UpdateActorRequest.yaml
+++ b/apify-api/openapi/components/schemas/actors/UpdateActorRequest.yaml
@@ -1,8 +1,4 @@
 title: ActUpdate
-required:
-  - name
-  - isPublic
-  - versions
 type: object
 properties:
   name:
@@ -29,8 +25,8 @@ properties:
     example: My Actor
   restartOnError:
     type: boolean
-    nullable: true
     example: false
+    deprecated: true # Use defaultRunOptions.restartOnError instead
   versions:
     type: array
     items:
@@ -47,9 +43,7 @@ properties:
     description: ''
     nullable: true
   defaultRunOptions:
-    oneOf:
-      - nullable: true
-      - $ref: ./DefaultRunOptions.yaml
+    $ref: ./DefaultRunOptions.yaml
   taggedBuilds:
     type: object
     description: |
@@ -71,3 +65,7 @@ properties:
     example:
       latest:
         buildId: z2EryhbfhgSyqj6Hn
+required:
+  - name
+  - isPublic
+  - versions
diff --git a/apify-api/openapi/paths/actors/acts.yaml b/apify-api/openapi/paths/actors/acts.yaml
index b07febbf7d..45e416677f 100644
--- a/apify-api/openapi/paths/actors/acts.yaml
+++ b/apify-api/openapi/paths/actors/acts.yaml
@@ -142,7 +142,6 @@ post:
           isPublic: false
           seoTitle: My Actor
           seoDescription: My Actor is the best
-          restartOnError: false
           versions:
             - versionNumber: '0.0'
               sourceType: SOURCE_FILES
@@ -161,6 +160,7 @@ post:
             build: latest
             timeoutSecs: 3600
             memoryMbytes: 2048
+            restartOnError: false
     required: true
   responses:
     '201':
@@ -183,7 +183,6 @@ post:
               name: MyActor
               username: jane35
               description: My favourite Actor!
-              restartOnError: false
               isPublic: false
               createdAt: '2019-07-08T11:27:57.401Z'
               modifiedAt: '2019-07-08T14:01:05.546Z'
@@ -225,6 +224,7 @@ post:
                 build: latest
                 timeoutSecs: 3600
                 memoryMbytes: 2048
+                restartOnError: false
               exampleRunInput:
                 body: '{ "helloWorld": 123 }'
                 contentType: application/json; charset=utf-8
diff --git a/apify-api/openapi/paths/actors/acts@{actorId}.yaml b/apify-api/openapi/paths/actors/acts@{actorId}.yaml
index 7ce22bfe2c..3a5be99ee8 100644
--- a/apify-api/openapi/paths/actors/acts@{actorId}.yaml
+++ b/apify-api/openapi/paths/actors/acts@{actorId}.yaml
@@ -28,7 +28,6 @@ get:
               name: MyActor
               username: jane35
               description: My favourite Actor!
-              restartOnError: false
               isPublic: false
               createdAt: '2019-07-08T11:27:57.401Z'
               modifiedAt: '2019-07-08T14:01:05.546Z'
@@ -70,6 +69,7 @@ get:
                 build: latest
                 timeoutSecs: 3600
                 memoryMbytes: 2048
+                restartOnError: false
               exampleRunInput:
                 body: '{ "helloWorld": 123 }'
                 contentType: application/json; charset=utf-8
@@ -140,7 +140,6 @@ put:
           seoTitle: My Actor
           seoDescription: My Actor is the best
           title: My Actor
-          restartOnError: false
           versions:
             - versionNumber: '0.0'
               sourceType: SOURCE_FILES
@@ -159,6 +158,7 @@ put:
             build: latest
             timeoutSecs: 3600
             memoryMbytes: 2048
+            restartOnError: false
     required: true
   responses:
     '200':
@@ -175,7 +175,6 @@ put:
               name: MyActor
               username: jane35
               description: My favourite Actor!
-              restartOnError: false
               isPublic: false
               createdAt: '2019-07-08T11:27:57.401Z'
               modifiedAt: '2019-07-08T14:01:05.546Z'
@@ -217,6 +216,7 @@ put:
                 build: latest
                 timeoutSecs: 3600
                 memoryMbytes: 2048
+                restartOnError: false
               exampleRunInput:
                 body: '{ "helloWorld": 123 }'
                 contentType: application/json; charset=utf-8