diff --git a/Dockerfile.collector b/Dockerfile.collector
index d7a39dd..b3b15d4 100644
--- a/Dockerfile.collector
+++ b/Dockerfile.collector
@@ -20,11 +20,6 @@ RUN apt install /tmp/jobber_1.4.4-1_amd64.deb
 
 RUN apt-get update && apt-get install -y smartmontools=7.0-0ubuntu1~ubuntu18.04.1
 
-ADD https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-amd64.tar.gz /tmp/
-RUN tar xzf /tmp/s6-overlay-amd64.tar.gz -C / && \
-    mkdir -p /rootfs/etc/services.d/jobber
-
-COPY /rootfs/etc/services.d/jobber /etc/services.d/jobber
 COPY /rootfs/scrutiny /scrutiny
 
 
@@ -33,4 +28,4 @@ COPY --from=backendbuild /go/src/github.com/analogj/scrutiny/scrutiny-collector-
 RUN chmod +x /scrutiny/bin/scrutiny-collector-selftest && \
     chmod +x /scrutiny/bin/scrutiny-collector-metrics
 
-CMD ["/init"]
+CMD ["/usr/lib/x86_64-linux-gnu/jobberrunner", "/scrutiny/config/jobber.yaml"]
diff --git a/Dockerfile.web b/Dockerfile.web
index 191e409..f247ce4 100644
--- a/Dockerfile.web
+++ b/Dockerfile.web
@@ -29,25 +29,9 @@ EXPOSE 8080
 WORKDIR /scrutiny
 ENV PATH="/scrutiny/bin:${PATH}"
 
-ADD https://github.com/dshearer/jobber/releases/download/v1.4.4/jobber_1.4.4-1_amd64.deb /tmp/
-RUN apt install /tmp/jobber_1.4.4-1_amd64.deb
-
-RUN apt-get update && apt-get install -y smartmontools=7.0-0ubuntu1~ubuntu18.04.1
-
-ADD https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-amd64.tar.gz /tmp/
-RUN tar xzf /tmp/s6-overlay-amd64.tar.gz -C /
-COPY /rootfs /
-
-
 COPY --from=backendbuild /go/src/github.com/analogj/scrutiny/scrutiny /scrutiny/bin/
-COPY --from=backendbuild /go/src/github.com/analogj/scrutiny/scrutiny-collector-selftest /scrutiny/bin/
-COPY --from=backendbuild /go/src/github.com/analogj/scrutiny/scrutiny-collector-metrics /scrutiny/bin/
 COPY --from=frontendbuild /scrutiny/dist /scrutiny/web
 RUN chmod +x /scrutiny/bin/scrutiny && \
-    chmod +x /scrutiny/bin/scrutiny-collector-selftest && \
-    chmod +x /scrutiny/bin/scrutiny-collector-metrics && \
     mkdir -p /scrutiny/web && \
-    mkdir -p /scrutiny/config && \
-    mkdir -p /scrutiny/jobber
-
-CMD ["/init"]
+    mkdir -p /scrutiny/config
+CMD ["/scrutiny", "start"]