diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
index 51c1b1fb08..954033cc59 100644
--- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
+++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
@@ -173,27 +173,17 @@ factory.addStep(ShellCommand(command=["runtask", '-i',
 
 
 {% if deployment_type == 'dev' %}
-
-import datetime
-from buildbot.process.properties import renderer
-
-@renderer
-def today(props):
-    return datetime.datetime.now().strftime("%Y%m%d")
-
-artifactsdir = Interpolate('{{ public_artifacts_dir }}/%(kw:today)s/%(prop:uuid)s', today=today)
-
 # create artifacts dir on master
-factory.addStep(MasterShellCommand(command=["mkdir", '-p', '-m', '0755', artifactsdir],
+factory.addStep(MasterShellCommand(command=["mkdir", '-m', '0755', Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s')],
                                    descriptionDone=['Create artifacs dir']))
 
 # copy artifacts to master
 factory.addStep(DirectoryUpload(slavesrc=Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/'),
-                                masterdest='%s/task_output' % artifactsdir))
+                                masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/task_output')))
 
 # copy taskotron log to master
 factory.addStep(FileUpload(slavesrc='/var/log/taskotron/taskotron.log',
-                           masterdest='%s/taskotron.log' % artifactsdir,
+                           masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/taskotron.log'),
                            mode=0644))
 {% else %}
 # capture the taskotron log