diff --git a/conf/production.yaml b/conf/production.yaml
index 74001f6..75f1cfd 100644
--- a/conf/production.yaml
+++ b/conf/production.yaml
@@ -11,5 +11,6 @@ elastic-search:
   hostname: 'localhost'
   port: __ES_PORT__
   indexes:
-    videos: 'peertube-index-videos'
-    channels: 'peertube-index-channels'
+    videos: '__APP__-videos'
+    channels: '__APP__-channels'
+    playlists: '__APP__-playlists'
diff --git a/conf/systemd.service b/conf/systemd.service
index 1b128a9..3f34b6f 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -1,6 +1,8 @@
 [Unit]
 Description=__APP__ search index daemon
 After=network.target
+After=elasticsearch8.service
+Requires=elasticsearch8.service
 
 [Service]
 Type=simple