diff --git a/setup/start.sh b/setup/start.sh
index 909cba975..dce481314 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -89,6 +89,10 @@ EOF
 
 set_progress "28" "Setup collectd"
 cp "${script_dir}/start/collectd.conf" "${DATA_DIR}/collectd/collectd.conf"
+# collectd 5.4.1 has some bug where we simply cannot get it to create df-vda1
+mkdir -p "${DATA_DIR}/graphite/whisper/collectd/localhost/"
+vda1_id=$(blkid -s UUID -o value /dev/vda1)
+ln -sfF "df-disk_by-uuid_${vda1_id}" "${DATA_DIR}/graphite/whisper/collectd/localhost/df-vda1"
 service collectd restart
 
 set_progress "30" "Setup nginx"
diff --git a/setup/start/setup_infra.sh b/setup/start/setup_infra.sh
index 9ea9b1559..01997055e 100755
--- a/setup/start/setup_infra.sh
+++ b/setup/start/setup_infra.sh
@@ -32,10 +32,6 @@ docker run --restart=always -d --name="graphite" \
     -p 127.0.0.1:2004:2004 \
     -p 127.0.0.1:8000:8000 \
     -v "${DATA_DIR}/graphite:/app/data" "${GRAPHITE_IMAGE}"
-# collectd 5.4.1 has some bug where we simply cannot get it to create df-vda1
-mkdir -p "${DATA_DIR}/graphite/whisper/collectd/localhost/"
-vda1_id=$(blkid -s UUID -o value /dev/vda1)
-ln -sfF "df-disk_by-uuid_${vda1_id}" "${DATA_DIR}/graphite/whisper/collectd/localhost/df-vda1"
 
 # mail
 mail_container_id=$(docker run --restart=always -d --name="mail" \