diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile
index d4c529d90..7031d0c1d 100644
--- a/proxy-mysql/alpine/Dockerfile
+++ b/proxy-mysql/alpine/Dockerfile
@@ -81,6 +81,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 485b64c3c..425f55bb1 100644
--- a/proxy-mysql/ubuntu/Dockerfile
+++ b/proxy-mysql/ubuntu/Dockerfile
@@ -88,6 +88,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 9ac951a6d..a315d6d65 100644
--- a/proxy-sqlite3/alpine/Dockerfile
+++ b/proxy-sqlite3/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-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile
index 0f1e3a41d..349e62e89 100644
--- a/proxy-sqlite3/ubuntu/Dockerfile
+++ b/proxy-sqlite3/ubuntu/Dockerfile
@@ -86,6 +86,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 8e5b68c77..7c467507e 100644
--- a/server-mysql/alpine/Dockerfile
+++ b/server-mysql/alpine/Dockerfile
@@ -82,6 +82,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 f3e1f910e..eec250fee 100644
--- a/server-mysql/ubuntu/Dockerfile
+++ b/server-mysql/ubuntu/Dockerfile
@@ -89,6 +89,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 a6b313f7f..d09de58af 100644
--- a/server-pgsql/alpine/Dockerfile
+++ b/server-pgsql/alpine/Dockerfile
@@ -82,6 +82,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 f2bfb2a36..4bf9f6970 100644
--- a/server-pgsql/ubuntu/Dockerfile
+++ b/server-pgsql/ubuntu/Dockerfile
@@ -89,6 +89,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 \