diff --git a/LICENSE b/LICENSE
index 393d97b..6990897 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 L3D <l3d@c3woc.de>
+Copyright (c) 2022-2023 L3D <l3d@c3woc.de>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/defaults/main.yml b/defaults/main.yml
index b6ff546..a748e12 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -14,6 +14,18 @@ ping_exporter__version: 'latest'
 ping_exporter__targets: []
 ping_exporter__nameserver: '9.9.9.9'
 ping_exporter__web_listen_address: ":9427"
+ping_exporter__dns:
+  refresh: "2m15s"
+  nameserver: "{{ ping_exporter__nameserver }}"
+
+ping_exporter__ping:
+  interval: "2s"
+  timeout: "3s"
+  history-size: 42
+  size: 120
+
+ping_exporter__options:
+  disableIPv6: false
 
 # should we do a version check? (recomended)
 submodules_versioncheck: false
diff --git a/meta/main.yml b/meta/main.yml
index c37b5a9..bf92e46 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,7 +1,7 @@
 ---
 galaxy_info:
   role_name: prometheus_ping_exporter
-  author: do1jlr
+  author: l3d
   description: Ansible role to install a prometheus ping exporter
   license: "MIT"
   min_ansible_version: "2.13"
diff --git a/tasks/systemd.yml b/tasks/systemd.yml
index 530cf2b..2c930c0 100644
--- a/tasks/systemd.yml
+++ b/tasks/systemd.yml
@@ -16,3 +16,10 @@
     daemon_reload: true
   notify:
     - "Systemctl restart ping_exporter.service"
+
+- name: Enable ping_exporter.service Service and make sure it started
+  become: true
+  ansible.builtin.systemd:
+    enabled: true
+    name: 'ping_exporter.service'
+    state: 'started'
diff --git a/templates/ping_exporter_config.yml.j2 b/templates/ping_exporter_config.yml.j2
index 77f6d27..e8a6ddf 100644
--- a/templates/ping_exporter_config.yml.j2
+++ b/templates/ping_exporter_config.yml.j2
@@ -1,18 +1,10 @@
 ---
-#
-# {{ ansible_managed }}
-#
-targets: {{ ping_exporter__targets }}
+{{ ansible_managed | comment }}
 
-dns:
-  refresh: 2m15s
-  nameserver: {{ ping_exporter__nameserver }}
+targets: {{ ping_exporter__targets | ansible.builtin.to_yaml(encoding='utf-8') }}
 
-ping:
-  interval: 2s
-  timeout: 3s
-  history-size: 42
-  payload-size: 120
+dns: {{ ping_exporter__dns | ansible.builtin.to_yaml(encoding='utf-8') }}
 
-options:
-  disableIPv6: false
+ping: {{ ping_exporter__ping | ansible.builtin.to_yaml(encoding='utf-8') }}
+
+options: {{ ping_exporter__options | ansible.builtin.to_yaml(encoding='utf-8') }}
diff --git a/vars/main.yml b/vars/main.yml
index b1ad548..f302119 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -11,5 +11,5 @@ ping_arch_map:
 ping_arch: "{{ ping_arch_map[ansible_architecture] | default(ansible_architecture) }}"
 
 # versionscheck
-playbook_version_number: 6   # should be a integer
+playbook_version_number: 7   # should be a integer
 playbook_version_path: 'do1jlr.prometheus_ping_exporter.version'