diff --git a/scripts/recording-sink.sh b/scripts/recording-sink.sh
index a46bf2614a9877fd9e6bf02a6983ea2cc5e931c7..1b07b5ac406c2c8a068936332f5d163b55fb6213 100755
--- a/scripts/recording-sink.sh
+++ b/scripts/recording-sink.sh
@@ -1,12 +1,23 @@
 #!/bin/sh
-set
 
 echo "[INFO] Recording to /storage/capture/${EVENT}/${ROOM} started…"
 
+mkdir -p "/storage/capture/${EVENT}"
+
 ffmpeg -y -nostdin -hide_banner -re \
+    -init_hw_device vaapi=vaapi0:/dev/dri/renderD129 \
+    -hwaccel vaapi \
+    -hwaccel_output_format vaapi \
     -thread_queue_size 512 -i tcp://localhost:11000?timeout=3000000 \
-    -map 0:v -c:v:0 mpeg2video -pix_fmt:v:0 yuv420p -qscale:v:0 4 -qmin:v:0 4 -qmax:v:0 4 -keyint_min:v:0 5 -bf:v:0 0 -g:v:0 5 -me_method:v:0 dia -metadata:s:v:0 title="HD" \
-    -map 0:a:0 -c:a s302m -metadata:s:a:0 title="Native" \
+    -filter_hw_device vaapi0 \
+    -filter_complex "[0:v]format=nv12,hwupload[hd];" \
+    -c:v h264_vaapi \
+    -flags +cgop -aspect 16:9 \
+    -r:v:0 60 -g:v:0 180 \
+    -map "[hd]" \
+    -metadata:s:v:0 title="HD" \
+    -map "0:a:0" -metadata:s:a:0 title="native" \
+    -c:a s302m \
     -strict -2 \
     -flags +global_header \
     -f segment \
diff --git a/scripts/streaming-sink.sh b/scripts/streaming-sink.sh
index b36008b36636fc5563eb5cbd8c182d53dfe177e7..656774173864ff70b26b13050f195ea569c9aae8 100755
--- a/scripts/streaming-sink.sh
+++ b/scripts/streaming-sink.sh
@@ -15,15 +15,15 @@ else
 fi
 
 ffmpeg -y -nostdin -hide_banner -re \
-    -init_hw_device vaapi=vaapi0:/dev/dri/renderD128 \
+    -init_hw_device vaapi=vaapi0:/dev/dri/renderD129 \
     -hwaccel vaapi \
     -hwaccel_output_format vaapi \
     -thread_queue_size 512 -i tcp://localhost:15000?timeout=3000000 \
     -filter_hw_device vaapi0 \
-    -filter_complex "[0:v]hqdn3d,format=nv12,hwupload[hd];" \
+    -filter_complex "[0:v]format=nv12,hwupload[hd];" \
     -c:v h264_vaapi \
     -flags +cgop -aspect 16:9 \
-    -r:v:0 30 -g:v:0 90 -crf:v:0 21 -maxrate:v:0 6M -bufsize:v:0 24M \
+    -r:v:0 30 -g:v:0 60 -b:v 6M -maxrate:v:0 8M \
     -c:a aac -b:a 192k -ar 48000 \
     -map "[hd]" \
     -metadata:s:v:0 title="HD" \
diff --git a/services/voctomix2-recording-sink.service b/services/voctomix2-recording-sink.service
index a727de29566918371d84a99b4e3b3cd65aaeee6b..e916dcc9fdc8129c3e862537c43c107c3de8560a 100644
--- a/services/voctomix2-recording-sink.service
+++ b/services/voctomix2-recording-sink.service
@@ -15,3 +15,4 @@ StartLimitInterval=0
 
 [Install]
 WantedBy=voctomix2-voctocore.service
+
diff --git a/services/voctomix2-streaming-sink.service b/services/voctomix2-streaming-sink.service
index 0302b488cb4492c431339489143b8475f2579f29..7dc03319f7479241ade05c3f981fcddc7137514a 100644
--- a/services/voctomix2-streaming-sink.service
+++ b/services/voctomix2-streaming-sink.service
@@ -15,3 +15,4 @@ StartLimitInterval=0
 
 [Install]
 WantedBy=voctomix2-voctocore.service
+