diff --git a/roles/batcave/files/update-infra-tags b/roles/batcave/files/update-infra-tags
new file mode 100644
index 0000000000..22051371df
--- /dev/null
+++ b/roles/batcave/files/update-infra-tags
@@ -0,0 +1,2 @@
+MAILTO=puiterwijk@fedoraproject.org
+30 1 * * * root /mnt/fedora/app/fi-repo/infra/update.sh > /dev/null
diff --git a/roles/batcave/tasks/main.yml b/roles/batcave/tasks/main.yml
index 33b341be14..78fbd92818 100644
--- a/roles/batcave/tasks/main.yml
+++ b/roles/batcave/tasks/main.yml
@@ -234,6 +234,15 @@
   - batcave
   - config
 
+#
+# update infra-tags repo cron job
+#
+- name: setup update-infra-tags cron
+  copy: src=update-infra-tags dest=/etc/cron.d/update-infra-tags mode=0644
+  tags:
+  - batcave
+  - config
+
 #
 # Setup web server config
 #