diff --git a/rootfs/etc/s6-overlay/s6-rc.d/02-piaware-log-prepare/dependencies.d/base b/rootfs/etc/s6-overlay/s6-rc.d/02-piaware-log-prepare/dependencies.d/base
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/02-piaware-log-prepare/type b/rootfs/etc/s6-overlay/s6-rc.d/02-piaware-log-prepare/type
deleted file mode 100644
index 3d92b15..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/02-piaware-log-prepare/type
+++ /dev/null
@@ -1 +0,0 @@
-oneshot
\ No newline at end of file
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/02-piaware-log-prepare/up b/rootfs/etc/s6-overlay/s6-rc.d/02-piaware-log-prepare/up
deleted file mode 100755
index 1cee1e9..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/02-piaware-log-prepare/up
+++ /dev/null
@@ -1,3 +0,0 @@
-if { mkdir -p /var/log/piaware }
-if { chown nobody:nogroup /var/log/piaware }
-chmod 02755 /var/log/piaware
\ No newline at end of file
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/consumer-for b/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/consumer-for
deleted file mode 100644
index 29efc2d..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/consumer-for
+++ /dev/null
@@ -1 +0,0 @@
-piaware
\ No newline at end of file
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/dependencies.d/01-piaware b/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/dependencies.d/01-piaware
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/pipeline-name b/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/pipeline-name
deleted file mode 100644
index b7d9e2c..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/pipeline-name
+++ /dev/null
@@ -1 +0,0 @@
-piaware-pipeline
\ No newline at end of file
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/run b/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/run
deleted file mode 100755
index 9f1da17..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logutil-service /var/log/piaware
\ No newline at end of file
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/type b/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/type
deleted file mode 100644
index 5883cff..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/piaware/dependencies.d/02-piaware-log-prepare b/rootfs/etc/s6-overlay/s6-rc.d/piaware/dependencies.d/02-piaware-log-prepare
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/piaware/producer-for b/rootfs/etc/s6-overlay/s6-rc.d/piaware/producer-for
deleted file mode 100644
index c4fc18e..0000000
--- a/rootfs/etc/s6-overlay/s6-rc.d/piaware/producer-for
+++ /dev/null
@@ -1 +0,0 @@
-piaware-log
\ No newline at end of file
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/piaware/run b/rootfs/etc/s6-overlay/s6-rc.d/piaware/run
index 1ce6dab..261037b 100755
--- a/rootfs/etc/s6-overlay/s6-rc.d/piaware/run
+++ b/rootfs/etc/s6-overlay/s6-rc.d/piaware/run
@@ -1,3 +1,2 @@
 #!/bin/sh
-exec 2>&1
 exec /etc/s6-overlay/scripts/piaware
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/piaware-pipeline b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/piaware-pipeline
deleted file mode 100644
index e69de29..0000000
diff --git a/rootfs/etc/s6-overlay/scripts/piaware b/rootfs/etc/s6-overlay/scripts/piaware
index 88d006c..90efeb0 100755
--- a/rootfs/etc/s6-overlay/scripts/piaware
+++ b/rootfs/etc/s6-overlay/scripts/piaware
@@ -16,6 +16,6 @@ fi
 
 # shellcheck disable=SC2016
 "${PIAWARE_BIN}" "${PIAWARE_CMD[@]}" \
-  2>&1 | stdbuf -o0 sed '/^$/d' | stdbuf -o0 awk '{print "[piaware] " strftime("%Y/%m/%d %H:%M:%S", systime()) " " $0}'
+  2>&1 | stdbuf -o0 sed '/^$/d' | stdbuf -o0 awk '{print "[piaware] " strftime("%Y/%m/%d %H:%M:%S", systime()) " " $0}' | tee -a /var/log/piaware/current
 
 sleep 5