diff --git a/docs/developers/ci-setup.md b/docs/developers/ci-setup.md
index ae52415c7..e397c579b 100644
--- a/docs/developers/ci-setup.md
+++ b/docs/developers/ci-setup.md
@@ -90,7 +90,7 @@ containerd_registries_mirrors:
         capabilities: ["pull", "resolve"]
         skip_verify: false
 
-containerd_max_container_log_line_size: -1
+containerd_max_container_log_line_size: 16384
 
 crio_registries_mirrors:
   - prefix: docker.io
diff --git a/inventory/sample/group_vars/all/containerd.yml b/inventory/sample/group_vars/all/containerd.yml
index c8fa41943..906437df0 100644
--- a/inventory/sample/group_vars/all/containerd.yml
+++ b/inventory/sample/group_vars/all/containerd.yml
@@ -51,7 +51,7 @@
 #       capabilities: ["pull", "resolve"]
 #       skip_verify: false
 
-# containerd_max_container_log_line_size: -1
+# containerd_max_container_log_line_size: 16384
 
 # containerd_registry_auth:
 #   - registry: 10.0.0.2:5000
diff --git a/roles/container-engine/containerd/defaults/main.yml b/roles/container-engine/containerd/defaults/main.yml
index f04bb927a..b6c7fdccd 100644
--- a/roles/container-engine/containerd/defaults/main.yml
+++ b/roles/container-engine/containerd/defaults/main.yml
@@ -63,7 +63,7 @@ containerd_registries_mirrors:
         capabilities: ["pull", "resolve"]
         skip_verify: false
 
-containerd_max_container_log_line_size: -1
+containerd_max_container_log_line_size: 16384
 
 # If enabled it will allow non root users to use port numbers <1024
 containerd_enable_unprivileged_ports: false
diff --git a/tests/common/_docker_hub_registry_mirror.yml b/tests/common/_docker_hub_registry_mirror.yml
index 4280f9d8e..8875d2173 100644
--- a/tests/common/_docker_hub_registry_mirror.yml
+++ b/tests/common/_docker_hub_registry_mirror.yml
@@ -15,7 +15,7 @@ containerd_registries_mirrors:
         capabilities: ["pull", "resolve"]
         skip_verify: false
 
-containerd_max_container_log_line_size: -1
+containerd_max_container_log_line_size: 16384
 
 crio_registries:
   - prefix: docker.io