diff --git a/Containerfile b/Containerfile
index 5ffbe8adfba5509fe6554e9fcfc3f48dff654e3a..fa266a289fa0cfc26806075e53baa7b40df0a04e 100644
--- a/Containerfile
+++ b/Containerfile
@@ -35,11 +35,11 @@ LABEL maintainer="Dmitry Misharov <misharov@redhat.com>" \
 
 WORKDIR $HOME
 
-COPY cleanup.py env.py config.sh prepare.py run.py requirements.txt start.sh .
+COPY cleanup.py env.py config.sh prepare.py run.py requirements.txt start.sh ./
 
 RUN dnf install -y --nodocs python38-pip git-core && \
     python3.8 -m venv $VENV && \
-    pip install wheel && \
+    pip install wheel dumb-init && \
     pip install -r requirements.txt && \
     dnf remove -y git-core && \
     dnf clean all -y
@@ -50,4 +50,5 @@ RUN chgrp -R 0 $HOME && \
 
 USER 1001
 
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
 CMD ["./start.sh"]
diff --git a/start.sh b/start.sh
index d840fb0b383187c2ec566478c0f668a3600b8c9c..4cce533840e265071b7db0f7926ca1129d43fb56 100644
--- a/start.sh
+++ b/start.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-trap cleanup 1 2 3 6
+trap cleanup SIGTERM
 
 cleanup() {
     gitlab-runner unregister --all-runners