diff --git a/README.md b/README.md
index 398e285..6d42981 100644
--- a/README.md
+++ b/README.md
@@ -152,6 +152,11 @@ is manual though. The steps for adding a new CD.
 
 All steps below are to be executed as the `music` user.
 
+### Note on tagging
+
+* For live albums add "YYYY-MM-DD at Venue, City, Country" in the "Subtitle" tag.
+* For remasters use original release tags and add "YYYY Remaster" in the "Subtitle" tag.
+
 ### Ripping a CD
 
 1. Use a CD ripper and rip the CD to `/var/lib/yggdrasil/home/music/rip` using flac encoding.
diff --git a/playbooks/roles/music/org/templates/beets.yml b/playbooks/roles/music/org/templates/beets.yml
index f982667..4ff672b 100644
--- a/playbooks/roles/music/org/templates/beets.yml
+++ b/playbooks/roles/music/org/templates/beets.yml
@@ -2,9 +2,14 @@ plugins: convert fetchart
 library: {{ music_user_data_directory }}/flac/library.db
 
 directory: {{ music_user_data_directory }}/flac
+paths:
+  default: $albumartist/$year $album%aunique{}/$track $title
+  singleton: Non-Album/$artist/$title
+  comp: Compilations/$year $album%aunique{}/$track $title
 import:
   move: yes
   write: no
+  autotag: no
 
 convert:
   dest: /var/tmp/{{ music_user_name }}/mp3