diff --git a/roles/taskotron/buildmaster/templates/artifacts.conf.j2 b/roles/taskotron/buildmaster/templates/artifacts.conf.j2
index 565c7339c3..56363c816a 100644
--- a/roles/taskotron/buildmaster/templates/artifacts.conf.j2
+++ b/roles/taskotron/buildmaster/templates/artifacts.conf.j2
@@ -1,11 +1,19 @@
-Alias /artifacts /srv/taskotron/artifacts
-<Directory "/srv/taskotron/artifacts">
+Alias /artifacts {{ public_artifacts_dir }}
+<Directory "{{ public_artifacts_dir }}">
     Options +Indexes
     IndexOptions +NameWidth=*
     AllowOverride None
     Require all granted
 </Directory>
 
-<Directory "/srv/taskotron/artifacts/all">
+<Directory "{{ public_artifacts_dir }}/all">
     Options -Indexes
 </Directory>
+
+<DirectoryMatch "^{{ public_artifacts_dir }}/all/(.+)/">
+    Options +Indexes
+    IndexOptions +NameWidth=*
+    AllowOverride None
+    Require all granted
+</DirectoryMatch>
+