diff --git a/tasks/install-docker.yml b/tasks/install-docker.yml
index 6fddc5b..646b27c 100644
--- a/tasks/install-docker.yml
+++ b/tasks/install-docker.yml
@@ -9,4 +9,4 @@
     - docker-compose-plugin
     state: latest
     update_cache: yes
-  when: ansible_hostname == "zbxsrv"
+  when: ansible_hostname == "zbxsrv" or ansible_hostname == "proxy1"
diff --git a/tasks/service-docker.yml b/tasks/service-docker.yml
index ecc8928..9dedb2d 100644
--- a/tasks/service-docker.yml
+++ b/tasks/service-docker.yml
@@ -4,4 +4,4 @@
     name: docker
     enabled: yes
     state: started
-  when: ansible_hostname == "zbxsrv"
+  when: ansible_hostname == "zbxsrv" or ansible_hostname == "proxy1"
diff --git a/templates/zabbix_agentd.conf.j2 b/templates/zabbix_agentd.conf.j2
index 005f190..9e54a50 100644
--- a/templates/zabbix_agentd.conf.j2
+++ b/templates/zabbix_agentd.conf.j2
@@ -13,3 +13,7 @@ TLSConnect=psk
 TLSAccept=psk
 TLSPSKFile=/etc/zabbix/zabbix.psk
 TLSPSKIdentity={{ inventory_hostname_short }}
+{% if REMOTECOMMANDS is defined %}
+EnableRemoteCommands=1
+AllowKey=system.run[*]
+{% endif %}