diff --git a/src/ytdl_sub/prebuilt_presets/tv_show/episode.yaml b/src/ytdl_sub/prebuilt_presets/tv_show/episode.yaml
index b6bacd27..81825bce 100644
--- a/src/ytdl_sub/prebuilt_presets/tv_show/episode.yaml
+++ b/src/ytdl_sub/prebuilt_presets/tv_show/episode.yaml
@@ -36,14 +36,11 @@ presets:
       tv_show_genre: "{subscription_indent_1}"
       tv_show_content_rating: "{subscription_indent_2}"
       season_directory_name: "Season {season_number_padded}"
-      episode_title: "{upload_date_standardized} - {title}"
+      episode_title: "{episode_date_standardized} - {title}"
       episode_plot: "{webpage_url}\n\n{description}"
-      episode_year: "{upload_year}"
       episode_content_rating: "{tv_show_content_rating}"
       episode_date_standardized: "{upload_date_standardized}"
       episode_file_name: "s{season_number_padded}.e{episode_number_padded} - {file_title}"
       episode_file_path: "{season_directory_name_sanitized}/{episode_file_name_sanitized}"
       thumbnail_file_name: "{episode_file_path}-thumb.jpg"
-
-
-
+      episode_year: "{%slice(episode_date_standardized, 0, 4)}"
diff --git a/src/ytdl_sub/prebuilt_presets/tv_show/tv_show_by_date.yaml b/src/ytdl_sub/prebuilt_presets/tv_show/tv_show_by_date.yaml
index 5c701248..3f54c33e 100644
--- a/src/ytdl_sub/prebuilt_presets/tv_show/tv_show_by_date.yaml
+++ b/src/ytdl_sub/prebuilt_presets/tv_show/tv_show_by_date.yaml
@@ -108,6 +108,12 @@ presets:
 
       episode_number: "{ %array_at(episode_number_and_padded_, 0) }"
       episode_number_padded: "{ %pad_zero( %int(episode_number), %int(%array_at(episode_number_and_padded_, 1))) }"
+      episode_date_standardized: >-
+        %if(
+          %contains(tv_show_by_date_episode_ordering, "release"),
+          release_date_standardized,
+          upload_date_standardized
+        )
 
 ####################################################################################################
 # LEGACY PRESETS
diff --git a/src/ytdl_sub/prebuilt_presets/tv_show/tv_show_collection.yaml b/src/ytdl_sub/prebuilt_presets/tv_show/tv_show_collection.yaml
index 3ebe03a4..71a81dc6 100644
--- a/src/ytdl_sub/prebuilt_presets/tv_show/tv_show_collection.yaml
+++ b/src/ytdl_sub/prebuilt_presets/tv_show/tv_show_collection.yaml
@@ -62,6 +62,14 @@ presets:
 
       episode_number: "{ %array_at(episode_number_and_padded_, 0) }"
       episode_number_padded: "{ %pad_zero( %int(episode_number), %int(%array_at(episode_number_and_padded_, 1))) }"
+      episode_date_standardized: >-
+        {
+          %if(
+            %contains(tv_show_collection_episode_ordering, "release"),
+            release_date_standardized,
+            upload_date_standardized
+          )
+        }
 
   ### LEGACY PRESETS