diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile
index d11e33943..1bbae24a8 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 7464fc600..fc77e8179 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 b2943de9e..59d6e19b5 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 3f7ee3452..338ff2baa 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 9439d436d..7fbdb976d 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 f8d6e0f15..353e2d759 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 bf76616cc..3255ce84f 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 772ddba1a..d56f54a03 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 \