diff --git a/roles/kea_dhcp/handlers/main.yml b/roles/kea_dhcp/handlers/main.yml
index 04dbc09a..6d9f111f 100644
--- a/roles/kea_dhcp/handlers/main.yml
+++ b/roles/kea_dhcp/handlers/main.yml
@@ -7,7 +7,6 @@
 - name: Kea_dhcp4.restarted_debian
   listen: Kea_dhcp4.restarted
   become: true
-  when: ansible_facts['distribution'] == 'Debian'
   ansible.builtin.service:
     name: isc-kea-dhcp4-server
     state: restarted
@@ -16,7 +15,6 @@
 - name: Kea_dhcp6.restarted_debian
   listen: Kea_dhcp6.restarted
   become: true
-  when: ansible_facts['distribution'] == 'Debian'
   ansible.builtin.service:
     name: isc-kea-dhcp6-server
     state: restarted
@@ -25,7 +23,6 @@
 - name: Kea_ctrl.restarted_debian
   listen: Kea_ctrl.restarted
   become: true
-  when: ansible_facts['distribution'] == 'Debian'
   ansible.builtin.systemd:
     name: isc-kea-ctrl-agent
     state: restarted
@@ -34,7 +31,6 @@
 - name: Stork_agent.restarted_debian
   listen: Stork_agent.restarted
   become: true
-  when: ansible_facts['distribution'] == 'Debian'
   ansible.builtin.systemd:
     name: isc-stork-agent
     state: restarted
diff --git a/roles/kea_dhcp/tasks/main.yml b/roles/kea_dhcp/tasks/main.yml
index 8150672b..44fffb53 100644
--- a/roles/kea_dhcp/tasks/main.yml
+++ b/roles/kea_dhcp/tasks/main.yml
@@ -13,7 +13,6 @@
 - name: Setup Kea DHCP
   block:
     - name: Install Kea on Debian
-      when: ansible_facts['distribution'] == "Debian"
       ansible.builtin.import_tasks: install_debian.yaml
 
     - name: Configure Kea
diff --git a/roles/kea_dhcp/tasks/stork-agent.yaml b/roles/kea_dhcp/tasks/stork-agent.yaml
index 9e65e9e4..45de32ba 100644
--- a/roles/kea_dhcp/tasks/stork-agent.yaml
+++ b/roles/kea_dhcp/tasks/stork-agent.yaml
@@ -2,7 +2,6 @@
 - name: Install stork-agent
   block:
     - name: Install stork-agent on Debian
-      when: ansible_facts['distribution'] == "Debian"
       block:
         - name: Register isc-stork apt repository
           become: true
@@ -21,7 +20,6 @@
             update_cache: "{{ kea_dhcp_install_repo.changed }}"
 
     - name: Add stork-agent user to kea group on Debian
-      when: ansible_facts['distribution'] == "Debian"
       become: true
       ansible.builtin.user:
         name: stork-agent
diff --git a/roles/kea_dhcp/templates/stork-agent.env.j2 b/roles/kea_dhcp/templates/stork-agent.env.j2
index bdfa4d2d..b1db70ab 100644
--- a/roles/kea_dhcp/templates/stork-agent.env.j2
+++ b/roles/kea_dhcp/templates/stork-agent.env.j2
@@ -1,44 +1,12 @@
-### the IP or hostname to listen on for incoming Stork server connections
-# STORK_AGENT_HOST=
-
-### the TCP port to listen on for incoming Stork server connections
-# STORK_AGENT_PORT=8081
-
-### listen for commands from the Stork server only, but not for Prometheus requests
-# STORK_AGENT_LISTEN_STORK_ONLY=true
+# See example config at: https://gitlab.isc.org/isc-projects/stork/-/blob/stable/etc/agent.env?ref_type=tags
 
 {% if kea_dhcp__stork_agent.prometheus_only %}
 ### listen for Prometheus requests only, but not for commands from the Stork server
 STORK_AGENT_LISTEN_PROMETHEUS_ONLY=true
 {% endif %}
 
-### settings for exporting stats to Prometheus
-### the IP or hostname on which the agent exports Kea statistics to Prometheus
-# STORK_AGENT_PROMETHEUS_KEA_EXPORTER_ADDRESS=
-### the port on which the agent exports Kea statistics to Prometheus
-# STORK_AGENT_PROMETHEUS_KEA_EXPORTER_PORT=
-## enable or disable collecting per-subnet stats from Kea
-# STORK_AGENT_PROMETHEUS_KEA_EXPORTER_PER_SUBNET_STATS=true
-### the IP or hostname on which the agent exports BIND 9 statistics to Prometheus
-# STORK_AGENT_PROMETHEUS_BIND9_EXPORTER_ADDRESS=
-### the port on which the agent exports BIND 9 statistics to Prometheus
-# STORK_AGENT_PROMETHEUS_BIND9_EXPORTER_PORT=
-
-### Stork Server URL used by the agent to send REST commands to the server during agent registration
-# STORK_AGENT_SERVER_URL=
-
-### skip TLS certificate verification when the Stork Agent connects
-### to Kea over TLS and Kea uses self-signed certificates
-# STORK_AGENT_SKIP_TLS_CERT_VERIFICATION=true
-
-
 ### Logging parameters
 
 ### Set logging level. Supported values are: DEBUG, INFO, WARN, ERROR
 STORK_LOG_LEVEL=DEBUG
-### disable output colorization
-# CLICOLOR=false
-
-### path to the hook directory
-# STORK_AGENT_HOOK_DIRECTORY=