diff --git a/.drone.star b/.drone.star
index 69ca0c1..a14e443 100644
--- a/.drone.star
+++ b/.drone.star
@@ -33,7 +33,7 @@ def testing(ctx):
     'steps': [
       {
         'name': 'generate',
-        'image': 'webhippie/golang:1.15',
+        'image': 'webhippie/golang:1.16',
         'pull': 'always',
         'commands': [
           'make generate',
@@ -47,7 +47,7 @@ def testing(ctx):
       },
       {
         'name': 'vet',
-        'image': 'webhippie/golang:1.15',
+        'image': 'webhippie/golang:1.16',
         'pull': 'always',
         'commands': [
           'make vet',
@@ -61,7 +61,7 @@ def testing(ctx):
       },
       {
         'name': 'staticcheck',
-        'image': 'webhippie/golang:1.15',
+        'image': 'webhippie/golang:1.16',
         'pull': 'always',
         'commands': [
           'make staticcheck',
@@ -75,7 +75,7 @@ def testing(ctx):
       },
       {
         'name': 'lint',
-        'image': 'webhippie/golang:1.15',
+        'image': 'webhippie/golang:1.16',
         'pull': 'always',
         'commands': [
           'make lint',
@@ -89,7 +89,7 @@ def testing(ctx):
       },
       {
         'name': 'build',
-        'image': 'webhippie/golang:1.15',
+        'image': 'webhippie/golang:1.16',
         'pull': 'always',
         'commands': [
           'make build',
@@ -103,7 +103,7 @@ def testing(ctx):
       },
       {
         'name': 'test',
-        'image': 'webhippie/golang:1.15',
+        'image': 'webhippie/golang:1.16',
         'pull': 'always',
         'commands': [
           'make test',
@@ -179,7 +179,7 @@ def docker(ctx, arch):
       'dry_run': True,
       'tags': 'linux-%s' % (arch),
       'dockerfile': 'docker/Dockerfile.linux.%s' % (arch),
-      'repo': ctx.repo.slug,
+      'repo': ctx.repo.slug.replace('_', '-'),
     }
   else:
     docker = {
@@ -192,7 +192,7 @@ def docker(ctx, arch):
       'auto_tag': True,
       'auto_tag_suffix': 'linux-%s' % (arch),
       'dockerfile': 'docker/Dockerfile.linux.%s' % (arch),
-      'repo': ctx.repo.slug,
+      'repo': ctx.repo.slug.replace('_', '-'),
     }
 
   return {
@@ -204,24 +204,9 @@ def docker(ctx, arch):
       'arch': agent,
     },
     'steps': [
-      {
-        'name': 'version',
-        'image': 'webhippie/golang:1.15',
-        'pull': 'always',
-        'environment': environment,
-        'commands': [
-          'go env',
-        ],
-        'volumes': [
-          {
-            'name': 'gopath',
-            'path': '/srv/app',
-          },
-        ],
-      },
       {
         'name': 'generate',
-        'image': 'webhippie/golang:1.15',
+        'image': 'webhippie/golang:1.16',
         'pull': 'always',
         'environment': environment,
         'commands': [
@@ -236,7 +221,7 @@ def docker(ctx, arch):
       },
       {
         'name': 'build',
-        'image': 'webhippie/golang:1.15',
+        'image': 'webhippie/golang:1.16',
         'pull': 'always',
         'environment': environment,
         'commands': [
@@ -286,7 +271,7 @@ def binary(ctx, name):
     'steps': [
       {
         'name': 'generate',
-        'image': 'webhippie/golang:1.15',
+        'image': 'webhippie/golang:1.16',
         'pull': 'always',
         'commands': [
           'make generate',
@@ -300,7 +285,7 @@ def binary(ctx, name):
       },
       {
         'name': 'build',
-        'image': 'webhippie/golang:1.15',
+        'image': 'webhippie/golang:1.16',
         'pull': 'always',
         'commands': [
           'make release-%s' % (name),
@@ -314,7 +299,7 @@ def binary(ctx, name):
       },
       {
         'name': 'finish',
-        'image': 'webhippie/golang:1.15',
+        'image': 'webhippie/golang:1.16',
         'pull': 'always',
         'commands': [
           'make release-finish',
@@ -459,6 +444,22 @@ def docs(ctx):
       'arch': 'amd64',
     },
     'steps': [
+      {
+        'name': 'envvars',
+        'image': 'webhippie/golang:1.16',
+        'pull': 'always',
+        'commands': [
+          'make envvars',
+        ],
+      },
+      {
+        'name': 'labels',
+        'image': 'webhippie/golang:1.16',
+        'pull': 'always',
+        'commands': [
+          'make labels',
+        ],
+      },
       {
         'name': 'generate',
         'image': 'webhippie/hugo:latest',
@@ -534,9 +535,25 @@ def changelog(ctx):
           },
         },
       },
+      {
+        'name': 'envvars',
+        'image': 'webhippie/golang:1.16',
+        'pull': 'always',
+        'commands': [
+          'make envvars',
+        ],
+      },
+      {
+        'name': 'labels',
+        'image': 'webhippie/golang:1.16',
+        'pull': 'always',
+        'commands': [
+          'make labels',
+        ],
+      },
       {
         'name': 'generate',
-        'image': 'webhippie/golang:1.15',
+        'image': 'webhippie/golang:1.16',
         'pull': 'always',
         'commands': [
           'make changelog',
@@ -544,7 +561,7 @@ def changelog(ctx):
       },
       {
         'name': 'changes',
-        'image': 'webhippie/golang:1.15',
+        'image': 'webhippie/golang:1.16',
         'pull': 'always',
         'commands': [
           'git diff CHANGELOG.md',
@@ -559,7 +576,7 @@ def changelog(ctx):
             'commit',
             'push',
           ],
-          'message': 'Automated changelog update [skip ci]',
+          'message': 'Automated changelog and docs update [skip ci]',
           'branch': 'master',
           'author_email': 'drone@webhippie.de',
           'author_name': 'Drone',
@@ -612,7 +629,7 @@ def readme(ctx):
             'from_secret': 'docker_password',
           },
           'DOCKERHUB_REPO_PREFIX': ctx.repo.namespace,
-          'DOCKERHUB_REPO_NAME': ctx.repo.name,
+          'DOCKERHUB_REPO_NAME': ctx.repo.name.replace('_', '-'),
           'SHORT_DESCRIPTION': description,
           'README_PATH': 'README.md',
         },
diff --git a/Makefile b/Makefile
index a3e8d21..01cd844 100644
--- a/Makefile
+++ b/Makefile
@@ -183,6 +183,14 @@ release-finish: release-reduce release-checksum
 docs:
 	hugo -s docs/
 
+.PHONY: envvars
+envvars:
+	go run hack/generate-envvars-docs.go
+
+.PHONY: labels
+labels:
+	go run hack/generate-labels-docs.go
+
 .PHONY: watch
 watch:
 	$(REFLEX) -c reflex.conf
diff --git a/changelog/unreleased/dep-and-go-update.md b/changelog/unreleased/dep-and-go-update.md
index e563057..ecfb91d 100644
--- a/changelog/unreleased/dep-and-go-update.md
+++ b/changelog/unreleased/dep-and-go-update.md
@@ -4,4 +4,4 @@ We updated the Go version used to build the binaries within the CI system and
 beside that in the same step we have updated all dependencies ti keep everything
 up to date.
 
-https://github.com/promhippie/prometheus-hcloud-sd/issues/20
+https://github.com/promhippie/prometheus-hcloud-sd/pull/44
diff --git a/changelog/unreleased/docs-improvements.md b/changelog/unreleased/docs-improvements.md
new file mode 100644
index 0000000..dff808b
--- /dev/null
+++ b/changelog/unreleased/docs-improvements.md
@@ -0,0 +1,8 @@
+Change: Improvements for automated documentation
+
+We have added some simple scripts that gets executed by Drone to keep moving
+documentation parts like the available labels or the available environment
+variables always up to date. No need to update the docs related to that manually
+anymore.
+
+https://github.com/promhippie/prometheus-hcloud-sd/pull/44
diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
index 0000000..73ab876
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1,2 @@
+public/
+resources/
diff --git a/docs/content/getting-started.md b/docs/content/getting-started.md
index fcbc4f6..f900103 100644
--- a/docs/content/getting-started.md
+++ b/docs/content/getting-started.md
@@ -95,67 +95,17 @@ Depending on how you have launched and configured [Prometheus](https://prometheu
       - ./service-discovery:/etc/sd
 {{< / highlight >}}
 
-Finally the service discovery should be configured fine, let's start this stack with [docker-compose](https://docs.docker.com/compose/), you just need to execute `docker-compose up` within the directory where you have stored `prometheus.yml` and `docker-compose.yml`.
-
-{{< highlight txt >}}
-# docker-compose up
-Creating network "hcloud-sd_default" with the default driver
-Creating volume "hcloud-sd_prometheus" with default driver
-Creating hcloud-sd_hcloud-sd_1  ... done
-Creating hcloud-sd_prometheus_1 ... done
-Attaching to hcloud-sd_hcloud-sd_1, hcloud-sd_prometheus_1
-prometheus_1  | level=info ts=2018-10-07T15:49:32.5574151Z caller=main.go:238 msg="Starting Prometheus" version="(version=2.4.3, branch=HEAD, revision=167a4b4e73a8eca8df648d2d2043e21bdb9a7449)"
-prometheus_1  | level=info ts=2018-10-07T15:49:32.5574847Z caller=main.go:239 build_context="(go=go1.11.1, user=root@1e42b46043e9, date=20181004-08:42:02)"
-prometheus_1  | level=info ts=2018-10-07T15:49:32.5575116Z caller=main.go:240 host_details="(Linux 4.9.93-linuxkit-aufs #1 SMP Wed Jun 6 16:55:56 UTC 2018 x86_64 14ae580d073a (none))"
-prometheus_1  | level=info ts=2018-10-07T15:49:32.5575347Z caller=main.go:241 fd_limits="(soft=1048576, hard=1048576)"
-prometheus_1  | level=info ts=2018-10-07T15:49:32.5575521Z caller=main.go:242 vm_limits="(soft=unlimited, hard=unlimited)"
-prometheus_1  | level=info ts=2018-10-07T15:49:32.5588845Z caller=main.go:554 msg="Starting TSDB ..."
-prometheus_1  | level=info ts=2018-10-07T15:49:32.5590007Z caller=web.go:397 component=web msg="Start listening for connections" address=0.0.0.0:9090
-prometheus_1  | level=info ts=2018-10-07T15:49:32.5639949Z caller=main.go:564 msg="TSDB started"
-prometheus_1  | level=info ts=2018-10-07T15:49:32.5640454Z caller=main.go:624 msg="Loading configuration file" filename=/etc/prometheus/prometheus.yml
-prometheus_1  | level=info ts=2018-10-07T15:49:32.5674651Z caller=main.go:650 msg="Completed loading of configuration file" filename=/etc/prometheus/prometheus.yml
-prometheus_1  | level=info ts=2018-10-07T15:49:32.5675144Z caller=main.go:523 msg="Server is ready to receive web requests."
-hcloud-sd_1   | level=info ts=2018-10-07T15:49:32.5843003Z msg="Launching Prometheus HetznerCloud SD" version=0.0.0-master revision=00c6143 date=20180924 go=go1.11
-hcloud-sd_1   | level=info ts=2018-10-07T15:49:32.5845589Z msg="Starting metrics server" addr=0.0.0.0:9000
-{{< / highlight >}}
-
-That's all, the service discovery should be up and running. You can access [Prometheus](https://prometheus.io) at [http://localhost:9090](http://localhost:9090).
+Finally the service discovery should be configured fine, let's start this stack with [docker-compose](https://docs.docker.com/compose/), you just need to execute `docker-compose up` within the directory where you have stored `prometheus.yml` and `docker-compose.yml`. That's all, the service discovery should be up and running. You can access [Prometheus](https://prometheus.io) at [http://localhost:9090](http://localhost:9090).
 
 {{< figure src="service-discovery.png" title="Prometheus service discovery for HetznerCloud" >}}
 
-## Kubernetes
-
-Currently we have not prepared a deployment for Kubernetes, but this is something we will provide for sure. Most interesting will be the integration into the [Prometheus Operator](https://coreos.com/operators/prometheus/docs/latest/), so stay tuned.
-
 ## Configuration
 
 ### Envrionment variables
 
 If you prefer to configure the service with environment variables you can see the available variables below, in case you want to configure multiple accounts with a single service you are forced to use the configuration file as the environment variables are limited to a single account. As the service is pretty lightweight you can even start an instance per account and configure it entirely by the variables, it's up to you.
 
-PROMETHEUS_HCLOUD_CONFIG
-: Path to HetznerCloud configuration file, optionally, required for multi credentials
-
-PROMETHEUS_HCLOUD_TOKEN
-: Access token for the HetznerCloud API, required for authentication
-
-PROMETHEUS_HCLOUD_LOG_LEVEL
-: Only log messages with given severity, defaults to `info`
-
-PROMETHEUS_HCLOUD_LOG_PRETTY
-: Enable pretty messages for logging, defaults to `true`
-
-PROMETHEUS_HCLOUD_WEB_ADDRESS
-: Address to bind the metrics server, defaults to `0.0.0.0:9000`
-
-PROMETHEUS_HCLOUD_WEB_PATH
-: Path to bind the metrics server, defaults to `/metrics`
-
-PROMETHEUS_HCLOUD_OUTPUT_FILE
-: Path to write the file_sd config, defaults to `/etc/prometheus/hcloud.json`
-
-PROMETHEUS_HCLOUD_OUTPUT_REFRESH
-: Discovery refresh interval in seconds, defaults to `30`
+{{< partial "envvars.md" >}}
 
 ### Configuration file
 
@@ -163,32 +113,12 @@ Especially if you want to configure multiple accounts within a single service di
 
 ## Labels
 
-* `__address__`
-* `__meta_hcloud_city`
-* `__meta_hcloud_cores`
-* `__meta_hcloud_country`
-* `__meta_hcloud_cpu`
-* `__meta_hcloud_datacenter`
-* `__meta_hcloud_disk`
-* `__meta_hcloud_image_name`
-* `__meta_hcloud_image_type`
-* `__meta_hcloud_label_<label>`
-* `__meta_hcloud_location`
-* `__meta_hcloud_memory`
-* `__meta_hcloud_name`
-* `__meta_hcloud_os_flavor`
-* `__meta_hcloud_os_version`
-* `__meta_hcloud_project`
-* `__meta_hcloud_public_ipv4`
-* `__meta_hcloud_public_ipv6`
-* `__meta_hcloud_status`
-* `__meta_hcloud_storage`
-* `__meta_hcloud_type`
+{{< partial "labels.md" >}}
 
 ## Metrics
 
-prometheus_hcloud_sd_request_duration_seconds
+prometheus_hcloud_sd_request_duration_seconds{project}
 : Histogram of latencies for requests to the HetznerCloud API
 
-prometheus_hcloud_sd_request_failures_total
+prometheus_hcloud_sd_request_failures_total{project}
 : Total number of failed requests to the HetznerCloud API
diff --git a/docs/layouts/shortcodes/partial.html b/docs/layouts/shortcodes/partial.html
new file mode 100644
index 0000000..612b553
--- /dev/null
+++ b/docs/layouts/shortcodes/partial.html
@@ -0,0 +1 @@
+{{- $file := printf "/partials/%s" (.Get 0) -}}{{- $file | readFile | markdownify -}}
\ No newline at end of file
diff --git a/docs/partials/envvars.md b/docs/partials/envvars.md
new file mode 100644
index 0000000..00b8413
--- /dev/null
+++ b/docs/partials/envvars.md
@@ -0,0 +1,23 @@
+PROMETHEUS_HCLOUD_LOG_LEVEL
+: Only log messages with given severity, defaults to `info`
+
+PROMETHEUS_HCLOUD_LOG_PRETTY
+: Enable pretty messages for logging, defaults to `false`
+
+PROMETHEUS_HCLOUD_WEB_ADDRESS
+: Address to bind the metrics server, defaults to `0.0.0.0:9000`
+
+PROMETHEUS_HCLOUD_WEB_PATH
+: Path to bind the metrics server, defaults to `/metrics`
+
+PROMETHEUS_HCLOUD_OUTPUT_FILE
+: Path to write the file_sd config, defaults to `/etc/prometheus/hcloud.json`
+
+PROMETHEUS_HCLOUD_OUTPUT_REFRESH
+: Discovery refresh interval in seconds, defaults to `30`
+
+PROMETHEUS_HCLOUD_TOKEN
+: Access token for the HetznerCloud API
+
+PROMETHEUS_HCLOUD_CONFIG
+: Path to HetznerCloud configuration file
diff --git a/docs/partials/labels.md b/docs/partials/labels.md
new file mode 100644
index 0000000..75cbeb5
--- /dev/null
+++ b/docs/partials/labels.md
@@ -0,0 +1,21 @@
+* `__address__`
+* `__meta_hcloud_city`
+* `__meta_hcloud_cores`
+* `__meta_hcloud_country`
+* `__meta_hcloud_cpu`
+* `__meta_hcloud_datacenter`
+* `__meta_hcloud_disk`
+* `__meta_hcloud_image_name`
+* `__meta_hcloud_image_type`
+* `__meta_hcloud_label_<name>`
+* `__meta_hcloud_location`
+* `__meta_hcloud_memory`
+* `__meta_hcloud_name`
+* `__meta_hcloud_os_flavor`
+* `__meta_hcloud_os_version`
+* `__meta_hcloud_project`
+* `__meta_hcloud_public_ipv4`
+* `__meta_hcloud_public_ipv6`
+* `__meta_hcloud_status`
+* `__meta_hcloud_storage`
+* `__meta_hcloud_type`
diff --git a/hack/generate-envvars-docs.go b/hack/generate-envvars-docs.go
new file mode 100644
index 0000000..8d5bbd0
--- /dev/null
+++ b/hack/generate-envvars-docs.go
@@ -0,0 +1,117 @@
+// +build ignore
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"strconv"
+	"strings"
+
+	"github.com/promhippie/prometheus-hcloud-sd/pkg/command"
+	"github.com/promhippie/prometheus-hcloud-sd/pkg/config"
+	"github.com/urfave/cli/v2"
+)
+
+type flag struct {
+	Flag    string
+	Default string
+	Envs    []string
+	Help    string
+	List    bool
+}
+
+func main() {
+	flags := make([]flag, 0)
+
+	for _, f := range append(command.RootFlags(config.Load()), command.ServerFlags(config.Load())...) {
+		switch v := f.(type) {
+		case *cli.StringFlag:
+			flags = append(flags, flag{
+				Flag:    v.Name,
+				Default: v.Value,
+				Envs:    v.EnvVars,
+				Help:    v.Usage,
+				List:    false,
+			})
+		case *cli.IntFlag:
+			flags = append(flags, flag{
+				Flag:    v.Name,
+				Default: strconv.Itoa(v.Value),
+				Envs:    v.EnvVars,
+				Help:    v.Usage,
+				List:    false,
+			})
+		case *cli.BoolFlag:
+			flags = append(flags, flag{
+				Flag:    v.Name,
+				Default: fmt.Sprintf("%+v", v.Value),
+				Envs:    v.EnvVars,
+				Help:    v.Usage,
+				List:    false,
+			})
+		case *cli.DurationFlag:
+			flags = append(flags, flag{
+				Flag:    v.Name,
+				Default: v.Value.String(),
+				Envs:    v.EnvVars,
+				Help:    v.Usage,
+				List:    false,
+			})
+		case *cli.StringSliceFlag:
+			flags = append(flags, flag{
+				Flag:    v.Name,
+				Default: strings.Join(v.Value.Value(), ", "),
+				Envs:    v.EnvVars,
+				Help:    v.Usage,
+				List:    true,
+			})
+		default:
+			fmt.Printf("unknown type: %s\n", v)
+			os.Exit(1)
+		}
+	}
+
+	f, err := os.Create("docs/partials/envvars.md")
+
+	if err != nil {
+		fmt.Printf("failed to create file")
+		os.Exit(1)
+	}
+
+	defer f.Close()
+
+	last := flags[len(flags)-1]
+	for _, row := range flags {
+		f.WriteString(
+			strings.Join(
+				row.Envs,
+				", ",
+			) + "\n",
+		)
+
+		f.WriteString(fmt.Sprintf(
+			": %s",
+			row.Help,
+		))
+
+		if row.List {
+			f.WriteString(
+				", comma-separated list",
+			)
+		}
+
+		if row.Default != "" {
+			f.WriteString(fmt.Sprintf(
+				", defaults to `%s`",
+				row.Default,
+			))
+		}
+
+		f.WriteString("\n")
+
+		if row.Flag != last.Flag {
+			f.WriteString("\n")
+		}
+	}
+}
diff --git a/hack/generate-labels-docs.go b/hack/generate-labels-docs.go
new file mode 100644
index 0000000..c04f1b7
--- /dev/null
+++ b/hack/generate-labels-docs.go
@@ -0,0 +1,46 @@
+// +build ignore
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"sort"
+	"strings"
+
+	"github.com/promhippie/prometheus-hcloud-sd/pkg/action"
+)
+
+func main() {
+	labels := []string{}
+
+	for _, label := range action.Labels {
+		labels = append(labels, label)
+	}
+
+	sort.Strings(labels)
+
+	f, err := os.Create("docs/partials/labels.md")
+
+	if err != nil {
+		fmt.Printf("failed to create file")
+		os.Exit(1)
+	}
+
+	defer f.Close()
+
+	f.WriteString(
+		"* `__address__`\n",
+	)
+
+	for _, row := range labels {
+		if strings.HasSuffix(row, "_") {
+			row = row + "<name>"
+		}
+
+		f.WriteString(fmt.Sprintf(
+			"* `%s`\n",
+			row,
+		))
+	}
+}
diff --git a/pkg/action/discoverer.go b/pkg/action/discoverer.go
index a3a17e6..c7a9ce7 100644
--- a/pkg/action/discoverer.go
+++ b/pkg/action/discoverer.go
@@ -14,31 +14,35 @@ import (
 	"github.com/prometheus/prometheus/discovery/targetgroup"
 )
 
-const (
-	hcloudPrefix           = model.MetaLabelPrefix + "hcloud_"
-	projectLabel           = hcloudPrefix + "project"
-	nameLabel              = hcloudPrefix + "name"
-	statusLabel            = hcloudPrefix + "status"
-	publicIPv4Label        = hcloudPrefix + "public_ipv4"
-	publicIPv6Label        = hcloudPrefix + "public_ipv6"
-	serverTypeNameLabel    = hcloudPrefix + "type"
-	serverTypeCoresLabel   = hcloudPrefix + "cores"
-	serverTypeMemoryLabel  = hcloudPrefix + "memory"
-	serverTypeDiskLabel    = hcloudPrefix + "disk"
-	serverTypeStorageLabel = hcloudPrefix + "storage"
-	serverTypeCPULabel     = hcloudPrefix + "cpu"
-	datacenterNameLabel    = hcloudPrefix + "datacenter"
-	locationNameLabel      = hcloudPrefix + "location"
-	locationCityLabel      = hcloudPrefix + "city"
-	locationCountryLabel   = hcloudPrefix + "country"
-	imageTypeLabel         = hcloudPrefix + "image_type"
-	imageNameLabel         = hcloudPrefix + "image_name"
-	osFlavorLabel          = hcloudPrefix + "os_flavor"
-	osVersionLabel         = hcloudPrefix + "os_version"
-	labelPrefix            = hcloudPrefix + "label_"
-)
-
 var (
+	// providerPrefix defines the general prefix for all labels.
+	providerPrefix = model.MetaLabelPrefix + "hcloud_"
+
+	// Labels defines all available labels for this provider.
+	Labels = map[string]string{
+		"datacenterName":    providerPrefix + "datacenter",
+		"imageName":         providerPrefix + "image_name",
+		"imageType":         providerPrefix + "image_type",
+		"labelPrefix":       providerPrefix + "label_",
+		"locationCity":      providerPrefix + "city",
+		"locationCountry":   providerPrefix + "country",
+		"locationName":      providerPrefix + "location",
+		"name":              providerPrefix + "name",
+		"osFlavor":          providerPrefix + "os_flavor",
+		"osVersion":         providerPrefix + "os_version",
+		"project":           providerPrefix + "project",
+		"publicIPv4":        providerPrefix + "public_ipv4",
+		"publicIPv6":        providerPrefix + "public_ipv6",
+		"serverTypeCores":   providerPrefix + "cores",
+		"serverTypeCPU":     providerPrefix + "cpu",
+		"serverTypeDisk":    providerPrefix + "disk",
+		"serverTypeMemory":  providerPrefix + "memory",
+		"serverTypeName":    providerPrefix + "type",
+		"serverTypeStorage": providerPrefix + "storage",
+		"status":            providerPrefix + "status",
+	}
+
+	// replacer defines a list of characters that gets replaced.
 	replacer = strings.NewReplacer(
 		".", "_",
 		"-", "_",
@@ -124,31 +128,31 @@ func (d *Discoverer) getTargets(ctx context.Context) ([]*targetgroup.Group, erro
 					},
 				},
 				Labels: model.LabelSet{
-					model.AddressLabel:                      model.LabelValue(server.PublicNet.IPv4.IP.String()),
-					model.LabelName(projectLabel):           model.LabelValue(project),
-					model.LabelName(nameLabel):              model.LabelValue(server.Name),
-					model.LabelName(statusLabel):            model.LabelValue(server.Status),
-					model.LabelName(publicIPv4Label):        model.LabelValue(server.PublicNet.IPv4.IP.String()),
-					model.LabelName(publicIPv6Label):        model.LabelValue(server.PublicNet.IPv6.IP.String()),
-					model.LabelName(serverTypeNameLabel):    model.LabelValue(server.ServerType.Name),
-					model.LabelName(serverTypeCoresLabel):   model.LabelValue(strconv.Itoa(int(server.ServerType.Cores))),
-					model.LabelName(serverTypeMemoryLabel):  model.LabelValue(strconv.Itoa(int(server.ServerType.Memory))),
-					model.LabelName(serverTypeDiskLabel):    model.LabelValue(strconv.Itoa(int(server.ServerType.Disk))),
-					model.LabelName(serverTypeStorageLabel): model.LabelValue(server.ServerType.StorageType),
-					model.LabelName(serverTypeCPULabel):     model.LabelValue(server.ServerType.CPUType),
-					model.LabelName(datacenterNameLabel):    model.LabelValue(server.Datacenter.Name),
-					model.LabelName(locationNameLabel):      model.LabelValue(server.Datacenter.Location.Name),
-					model.LabelName(locationCityLabel):      model.LabelValue(server.Datacenter.Location.City),
-					model.LabelName(locationCountryLabel):   model.LabelValue(server.Datacenter.Location.Country),
-					model.LabelName(imageTypeLabel):         model.LabelValue(imageType),
-					model.LabelName(imageNameLabel):         model.LabelValue(imageName),
-					model.LabelName(osFlavorLabel):          model.LabelValue(osFlavor),
-					model.LabelName(osVersionLabel):         model.LabelValue(osVersion),
+					model.AddressLabel:                           model.LabelValue(server.PublicNet.IPv4.IP.String()),
+					model.LabelName(Labels["project"]):           model.LabelValue(project),
+					model.LabelName(Labels["name"]):              model.LabelValue(server.Name),
+					model.LabelName(Labels["status"]):            model.LabelValue(server.Status),
+					model.LabelName(Labels["publicIPv4"]):        model.LabelValue(server.PublicNet.IPv4.IP.String()),
+					model.LabelName(Labels["publicIPv6"]):        model.LabelValue(server.PublicNet.IPv6.IP.String()),
+					model.LabelName(Labels["serverTypeName"]):    model.LabelValue(server.ServerType.Name),
+					model.LabelName(Labels["serverTypeCores"]):   model.LabelValue(strconv.Itoa(int(server.ServerType.Cores))),
+					model.LabelName(Labels["serverTypeMemory"]):  model.LabelValue(strconv.Itoa(int(server.ServerType.Memory))),
+					model.LabelName(Labels["serverTypeDisk"]):    model.LabelValue(strconv.Itoa(int(server.ServerType.Disk))),
+					model.LabelName(Labels["serverTypeStorage"]): model.LabelValue(server.ServerType.StorageType),
+					model.LabelName(Labels["serverTypeCPU"]):     model.LabelValue(server.ServerType.CPUType),
+					model.LabelName(Labels["datacenterName"]):    model.LabelValue(server.Datacenter.Name),
+					model.LabelName(Labels["locationName"]):      model.LabelValue(server.Datacenter.Location.Name),
+					model.LabelName(Labels["locationCity"]):      model.LabelValue(server.Datacenter.Location.City),
+					model.LabelName(Labels["locationCountry"]):   model.LabelValue(server.Datacenter.Location.Country),
+					model.LabelName(Labels["imageType"]):         model.LabelValue(imageType),
+					model.LabelName(Labels["imageName"]):         model.LabelValue(imageName),
+					model.LabelName(Labels["osFlavor"]):          model.LabelValue(osFlavor),
+					model.LabelName(Labels["osVersion"]):         model.LabelValue(osVersion),
 				},
 			}
 
 			for key, value := range server.Labels {
-				target.Labels[model.LabelName(normalizeLabel(labelPrefix+key))] = model.LabelValue(value)
+				target.Labels[model.LabelName(normalizeLabel(Labels["labelPrefix"]+key))] = model.LabelValue(value)
 			}
 
 			level.Debug(d.logger).Log(
diff --git a/pkg/action/metrics.go b/pkg/action/metrics.go
index 8b97995..140cf25 100644
--- a/pkg/action/metrics.go
+++ b/pkg/action/metrics.go
@@ -6,6 +6,7 @@ import (
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/collectors"
 	"github.com/promhippie/prometheus-hcloud-sd/pkg/version"
 )
 
@@ -36,12 +37,11 @@ var (
 )
 
 func init() {
-	registry.MustRegister(prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{
+	registry.MustRegister(collectors.NewProcessCollector(collectors.ProcessCollectorOpts{
 		Namespace: namespace,
 	}))
 
-	registry.MustRegister(prometheus.NewGoCollector())
-
+	registry.MustRegister(collectors.NewGoCollector())
 	registry.MustRegister(version.Collector(namespace))
 
 	registry.MustRegister(requestDuration)
diff --git a/pkg/command/command.go b/pkg/command/command.go
index f7454ac..c5924ba 100644
--- a/pkg/command/command.go
+++ b/pkg/command/command.go
@@ -22,22 +22,7 @@ func Run() error {
 				Email: "thomas@webhippie.de",
 			},
 		},
-		Flags: []cli.Flag{
-			&cli.StringFlag{
-				Name:        "log.level",
-				Value:       "info",
-				Usage:       "Only log messages with given severity",
-				EnvVars:     []string{"PROMETHEUS_HCLOUD_LOG_LEVEL"},
-				Destination: &cfg.Logs.Level,
-			},
-			&cli.BoolFlag{
-				Name:        "log.pretty",
-				Value:       false,
-				Usage:       "Enable pretty messages for logging",
-				EnvVars:     []string{"PROMETHEUS_HCLOUD_LOG_PRETTY"},
-				Destination: &cfg.Logs.Pretty,
-			},
-		},
+		Flags: RootFlags(cfg),
 		Commands: []*cli.Command{
 			Health(cfg),
 			Server(cfg),
@@ -58,3 +43,23 @@ func Run() error {
 
 	return app.Run(os.Args)
 }
+
+// RootFlags defines the available root flags.
+func RootFlags(cfg *config.Config) []cli.Flag {
+	return []cli.Flag{
+		&cli.StringFlag{
+			Name:        "log.level",
+			Value:       "info",
+			Usage:       "Only log messages with given severity",
+			EnvVars:     []string{"PROMETHEUS_HCLOUD_LOG_LEVEL"},
+			Destination: &cfg.Logs.Level,
+		},
+		&cli.BoolFlag{
+			Name:        "log.pretty",
+			Value:       false,
+			Usage:       "Enable pretty messages for logging",
+			EnvVars:     []string{"PROMETHEUS_HCLOUD_LOG_PRETTY"},
+			Destination: &cfg.Logs.Pretty,
+		},
+	}
+}
diff --git a/pkg/command/health.go b/pkg/command/health.go
index 14c31c0..f859158 100644
--- a/pkg/command/health.go
+++ b/pkg/command/health.go
@@ -14,22 +14,7 @@ func Health(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "health",
 		Usage: "Perform health checks",
-		Flags: []cli.Flag{
-			&cli.StringFlag{
-				Name:        "web.address",
-				Value:       "0.0.0.0:9000",
-				Usage:       "Address to bind the metrics server",
-				EnvVars:     []string{"PROMETHEUS_HCLOUD_WEB_ADDRESS"},
-				Destination: &cfg.Server.Addr,
-			},
-			&cli.StringFlag{
-				Name:        "hcloud.config",
-				Value:       "",
-				Usage:       "Path to HetznerCloud configuration file",
-				EnvVars:     []string{"PROMETHEUS_HCLOUD_CONFIG"},
-				Destination: nil,
-			},
-		},
+		Flags: HealthFlags(cfg),
 		Action: func(c *cli.Context) error {
 			logger := setupLogger(cfg)
 
@@ -76,3 +61,23 @@ func Health(cfg *config.Config) *cli.Command {
 		},
 	}
 }
+
+// HealthFlags defines the available health flags.
+func HealthFlags(cfg *config.Config) []cli.Flag {
+	return []cli.Flag{
+		&cli.StringFlag{
+			Name:        "web.address",
+			Value:       "0.0.0.0:9000",
+			Usage:       "Address to bind the metrics server",
+			EnvVars:     []string{"PROMETHEUS_HCLOUD_WEB_ADDRESS"},
+			Destination: &cfg.Server.Addr,
+		},
+		&cli.StringFlag{
+			Name:        "hcloud.config",
+			Value:       "",
+			Usage:       "Path to HetznerCloud configuration file",
+			EnvVars:     []string{"PROMETHEUS_HCLOUD_CONFIG"},
+			Destination: nil,
+		},
+	}
+}
diff --git a/pkg/command/server.go b/pkg/command/server.go
index 1acf21a..22dc405 100644
--- a/pkg/command/server.go
+++ b/pkg/command/server.go
@@ -14,48 +14,7 @@ func Server(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "server",
 		Usage: "Start integrated server",
-		Flags: []cli.Flag{
-			&cli.StringFlag{
-				Name:        "web.address",
-				Value:       "0.0.0.0:9000",
-				Usage:       "Address to bind the metrics server",
-				EnvVars:     []string{"PROMETHEUS_HCLOUD_WEB_ADDRESS"},
-				Destination: &cfg.Server.Addr,
-			},
-			&cli.StringFlag{
-				Name:        "web.path",
-				Value:       "/metrics",
-				Usage:       "Path to bind the metrics server",
-				EnvVars:     []string{"PROMETHEUS_HCLOUD_WEB_PATH"},
-				Destination: &cfg.Server.Path,
-			},
-			&cli.StringFlag{
-				Name:        "output.file",
-				Value:       "/etc/prometheus/hcloud.json",
-				Usage:       "Path to write the file_sd config",
-				EnvVars:     []string{"PROMETHEUS_HCLOUD_OUTPUT_FILE"},
-				Destination: &cfg.Target.File,
-			},
-			&cli.IntFlag{
-				Name:        "output.refresh",
-				Value:       30,
-				Usage:       "Discovery refresh interval in seconds",
-				EnvVars:     []string{"PROMETHEUS_HCLOUD_OUTPUT_REFRESH"},
-				Destination: &cfg.Target.Refresh,
-			},
-			&cli.StringFlag{
-				Name:    "hcloud.token",
-				Value:   "",
-				Usage:   "Access token for the HetznerCloud API",
-				EnvVars: []string{"PROMETHEUS_HCLOUD_TOKEN"},
-			},
-			&cli.StringFlag{
-				Name:    "hcloud.config",
-				Value:   "",
-				Usage:   "Path to HetznerCloud configuration file",
-				EnvVars: []string{"PROMETHEUS_HCLOUD_CONFIG"},
-			},
-		},
+		Flags: ServerFlags(cfg),
 		Action: func(c *cli.Context) error {
 			logger := setupLogger(cfg)
 
@@ -110,3 +69,49 @@ func Server(cfg *config.Config) *cli.Command {
 		},
 	}
 }
+
+// ServerFlags defines the available server flags.
+func ServerFlags(cfg *config.Config) []cli.Flag {
+	return []cli.Flag{
+		&cli.StringFlag{
+			Name:        "web.address",
+			Value:       "0.0.0.0:9000",
+			Usage:       "Address to bind the metrics server",
+			EnvVars:     []string{"PROMETHEUS_HCLOUD_WEB_ADDRESS"},
+			Destination: &cfg.Server.Addr,
+		},
+		&cli.StringFlag{
+			Name:        "web.path",
+			Value:       "/metrics",
+			Usage:       "Path to bind the metrics server",
+			EnvVars:     []string{"PROMETHEUS_HCLOUD_WEB_PATH"},
+			Destination: &cfg.Server.Path,
+		},
+		&cli.StringFlag{
+			Name:        "output.file",
+			Value:       "/etc/prometheus/hcloud.json",
+			Usage:       "Path to write the file_sd config",
+			EnvVars:     []string{"PROMETHEUS_HCLOUD_OUTPUT_FILE"},
+			Destination: &cfg.Target.File,
+		},
+		&cli.IntFlag{
+			Name:        "output.refresh",
+			Value:       30,
+			Usage:       "Discovery refresh interval in seconds",
+			EnvVars:     []string{"PROMETHEUS_HCLOUD_OUTPUT_REFRESH"},
+			Destination: &cfg.Target.Refresh,
+		},
+		&cli.StringFlag{
+			Name:    "hcloud.token",
+			Value:   "",
+			Usage:   "Access token for the HetznerCloud API",
+			EnvVars: []string{"PROMETHEUS_HCLOUD_TOKEN"},
+		},
+		&cli.StringFlag{
+			Name:    "hcloud.config",
+			Value:   "",
+			Usage:   "Path to HetznerCloud configuration file",
+			EnvVars: []string{"PROMETHEUS_HCLOUD_CONFIG"},
+		},
+	}
+}