diff --git a/src/parser/mod.rs b/src/parser/mod.rs
index f4c8260..4df6eda 100644
--- a/src/parser/mod.rs
+++ b/src/parser/mod.rs
@@ -158,10 +158,19 @@ pub async fn prep_song(
                                                     match crate::api::get_coverart_queue::get_data(app, &coverart_queue_id).await {
                                                         Ok(response) => match crate::api::parsing::parse_response_into_bytes(response).await {
                                                             Ok(coverart_queue_bytes) => {
-                                                                let (directory, filename) = crate::util::generate_coverart_queue_dir_and_filename(&coverart_queue.file_type).await;
+                                                                // TODO: Consider separating song and coverart when saving to the filesystem
+                                                                // let (directory, filename) = crate::util::generate_coverart_queue_dir_and_filename(&coverart_queue.file_type).await;
+                                                                let covart_type = if coverart_queue.file_type == "png" {
+                                                                    icarus_models::types::CoverArtTypes::PngExtension
+                                                                } else if coverart_queue.file_type == "jpeg" {
+                                                                    icarus_models::types::CoverArtTypes::JpegExtension
+                                                                } else {
+                                                                    // TODO: This doesn't seem right
+                                                                    icarus_models::types::CoverArtTypes::JpgExtension
+                                                                };
                                                                 let coverart = icarus_models::coverart::CoverArt {
-                                                                    directory,
-                                                                    filename,
+                                                                    directory: icarus_envy::environment::get_root_directory().await.value,
+                                                                    filename: icarus_models::coverart::generate_filename(covart_type, true),
                                                                     data: coverart_queue_bytes,
                                                                     ..Default::default()
                                                                 };