diff --git a/docs/docs/reference/pipeline-yaml.md b/docs/docs/reference/pipeline-yaml.md
index c211a784c..8b3f89b96 100644
--- a/docs/docs/reference/pipeline-yaml.md
+++ b/docs/docs/reference/pipeline-yaml.md
@@ -116,7 +116,11 @@ Each `container` entry can have:
 
 - [`name`](#name-in-containers): the name of the container
 - [`image`](#image-in-containers): the image for the container
-- [`env_vars](#env-vars-in-containers): optional list of key-value pairs to define environment variables
+- [`env_vars`](#env-vars-in-containers): optional list of key-value pairs to define environment variables
+- [`secrets`](#secrets-in-containers): optional list of secrets to import into the container
+- [`user`](#user-in-containers): optional user to run the container as
+- [`command`](#command-in-containers): optional override for the Docker CMD
+- [`entrypoint`](#entrypoint-in-containers): optional override for the Docker ENTRYPOINT
 
 ```yaml title="Example"
 agent:
@@ -163,38 +167,85 @@ agent:
 
 An optional array of key-value pairs. The keys are exported as environment variables when the container starts.
 
-You can define special variables to modify the container initialization:
+```yaml title="Example"
+agent:
+  machine:
+    type: e1-standard-2
+  containers:
+    - name: main
+      image: 'registry.semaphoreci.com/ruby:2.6'
+    - name: db
+      image: 'registry.semaphoreci.com/postgres:9.6'
+  # highlight-start
+      env_vars:
+        - name: POSTGRES_PASSWORD
+          value: keyboard-cat
+  # highlight-end
+```
 
-- `user`: the active user inside the container
-- `command`: overrides the Docker image's [CMD command](https://docs.docker.com/reference/dockerfile/#cmd)
-- `entrypoint`: overrides the Docker image' [ENTRYPOINT entry](https://docs.docker.com/reference/dockerfile/#entrypoint)
+### secrets {#secrets-in-containers}
 
-You may also supply environment variables with `env_vars` and `secrets`.
+An optional array of secrets to import into the container. Only environment variables defined in the secret are imported. Any files in the secret are ignored.
 
 ```yaml title="Example"
 agent:
   machine:
     type: e1-standard-2
+  containers:
+    - name: main
+      image: 'registry.semaphoreci.com/ruby:2.6'
   # highlight-start
+      secrets:
+        - name: mysecret
+  # highlight-end
+```
+
+### user {#user-in-containers}
+
+An optional property that specifies the active user inside the container.
+
+```yaml title="Example"
+agent:
+  machine:
+    type: e1-standard-2
   containers:
     - name: main
       image: 'registry.semaphoreci.com/ruby:2.6'
     - name: db
       image: 'registry.semaphoreci.com/postgres:9.6'
+  # highlight-next-line
       user: postgres
-      secrets:
-        - name: mysecret
-      env_vars:
-        - name: POSTGRES_PASSWORD
-          value: keyboard-cat
-  # highlight-end
 ```
 
-:::note
+### command {#command-in-containers}
 
-For `secrets`, only environment variables defined in the secret are imported. Any files in the secret are ignored.
+An optional property that overrides the Docker image's [CMD command](https://docs.docker.com/reference/dockerfile/#cmd).
 
-:::
+```yaml title="Example"
+agent:
+  machine:
+    type: e1-standard-2
+  containers:
+    - name: main
+      image: 'registry.semaphoreci.com/ruby:2.6'
+  # highlight-next-line
+      command: ["bundle", "exec", "rails", "server"]
+```
+
+### entrypoint {#entrypoint-in-containers}
+
+An optional property that overrides the Docker image's [ENTRYPOINT entry](https://docs.docker.com/reference/dockerfile/#entrypoint).
+
+```yaml title="Example"
+agent:
+  machine:
+    type: e1-standard-2
+  containers:
+    - name: main
+      image: 'registry.semaphoreci.com/ruby:2.6'
+  # highlight-next-line
+      entrypoint: ["/bin/sh", "-c"]
+```
 
 ## execution_time_limit {#execution_time_limit}
 
diff --git a/docs/versioned_docs/version-CE-1.3/reference/pipeline-yaml.md b/docs/versioned_docs/version-CE-1.3/reference/pipeline-yaml.md
index b9c9fc202..0fa5517a1 100644
--- a/docs/versioned_docs/version-CE-1.3/reference/pipeline-yaml.md
+++ b/docs/versioned_docs/version-CE-1.3/reference/pipeline-yaml.md
@@ -121,7 +121,11 @@ Each `container` entry can have:
 
 - [`name`](#name-in-containers): the name of the container
 - [`image`](#image-in-containers): the image for the container
-- [`env_vars](#env-vars-in-containers): optional list of key-value pairs to define environment variables
+- [`env_vars`](#env-vars-in-containers): optional list of key-value pairs to define environment variables
+- [`secrets`](#secrets-in-containers): optional list of secrets to import into the container
+- [`user`](#user-in-containers): optional user to run the container as
+- [`command`](#command-in-containers): optional override for the Docker CMD
+- [`entrypoint`](#entrypoint-in-containers): optional override for the Docker ENTRYPOINT
 
 ```yaml title="Example"
 agent:
@@ -169,38 +173,90 @@ agent:
 
 An optional array of key-value pairs. The keys are exported as environment variables when the container starts.
 
-You can define special variables to modify the container initialization:
+```yaml title="Example"
+agent:
+  machine:
+    type: s1-kubernetes
+    os_image: ''
+  containers:
+    - name: main
+      image: 'registry.semaphoreci.com/ubuntu:22.04'
+    - name: db
+      image: 'registry.semaphoreci.com/postgres:9.6'
+  # highlight-start
+      env_vars:
+        - name: POSTGRES_PASSWORD
+          value: keyboard-cat
+  # highlight-end
+```
 
-- `user`: the active user inside the container
-- `command`: overrides the Docker image's [CMD command](https://docs.docker.com/reference/dockerfile/#cmd)
-- `entrypoint`: overrides the Docker image' [ENTRYPOINT entry](https://docs.docker.com/reference/dockerfile/#entrypoint)
+### secrets {#secrets-in-containers}
 
-You may also supply environment variables with `env_vars` and `secrets`.
+An optional array of secrets to import into the container. Only environment variables defined in the secret are imported. Any files in the secret are ignored.
 
 ```yaml title="Example"
 agent:
   machine:
-    type: e1-standard-2
+    type: s1-kubernetes
+    os_image: ''
+  containers:
+    - name: main
+      image: 'registry.semaphoreci.com/ubuntu:22.04'
   # highlight-start
+      secrets:
+        - name: mysecret
+  # highlight-end
+```
+
+### user {#user-in-containers}
+
+An optional property that specifies the active user inside the container.
+
+```yaml title="Example"
+agent:
+  machine:
+    type: s1-kubernetes
+    os_image: ''
   containers:
     - name: main
-      image: 'registry.semaphoreci.com/ruby:2.6'
+      image: 'registry.semaphoreci.com/ubuntu:22.04'
     - name: db
       image: 'registry.semaphoreci.com/postgres:9.6'
+  # highlight-next-line
       user: postgres
-      secrets:
-        - name: mysecret
-      env_vars:
-        - name: POSTGRES_PASSWORD
-          value: keyboard-cat
-  # highlight-end
 ```
 
-:::note
+### command {#command-in-containers}
 
-For `secrets`, only environment variables defined in the secret are imported. Any files in the secret are ignored.
+An optional property that overrides the Docker image's [CMD command](https://docs.docker.com/reference/dockerfile/#cmd).
 
-:::
+```yaml title="Example"
+agent:
+  machine:
+    type: s1-kubernetes
+    os_image: ''
+  containers:
+    - name: main
+      image: 'registry.semaphoreci.com/ubuntu:22.04'
+  # highlight-next-line
+      command: ["bundle", "exec", "rails", "server"]
+```
+
+### entrypoint {#entrypoint-in-containers}
+
+An optional property that overrides the Docker image's [ENTRYPOINT entry](https://docs.docker.com/reference/dockerfile/#entrypoint).
+
+```yaml title="Example"
+agent:
+  machine:
+    type: s1-kubernetes
+    os_image: ''
+  containers:
+    - name: main
+      image: 'registry.semaphoreci.com/ubuntu:22.04'
+  # highlight-next-line
+      entrypoint: ["/bin/sh", "-c"]
+```
 
 ## execution_time_limit {#execution_time_limit}
 
diff --git a/docs/versioned_docs/version-CE/reference/pipeline-yaml.md b/docs/versioned_docs/version-CE/reference/pipeline-yaml.md
index b9c9fc202..0fa5517a1 100644
--- a/docs/versioned_docs/version-CE/reference/pipeline-yaml.md
+++ b/docs/versioned_docs/version-CE/reference/pipeline-yaml.md
@@ -121,7 +121,11 @@ Each `container` entry can have:
 
 - [`name`](#name-in-containers): the name of the container
 - [`image`](#image-in-containers): the image for the container
-- [`env_vars](#env-vars-in-containers): optional list of key-value pairs to define environment variables
+- [`env_vars`](#env-vars-in-containers): optional list of key-value pairs to define environment variables
+- [`secrets`](#secrets-in-containers): optional list of secrets to import into the container
+- [`user`](#user-in-containers): optional user to run the container as
+- [`command`](#command-in-containers): optional override for the Docker CMD
+- [`entrypoint`](#entrypoint-in-containers): optional override for the Docker ENTRYPOINT
 
 ```yaml title="Example"
 agent:
@@ -169,38 +173,90 @@ agent:
 
 An optional array of key-value pairs. The keys are exported as environment variables when the container starts.
 
-You can define special variables to modify the container initialization:
+```yaml title="Example"
+agent:
+  machine:
+    type: s1-kubernetes
+    os_image: ''
+  containers:
+    - name: main
+      image: 'registry.semaphoreci.com/ubuntu:22.04'
+    - name: db
+      image: 'registry.semaphoreci.com/postgres:9.6'
+  # highlight-start
+      env_vars:
+        - name: POSTGRES_PASSWORD
+          value: keyboard-cat
+  # highlight-end
+```
 
-- `user`: the active user inside the container
-- `command`: overrides the Docker image's [CMD command](https://docs.docker.com/reference/dockerfile/#cmd)
-- `entrypoint`: overrides the Docker image' [ENTRYPOINT entry](https://docs.docker.com/reference/dockerfile/#entrypoint)
+### secrets {#secrets-in-containers}
 
-You may also supply environment variables with `env_vars` and `secrets`.
+An optional array of secrets to import into the container. Only environment variables defined in the secret are imported. Any files in the secret are ignored.
 
 ```yaml title="Example"
 agent:
   machine:
-    type: e1-standard-2
+    type: s1-kubernetes
+    os_image: ''
+  containers:
+    - name: main
+      image: 'registry.semaphoreci.com/ubuntu:22.04'
   # highlight-start
+      secrets:
+        - name: mysecret
+  # highlight-end
+```
+
+### user {#user-in-containers}
+
+An optional property that specifies the active user inside the container.
+
+```yaml title="Example"
+agent:
+  machine:
+    type: s1-kubernetes
+    os_image: ''
   containers:
     - name: main
-      image: 'registry.semaphoreci.com/ruby:2.6'
+      image: 'registry.semaphoreci.com/ubuntu:22.04'
     - name: db
       image: 'registry.semaphoreci.com/postgres:9.6'
+  # highlight-next-line
       user: postgres
-      secrets:
-        - name: mysecret
-      env_vars:
-        - name: POSTGRES_PASSWORD
-          value: keyboard-cat
-  # highlight-end
 ```
 
-:::note
+### command {#command-in-containers}
 
-For `secrets`, only environment variables defined in the secret are imported. Any files in the secret are ignored.
+An optional property that overrides the Docker image's [CMD command](https://docs.docker.com/reference/dockerfile/#cmd).
 
-:::
+```yaml title="Example"
+agent:
+  machine:
+    type: s1-kubernetes
+    os_image: ''
+  containers:
+    - name: main
+      image: 'registry.semaphoreci.com/ubuntu:22.04'
+  # highlight-next-line
+      command: ["bundle", "exec", "rails", "server"]
+```
+
+### entrypoint {#entrypoint-in-containers}
+
+An optional property that overrides the Docker image's [ENTRYPOINT entry](https://docs.docker.com/reference/dockerfile/#entrypoint).
+
+```yaml title="Example"
+agent:
+  machine:
+    type: s1-kubernetes
+    os_image: ''
+  containers:
+    - name: main
+      image: 'registry.semaphoreci.com/ubuntu:22.04'
+  # highlight-next-line
+      entrypoint: ["/bin/sh", "-c"]
+```
 
 ## execution_time_limit {#execution_time_limit}
 
diff --git a/docs/versioned_docs/version-EE-1.3/reference/pipeline-yaml.md b/docs/versioned_docs/version-EE-1.3/reference/pipeline-yaml.md
index 2c02d8e90..894b19df9 100644
--- a/docs/versioned_docs/version-EE-1.3/reference/pipeline-yaml.md
+++ b/docs/versioned_docs/version-EE-1.3/reference/pipeline-yaml.md
@@ -121,7 +121,11 @@ Each `container` entry can have:
 
 - [`name`](#name-in-containers): the name of the container
 - [`image`](#image-in-containers): the image for the container
-- [`env_vars](#env-vars-in-containers): optional list of key-value pairs to define environment variables
+- [`env_vars`](#env-vars-in-containers): optional list of key-value pairs to define environment variables
+- [`secrets`](#secrets-in-containers): optional list of secrets to import into the container
+- [`user`](#user-in-containers): optional user to run the container as
+- [`command`](#command-in-containers): optional override for the Docker CMD
+- [`entrypoint`](#entrypoint-in-containers): optional override for the Docker ENTRYPOINT
 
 ```yaml title="Example"
 agent:
@@ -169,38 +173,90 @@ agent:
 
 An optional array of key-value pairs. The keys are exported as environment variables when the container starts.
 
-You can define special variables to modify the container initialization:
+```yaml title="Example"
+agent:
+  machine:
+    type: s1-kubernetes
+    os_image: ''
+  containers:
+    - name: main
+      image: 'registry.semaphoreci.com/ubuntu:22.04'
+    - name: db
+      image: 'registry.semaphoreci.com/postgres:9.6'
+  # highlight-start
+      env_vars:
+        - name: POSTGRES_PASSWORD
+          value: keyboard-cat
+  # highlight-end
+```
 
-- `user`: the active user inside the container
-- `command`: overrides the Docker image's [CMD command](https://docs.docker.com/reference/dockerfile/#cmd)
-- `entrypoint`: overrides the Docker image' [ENTRYPOINT entry](https://docs.docker.com/reference/dockerfile/#entrypoint)
+### secrets {#secrets-in-containers}
 
-You may also supply environment variables with `env_vars` and `secrets`.
+An optional array of secrets to import into the container. Only environment variables defined in the secret are imported. Any files in the secret are ignored.
 
 ```yaml title="Example"
 agent:
   machine:
-    type: e1-standard-2
+    type: s1-kubernetes
+    os_image: ''
+  containers:
+    - name: main
+      image: 'registry.semaphoreci.com/ubuntu:22.04'
   # highlight-start
+      secrets:
+        - name: mysecret
+  # highlight-end
+```
+
+### user {#user-in-containers}
+
+An optional property that specifies the active user inside the container.
+
+```yaml title="Example"
+agent:
+  machine:
+    type: s1-kubernetes
+    os_image: ''
   containers:
     - name: main
-      image: 'registry.semaphoreci.com/ruby:2.6'
+      image: 'registry.semaphoreci.com/ubuntu:22.04'
     - name: db
       image: 'registry.semaphoreci.com/postgres:9.6'
+  # highlight-next-line
       user: postgres
-      secrets:
-        - name: mysecret
-      env_vars:
-        - name: POSTGRES_PASSWORD
-          value: keyboard-cat
-  # highlight-end
 ```
 
-:::note
+### command {#command-in-containers}
 
-For `secrets`, only environment variables defined in the secret are imported. Any files in the secret are ignored.
+An optional property that overrides the Docker image's [CMD command](https://docs.docker.com/reference/dockerfile/#cmd).
 
-:::
+```yaml title="Example"
+agent:
+  machine:
+    type: s1-kubernetes
+    os_image: ''
+  containers:
+    - name: main
+      image: 'registry.semaphoreci.com/ubuntu:22.04'
+  # highlight-next-line
+      command: ["bundle", "exec", "rails", "server"]
+```
+
+### entrypoint {#entrypoint-in-containers}
+
+An optional property that overrides the Docker image's [ENTRYPOINT entry](https://docs.docker.com/reference/dockerfile/#entrypoint).
+
+```yaml title="Example"
+agent:
+  machine:
+    type: s1-kubernetes
+    os_image: ''
+  containers:
+    - name: main
+      image: 'registry.semaphoreci.com/ubuntu:22.04'
+  # highlight-next-line
+      entrypoint: ["/bin/sh", "-c"]
+```
 
 ## execution_time_limit {#execution_time_limit}
 
diff --git a/docs/versioned_docs/version-EE/reference/pipeline-yaml.md b/docs/versioned_docs/version-EE/reference/pipeline-yaml.md
index 2c02d8e90..894b19df9 100644
--- a/docs/versioned_docs/version-EE/reference/pipeline-yaml.md
+++ b/docs/versioned_docs/version-EE/reference/pipeline-yaml.md
@@ -121,7 +121,11 @@ Each `container` entry can have:
 
 - [`name`](#name-in-containers): the name of the container
 - [`image`](#image-in-containers): the image for the container
-- [`env_vars](#env-vars-in-containers): optional list of key-value pairs to define environment variables
+- [`env_vars`](#env-vars-in-containers): optional list of key-value pairs to define environment variables
+- [`secrets`](#secrets-in-containers): optional list of secrets to import into the container
+- [`user`](#user-in-containers): optional user to run the container as
+- [`command`](#command-in-containers): optional override for the Docker CMD
+- [`entrypoint`](#entrypoint-in-containers): optional override for the Docker ENTRYPOINT
 
 ```yaml title="Example"
 agent:
@@ -169,38 +173,90 @@ agent:
 
 An optional array of key-value pairs. The keys are exported as environment variables when the container starts.
 
-You can define special variables to modify the container initialization:
+```yaml title="Example"
+agent:
+  machine:
+    type: s1-kubernetes
+    os_image: ''
+  containers:
+    - name: main
+      image: 'registry.semaphoreci.com/ubuntu:22.04'
+    - name: db
+      image: 'registry.semaphoreci.com/postgres:9.6'
+  # highlight-start
+      env_vars:
+        - name: POSTGRES_PASSWORD
+          value: keyboard-cat
+  # highlight-end
+```
 
-- `user`: the active user inside the container
-- `command`: overrides the Docker image's [CMD command](https://docs.docker.com/reference/dockerfile/#cmd)
-- `entrypoint`: overrides the Docker image' [ENTRYPOINT entry](https://docs.docker.com/reference/dockerfile/#entrypoint)
+### secrets {#secrets-in-containers}
 
-You may also supply environment variables with `env_vars` and `secrets`.
+An optional array of secrets to import into the container. Only environment variables defined in the secret are imported. Any files in the secret are ignored.
 
 ```yaml title="Example"
 agent:
   machine:
-    type: e1-standard-2
+    type: s1-kubernetes
+    os_image: ''
+  containers:
+    - name: main
+      image: 'registry.semaphoreci.com/ubuntu:22.04'
   # highlight-start
+      secrets:
+        - name: mysecret
+  # highlight-end
+```
+
+### user {#user-in-containers}
+
+An optional property that specifies the active user inside the container.
+
+```yaml title="Example"
+agent:
+  machine:
+    type: s1-kubernetes
+    os_image: ''
   containers:
     - name: main
-      image: 'registry.semaphoreci.com/ruby:2.6'
+      image: 'registry.semaphoreci.com/ubuntu:22.04'
     - name: db
       image: 'registry.semaphoreci.com/postgres:9.6'
+  # highlight-next-line
       user: postgres
-      secrets:
-        - name: mysecret
-      env_vars:
-        - name: POSTGRES_PASSWORD
-          value: keyboard-cat
-  # highlight-end
 ```
 
-:::note
+### command {#command-in-containers}
 
-For `secrets`, only environment variables defined in the secret are imported. Any files in the secret are ignored.
+An optional property that overrides the Docker image's [CMD command](https://docs.docker.com/reference/dockerfile/#cmd).
 
-:::
+```yaml title="Example"
+agent:
+  machine:
+    type: s1-kubernetes
+    os_image: ''
+  containers:
+    - name: main
+      image: 'registry.semaphoreci.com/ubuntu:22.04'
+  # highlight-next-line
+      command: ["bundle", "exec", "rails", "server"]
+```
+
+### entrypoint {#entrypoint-in-containers}
+
+An optional property that overrides the Docker image's [ENTRYPOINT entry](https://docs.docker.com/reference/dockerfile/#entrypoint).
+
+```yaml title="Example"
+agent:
+  machine:
+    type: s1-kubernetes
+    os_image: ''
+  containers:
+    - name: main
+      image: 'registry.semaphoreci.com/ubuntu:22.04'
+  # highlight-next-line
+      entrypoint: ["/bin/sh", "-c"]
+```
 
 ## execution_time_limit {#execution_time_limit}