diff --git a/containers/osbuild-composer/entrypoint.py b/containers/osbuild-composer/entrypoint.py
index 19622f410..6a973bd2b 100644
--- a/containers/osbuild-composer/entrypoint.py
+++ b/containers/osbuild-composer/entrypoint.py
@@ -10,6 +10,7 @@ import argparse
 import contextlib
 import os
 import pathlib
+import signal
 import socket
 import subprocess
 import sys
@@ -302,6 +303,13 @@ class Cli(contextlib.AbstractContextManager):
         res = 0
         sockets = self._prepare_sockets()
 
+        def handler(signum, frame):
+            proc_composer.terminate()
+            proc_worker.terminate()
+            proc_dnf_json.terminate()
+
+        signal.signal(signal.SIGTERM, handler)
+
         liveness = pathlib.Path('/run/live')
 
         liveness.touch()