diff --git a/lazy.ansible/.manala/docker/compose/term.yaml b/lazy.ansible/.manala/docker/compose/term.yaml
new file mode 100644
index 00000000..6dacb727
--- /dev/null
+++ b/lazy.ansible/.manala/docker/compose/term.yaml
@@ -0,0 +1,9 @@
+services:
+
+    ##########
+    # System #
+    ##########
+
+    system:
+        environment:
+            TERM: ${TERM:-xterm}
diff --git a/lazy.ansible/.manala/docker/docker.mk b/lazy.ansible/.manala/docker/docker.mk
index a232759c..7d73601b 100644
--- a/lazy.ansible/.manala/docker/docker.mk
+++ b/lazy.ansible/.manala/docker/docker.mk
@@ -101,6 +101,9 @@ MANALA_DOCKER_COMPOSE_FILE += \
 # Debug
 MANALA_DOCKER_COMPOSE_ENV += $(if $(MANALA_DOCKER_DEBUG), BUILDKIT_PROGRESS=plain)
 
+# OhMyZsh - See https://github.com/zsh-users/zsh-autosuggestions/issues/12#issuecomment-51770351
+MANALA_DOCKER_COMPOSE_FILE += $(MANALA_DIR)/.manala/docker/compose/term.yaml
+
 # Usage:
 #   $(manala_docker_compose) [COMMAND] [ARGS...]
 
diff --git a/lazy.kubernetes/.manala/docker/compose/term.yaml b/lazy.kubernetes/.manala/docker/compose/term.yaml
new file mode 100644
index 00000000..6dacb727
--- /dev/null
+++ b/lazy.kubernetes/.manala/docker/compose/term.yaml
@@ -0,0 +1,9 @@
+services:
+
+    ##########
+    # System #
+    ##########
+
+    system:
+        environment:
+            TERM: ${TERM:-xterm}
diff --git a/lazy.kubernetes/.manala/docker/docker.mk b/lazy.kubernetes/.manala/docker/docker.mk
index a232759c..7d73601b 100644
--- a/lazy.kubernetes/.manala/docker/docker.mk
+++ b/lazy.kubernetes/.manala/docker/docker.mk
@@ -101,6 +101,9 @@ MANALA_DOCKER_COMPOSE_FILE += \
 # Debug
 MANALA_DOCKER_COMPOSE_ENV += $(if $(MANALA_DOCKER_DEBUG), BUILDKIT_PROGRESS=plain)
 
+# OhMyZsh - See https://github.com/zsh-users/zsh-autosuggestions/issues/12#issuecomment-51770351
+MANALA_DOCKER_COMPOSE_FILE += $(MANALA_DIR)/.manala/docker/compose/term.yaml
+
 # Usage:
 #   $(manala_docker_compose) [COMMAND] [ARGS...]
 
diff --git a/lazy.symfony/.manala/docker/compose/term.yaml b/lazy.symfony/.manala/docker/compose/term.yaml
new file mode 100644
index 00000000..6dacb727
--- /dev/null
+++ b/lazy.symfony/.manala/docker/compose/term.yaml
@@ -0,0 +1,9 @@
+services:
+
+    ##########
+    # System #
+    ##########
+
+    system:
+        environment:
+            TERM: ${TERM:-xterm}
diff --git a/lazy.symfony/.manala/docker/docker.mk b/lazy.symfony/.manala/docker/docker.mk
index cddf3972..9b50b418 100644
--- a/lazy.symfony/.manala/docker/docker.mk
+++ b/lazy.symfony/.manala/docker/docker.mk
@@ -109,6 +109,9 @@ MANALA_DOCKER_COMPOSE_FILE += $(foreach SERVICE, $(MANALA_DOCKER_SERVICES), \
 # Debug
 MANALA_DOCKER_COMPOSE_ENV += $(if $(MANALA_DOCKER_DEBUG), BUILDKIT_PROGRESS=plain)
 
+# OhMyZsh - See https://github.com/zsh-users/zsh-autosuggestions/issues/12#issuecomment-51770351
+MANALA_DOCKER_COMPOSE_FILE += $(MANALA_DIR)/.manala/docker/compose/term.yaml
+
 # Usage:
 #   $(manala_docker_compose) [COMMAND] [ARGS...]