diff --git a/files/netdata/docker-compose.template.yml b/files/netdata/docker-compose.template.yml
index d4a63f0..eb280a4 100644
--- a/files/netdata/docker-compose.template.yml
+++ b/files/netdata/docker-compose.template.yml
@@ -16,12 +16,16 @@ services:
       - "{{ config_dir }}:/etc/netdata"
       - "{{ (data_dir, 'lib') | path_join }}:/var/lib/netdata"
       - "{{ (data_dir, 'cache') | path_join }}:/var/cache/netdata"
+
       # Netdata system volumes
       - "/:/host/root:ro,rslave"
+
       - "/etc/group:/host/etc/group:ro"
+      - "/etc/hostname:/host/etc/hostname:ro"
       - "/etc/localtime:/etc/localtime:ro"
       - "/etc/os-release:/host/etc/os-release:ro"
       - "/etc/passwd:/host/etc/passwd:ro"
+
       - "/proc:/host/proc:ro"
       - "/run/dbus:/run/dbus:ro"
       - "/sys:/host/sys:ro"
diff --git a/files/netdata/netdata.template.conf b/files/netdata/netdata.template.conf
index 90194c7..16933bc 100644
--- a/files/netdata/netdata.template.conf
+++ b/files/netdata/netdata.template.conf
@@ -15,15 +15,11 @@
 [global]
 	# run as user = netdata
 	# host access prefix = /host
-
-	#| >>> [global].hostname <<<
-	#| datatype: text, default value: a7ccb73e566e
-	hostname = {{ host_name }}
-
 	# pthread stack size = 8MiB
 	# cpu cores = 2
 	# libuv worker threads = 16
 	# profile = standalone
+	# hostname = rivendell-v2
 	# glibc malloc arena max for plugins = 1
 	# glibc malloc arena max for netdata = 1
 	# crash reports = all
@@ -103,9 +99,6 @@
 	# PYTHONPATH =
 	# TZ = :/etc/localtime
 
-[host labels]
-	# name = value
-
 [cloud]
 	# conversation log = no
 	# scope = full
@@ -198,7 +191,7 @@
 	# registry expire idle persons = 1y
 	# registry domain =
 	# registry to announce = https://registry.my-netdata.io
-	# registry hostname = rivendell
+	# registry hostname = rivendell-v2
 	# verify browser cookies support = yes
 	# enable cookies SameSite and Secure = yes
 	# max URL length = 1024
@@ -342,7 +335,6 @@
 
 [plugin:proc:diskspace]
 	#| >>> [plugin:proc:diskspace].update every <<<
-	#| reformatted from: 60s
 	#| datatype: duration (seconds), default value: 10s
 	update every = 1m