diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index acc1155..ec59574 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -37,4 +37,6 @@ ghcr.io/analogj/scrutiny:master-omnibus
 docker exec scrutiny scrutiny-collector-metrics run
 ```
 
-The log files will be available on your host in the `config` directory. Please attach them to this issue. 
\ No newline at end of file
+The log files will be available on your host in the `config` directory. Please attach them to this issue. 
+
+Please also provide the output of `docker info`
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7411f23..41b0eab 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,5 @@
 ########
-FROM golang:1.17.10-buster as backendbuild
+FROM golang:1.17-bullseye as backendbuild
 
 WORKDIR /go/src/github.com/analogj/scrutiny
 
@@ -11,7 +11,7 @@ RUN go mod vendor && \
     go build -ldflags '-w -extldflags "-static"' -o scrutiny-collector-metrics collector/cmd/collector-metrics/collector-metrics.go
 
 ########
-FROM ubuntu:latest as runtime
+FROM debian:bullseye-slim as runtime
 ARG TARGETARCH
 EXPOSE 8080
 WORKDIR /opt/scrutiny
@@ -25,8 +25,7 @@ RUN apt-get update && apt-get install -y cron smartmontools ca-certificates curl
             "arm64")  S6_ARCH=aarch64  ;; \
         esac \
     && curl https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-${S6_ARCH}.tar.gz -L -s --output /tmp/s6-overlay-${S6_ARCH}.tar.gz \
-    && tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C / --exclude="./bin" \
-    && tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C /usr ./bin \
+    && tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C / \
     && rm -rf /tmp/s6-overlay-${S6_ARCH}.tar.gz \
     && curl -L https://dl.influxdata.com/influxdb/releases/influxdb2-2.2.0-${TARGETARCH}.deb --output /tmp/influxdb2-2.2.0-${TARGETARCH}.deb \
     && dpkg -i --force-all /tmp/influxdb2-2.2.0-${TARGETARCH}.deb
diff --git a/docker/Dockerfile.collector b/docker/Dockerfile.collector
index 4c1dc8e..18d5d6f 100644
--- a/docker/Dockerfile.collector
+++ b/docker/Dockerfile.collector
@@ -1,5 +1,5 @@
 ########
-FROM golang:1.17.10-buster as backendbuild
+FROM golang:1.17-bullseye as backendbuild
 
 WORKDIR /go/src/github.com/analogj/scrutiny
 
@@ -10,7 +10,7 @@ RUN go mod vendor && \
     go build -ldflags '-w -extldflags "-static"' -o scrutiny-collector-metrics collector/cmd/collector-metrics/collector-metrics.go
 
 ########
-FROM ubuntu:latest as runtime
+FROM debian:bullseye-slim as runtime
 WORKDIR /scrutiny
 ENV PATH="/opt/scrutiny/bin:${PATH}"
 
diff --git a/docker/Dockerfile.web b/docker/Dockerfile.web
index b424f52..2ba3792 100644
--- a/docker/Dockerfile.web
+++ b/docker/Dockerfile.web
@@ -1,5 +1,5 @@
 ########
-FROM golang:1.17.10-buster as backendbuild
+FROM golang:1.17-bullseye as backendbuild
 
 WORKDIR /go/src/github.com/analogj/scrutiny
 
@@ -9,7 +9,7 @@ RUN go mod vendor && \
     go build -ldflags '-w -extldflags "-static"' -o scrutiny webapp/backend/cmd/scrutiny/scrutiny.go
 
 ########
-FROM ubuntu:latest as runtime
+FROM debian:bullseye-slim as runtime
 EXPOSE 8080
 WORKDIR /opt/scrutiny
 ENV PATH="/opt/scrutiny/bin:${PATH}"
diff --git a/webapp/frontend/src/styles/styles.scss b/webapp/frontend/src/styles/styles.scss
index 9329b78..54b0075 100644
--- a/webapp/frontend/src/styles/styles.scss
+++ b/webapp/frontend/src/styles/styles.scss
@@ -5,14 +5,20 @@
 //  modifications of third party libraries.
 // -----------------------------------------------------------------------------------------------------
 
-.treo-theme-dark .yellow-50 {
-    background-color: #242b38 !important;
+.treo-theme-dark {
+    .yellow-50 {
+        background-color: #242b38 !important;
 
-    .mat-icon {
-        color: #0694a2 !important;
+        .mat-icon {
+            color: #0694a2 !important;
+        }
+
+        .text-secondary {
+            color: #0694a2 !important
+        }
     }
-
-    .text-secondary {
-        color: #0694a2 !important
+    .apexcharts-tooltip {
+        background: #242b38 !important;
+        //color: orange;
     }
 }