diff --git a/assets/ffpapi.service b/assets/ffpapi.service
index 7efe360d..8cbf18c6 100644
--- a/assets/ffpapi.service
+++ b/assets/ffpapi.service
@@ -7,7 +7,6 @@ ExecStart=/usr/bin/ffpapi -l 127.0.0.1:8000
 Restart=always
 RestartSec=1
 User=ffpu
-Group=ffpu
 
 [Install]
 WantedBy=multi-user.target
diff --git a/assets/ffplayout.service b/assets/ffplayout.service
index 4cdb7690..ba7cf61c 100644
--- a/assets/ffplayout.service
+++ b/assets/ffplayout.service
@@ -8,7 +8,6 @@ Restart=always
 RestartSec=1
 KillMode=mixed
 User=ffpu
-Group=ffpu
 
 [Install]
 WantedBy=multi-user.target
diff --git a/assets/ffplayout@.service b/assets/ffplayout@.service
index 695cc38d..37a9f1a1 100644
--- a/assets/ffplayout@.service
+++ b/assets/ffplayout@.service
@@ -8,7 +8,6 @@ Restart=always
 RestartSec=1
 KillMode=mixed
 User=ffpu
-Group=ffpu
 
 [Install]
 WantedBy=multi-user.target
diff --git a/ffplayout-api/src/utils/playlist.rs b/ffplayout-api/src/utils/playlist.rs
index f917a4e8..bc800eab 100644
--- a/ffplayout-api/src/utils/playlist.rs
+++ b/ffplayout-api/src/utils/playlist.rs
@@ -54,6 +54,10 @@ pub async fn write_playlist(id: i64, json_data: JsonPlaylist) -> Result<String,
         .join(date.clone())
         .with_extension("json");
 
+    if let Some(p) = playlist_path.parent() {
+        fs::create_dir_all(p)?;
+    }
+
     if playlist_path.is_file() {
         if let Ok(existing_data) = json_reader(&playlist_path) {
             if json_data == existing_data {