diff --git a/.env b/.env
index f8f29aad5..3d7661b27 100644
--- a/.env
+++ b/.env
@@ -52,6 +52,7 @@ ZABBIX_WEB_APACHE_HTTP_PORT=8081
 ZABBIX_WEB_APACHE_HTTPS_PORT=8443
 ZABBIX_AGENT_PORT=10050
 ZABBIX_AGENT2_PORT=10060
+ZABBIX_AGENT2_STATUS_PORT=31999
 ZABBIX_JAVA_GATEWAY_PORT=10052
 ZABBIX_SNMPTRAPS_PORT=162
 ZABBIX_WEB_SERVICE_PORT=10053
diff --git a/Dockerfiles/agent2/ubuntu/Dockerfile b/Dockerfiles/agent2/ubuntu/Dockerfile
index 54f34eac0..06ae217cf 100644
--- a/Dockerfiles/agent2/ubuntu/Dockerfile
+++ b/Dockerfiles/agent2/ubuntu/Dockerfile
@@ -72,7 +72,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
     apt-get -y autoremove && \
     apt-get -y clean
 
-EXPOSE 10050/TCP
+EXPOSE 10050/TCP 31999/TCP
 
 WORKDIR /var/lib/zabbix
 
diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile
index 14a7226e5..9b4a8daa7 100644
--- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile
@@ -2,7 +2,6 @@
 ARG MAJOR_VERSION=7.2
 ARG ZBX_VERSION=${MAJOR_VERSION}.1
 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 
 FROM ${BUILD_BASE_IMAGE} AS builder
 
diff --git a/compose_zabbix_components.yaml b/compose_zabbix_components.yaml
index ece0cb2ed..03adb0280 100644
--- a/compose_zabbix_components.yaml
+++ b/compose_zabbix_components.yaml
@@ -439,6 +439,10 @@ services:
      published: "${ZABBIX_AGENT2_PORT}"
      protocol: tcp
      app_protocol: zabbix-agent
+   - name: zabbix-agent-status
+     target: 31999
+     published: "${ZABBIX_AGENT2_STATUS_PORT}"
+     protocol: tcp
   restart: "${RESTART_POLICY}"
   attach: false
   volumes: