diff --git a/metadata/service/remote_client/init.yml b/metadata/service/remote_client/cluster.yml
similarity index 83%
copy from metadata/service/remote_client/init.yml
copy to metadata/service/remote_client/cluster.yml
index 163f0c4..b340e79 100644
--- a/metadata/service/remote_client/init.yml
+++ b/metadata/service/remote_client/cluster.yml
@@ -8,3 +8,4 @@
       enabled: true
       read_interval: 10
       use_fqdn: false
+      automatic_starting: false
diff --git a/metadata/service/remote_client/init.yml b/metadata/service/remote_client/single.yml
similarity index 84%
rename from metadata/service/remote_client/init.yml
rename to metadata/service/remote_client/single.yml
index 163f0c4..81062b4 100644
--- a/metadata/service/remote_client/init.yml
+++ b/metadata/service/remote_client/single.yml
@@ -8,3 +8,4 @@
       enabled: true
       read_interval: 10
       use_fqdn: false
+      automatic_starting: true