diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile
index 6db5478ff..0590ceccf 100644
--- a/proxy-mysql/alpine/Dockerfile
+++ b/proxy-mysql/alpine/Dockerfile
@@ -77,6 +77,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
             --libdir=/usr/lib/zabbix \
             --datadir=/usr/lib \
             --enable-proxy \
+            --enable-agent \
             --enable-ipv6 \
 # Does not support stable iksemel library
 #            --with-jabber \
diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile
index 131ffa963..9b51ade6e 100644
--- a/proxy-mysql/ubuntu/Dockerfile
+++ b/proxy-mysql/ubuntu/Dockerfile
@@ -84,6 +84,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             --libdir=/usr/lib/zabbix \
             --datadir=/usr/lib \
             --enable-proxy \
+            --enable-agent \
             --enable-ipv6 \
             --with-jabber \
             --with-ldap \
diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile
index 7ccab6e08..73410db88 100644
--- a/proxy-sqlite3/alpine/Dockerfile
+++ b/proxy-sqlite3/alpine/Dockerfile
@@ -73,6 +73,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
             --libdir=/usr/lib/zabbix \
             --datadir=/usr/lib \
             --enable-proxy \
+            --enable-agent \
             --enable-ipv6 \
 # Does not support stable iksemel library
 #            --with-jabber \
diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile
index 71037c39f..bbae21252 100644
--- a/proxy-sqlite3/ubuntu/Dockerfile
+++ b/proxy-sqlite3/ubuntu/Dockerfile
@@ -82,6 +82,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             --libdir=/usr/lib/zabbix \
             --datadir=/usr/lib \
             --enable-proxy \
+            --enable-agent \
             --enable-ipv6 \
             --with-jabber \
             --with-ldap \
diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile
index 943e8ed18..3098cbdd6 100644
--- a/server-mysql/alpine/Dockerfile
+++ b/server-mysql/alpine/Dockerfile
@@ -78,6 +78,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
             --libdir=/usr/lib/zabbix \
             --datadir=/usr/lib \
             --enable-server \
+            --enable-agent \
             --enable-ipv6 \
 # Does not support stable iksemel library
 #            --with-jabber \
diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile
index aa8c00b4b..3e3e37d2e 100644
--- a/server-mysql/ubuntu/Dockerfile
+++ b/server-mysql/ubuntu/Dockerfile
@@ -85,6 +85,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             --libdir=/usr/lib/zabbix \
             --datadir=/usr/lib \
             --enable-server \
+            --enable-agent \
             --enable-ipv6 \
             --with-jabber \
             --with-ldap \
diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile
index 67cdb8ea9..0e878f8a7 100644
--- a/server-pgsql/alpine/Dockerfile
+++ b/server-pgsql/alpine/Dockerfile
@@ -78,6 +78,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
             --libdir=/usr/lib/zabbix \
             --datadir=/usr/lib \
             --enable-server \
+            --enable-agent \
             --enable-ipv6 \
 # Does not support stable iksemel library
 #            --with-jabber \
diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile
index 29b2aeb60..c99562975 100644
--- a/server-pgsql/ubuntu/Dockerfile
+++ b/server-pgsql/ubuntu/Dockerfile
@@ -85,6 +85,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
             --libdir=/usr/lib/zabbix \
             --datadir=/usr/lib \
             --enable-server \
+            --enable-agent \
             --enable-ipv6 \
             --with-jabber \
             --with-ldap \