diff --git a/scripts/cc-metric-collector.config b/scripts/cc-metric-collector.config
index 5be6ba2..0f5e1ba 100644
--- a/scripts/cc-metric-collector.config
+++ b/scripts/cc-metric-collector.config
@@ -1,6 +1,6 @@
-CC_USER=monitoring
+CC_USER=clustercockpit
 
-CC_GROUP=monitoring
+CC_GROUP=clustercockpit
 
 CC_HOME=/tmp
 
diff --git a/scripts/cc-metric-collector.init b/scripts/cc-metric-collector.init
index 39f1a6a..e7d87cf 100755
--- a/scripts/cc-metric-collector.init
+++ b/scripts/cc-metric-collector.init
@@ -21,8 +21,8 @@ NAME=cc-metric-collector
 DESC="ClusterCockpit metric collector"
 DEFAULT=/etc/default/${NAME}
 
-CC_USER=monitoring
-CC_GROUP=monitoring
+CC_USER=clustercockpit
+CC_GROUP=clustercockpit
 CONF_DIR=/etc/cc-metric-collector
 PID_FILE=/var/run/$NAME.pid
 DAEMON=/usr/bin/$NAME
diff --git a/scripts/cc-metric-collector.service b/scripts/cc-metric-collector.service
index f890732..a8400ea 100644
--- a/scripts/cc-metric-collector.service
+++ b/scripts/cc-metric-collector.service
@@ -2,12 +2,12 @@
 Description=ClusterCockpit metric collector
 Documentation=https://github.com/ClusterCockpit/cc-metric-collector
 Wants=network-online.target
-After=network-online.target remote-fs.target
+After=network-online.target
 
 [Service]
 EnvironmentFile=/etc/default/cc-metric-collector
-User=monitoring
-Group=monitoring
+User=clustercockpit
+Group=clustercockpit
 Type=simple
 Restart=on-failure
 WorkingDirectory=/tmp
diff --git a/scripts/cc-metric-collector.spec b/scripts/cc-metric-collector.spec
index 68009ac..1798bfc 100644
--- a/scripts/cc-metric-collector.spec
+++ b/scripts/cc-metric-collector.spec
@@ -57,11 +57,11 @@ install -Dpm 0644 scripts/%{name}.sysusers %{buildroot}%{_sysusersdir}/%{name}.c
 %attr(-,root,root) %{_bindir}/%{name}
 # Config
 %dir %{_sysconfdir}/%{name}
-%attr(0600,monitoring,monitoring) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.json
-%attr(0600,monitoring,monitoring) %config(noreplace) %{_sysconfdir}/%{name}/collectors.json
-%attr(0600,monitoring,monitoring) %config(noreplace) %{_sysconfdir}/%{name}/sinks.json
-%attr(0600,monitoring,monitoring) %config(noreplace) %{_sysconfdir}/%{name}/receivers.json
-%attr(0600,monitoring,monitoring) %config(noreplace) %{_sysconfdir}/%{name}/router.json
+%attr(0600,clustercockpit,clustercockpit) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.json
+%attr(0600,clustercockpit,clustercockpit) %config(noreplace) %{_sysconfdir}/%{name}/collectors.json
+%attr(0600,clustercockpit,clustercockpit) %config(noreplace) %{_sysconfdir}/%{name}/sinks.json
+%attr(0600,clustercockpit,clustercockpit) %config(noreplace) %{_sysconfdir}/%{name}/receivers.json
+%attr(0600,clustercockpit,clustercockpit) %config(noreplace) %{_sysconfdir}/%{name}/router.json
 # Systemd
 %{_unitdir}/%{name}.service
 %{_sysconfdir}/default/%{name}
@@ -69,7 +69,7 @@ install -Dpm 0644 scripts/%{name}.sysusers %{buildroot}%{_sysusersdir}/%{name}.c
 
 %changelog
 * Thu Mar 03 2022 Thomas Gruber - 0.3
-- Add monitoring user installation
+- Add clustercockpit user installation
 * Mon Feb 14 2022 Thomas Gruber - 0.2
 - Add component specific configuration files
 - Add %attr to config files
diff --git a/scripts/cc-metric-collector.sysusers b/scripts/cc-metric-collector.sysusers
index 46fa03a..6ce3700 100644
--- a/scripts/cc-metric-collector.sysusers
+++ b/scripts/cc-metric-collector.sysusers
@@ -1,2 +1,2 @@
-#Type Name           ID   GECOS                     Home directory           Shell
-u     monitoring 905  "User for ClusterCockpit" /run/cc-metric-collector /sbin/nologin
+#Type Name           ID GECOS                     Home directory           Shell
+u     clustercockpit -  "User for ClusterCockpit" /run/cc-metric-collector /sbin/nologin