diff --git a/.gitignore b/.gitignore
index 485bef590..54ef3f319 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ zbx_env*/
 .*KEY_FILE
 .*CA_FILE
 Dockerfiles/*/rhel/secrets/*
+sources/*
\ No newline at end of file
diff --git a/Dockerfiles/build-mysql/alpine/Dockerfile b/Dockerfiles/build-mysql/alpine/Dockerfile
index c18750fb8..b11d9cacb 100644
--- a/Dockerfiles/build-mysql/alpine/Dockerfile
+++ b/Dockerfiles/build-mysql/alpine/Dockerfile
@@ -33,7 +33,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_
 
 RUN --mount=type=cache,target=/root/.cache/go-build/ \
     --mount=type=cache,target=/root/go/ \
-    --mount=type=bind,source=src/,target=/tmp/src \
+    --mount=from=sources,target=/tmp/src \
     --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
     set -eux && \
     cd /tmp/ && \
diff --git a/Dockerfiles/build-mysql/centos/Dockerfile b/Dockerfiles/build-mysql/centos/Dockerfile
index 880e7706d..d405ab227 100644
--- a/Dockerfiles/build-mysql/centos/Dockerfile
+++ b/Dockerfiles/build-mysql/centos/Dockerfile
@@ -33,7 +33,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_
 
 RUN --mount=type=cache,target=/root/.cache/go-build/ \
     --mount=type=cache,target=/root/go/ \
-    --mount=type=bind,source=src/,target=/tmp/src \
+    --mount=from=sources,target=/tmp/src \
     --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
     set -eux && \
     cd /tmp/ && \
diff --git a/Dockerfiles/build-mysql/centos/src/.gitkeep b/Dockerfiles/build-mysql/centos/src/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Dockerfiles/build-mysql/ol/Dockerfile b/Dockerfiles/build-mysql/ol/Dockerfile
index d41516bb1..79a084b7c 100644
--- a/Dockerfiles/build-mysql/ol/Dockerfile
+++ b/Dockerfiles/build-mysql/ol/Dockerfile
@@ -33,7 +33,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_
 
 RUN --mount=type=cache,target=/root/.cache/go-build/ \
     --mount=type=cache,target=/root/go/ \
-    --mount=type=bind,source=src/,target=/tmp/src \
+    --mount=from=sources,target=/tmp/src \
     --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
     set -eux && \
     cd /tmp/ && \
diff --git a/Dockerfiles/build-mysql/ol/src/.gitkeep b/Dockerfiles/build-mysql/ol/src/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Dockerfiles/build-mysql/rhel/Dockerfile b/Dockerfiles/build-mysql/rhel/Dockerfile
index 5ea4d2aa2..24f9aad10 100644
--- a/Dockerfiles/build-mysql/rhel/Dockerfile
+++ b/Dockerfiles/build-mysql/rhel/Dockerfile
@@ -43,7 +43,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_
 
 RUN --mount=type=cache,target=/root/.cache/go-build/ \
     --mount=type=cache,target=/root/go/ \
-    --mount=type=bind,source=src/,target=/tmp/src \
+    --mount=from=sources,target=/tmp/src \
     --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
     set -eux && \
     cd /tmp/ && \
diff --git a/Dockerfiles/build-mysql/rhel/src/.gitkeep b/Dockerfiles/build-mysql/rhel/src/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Dockerfiles/build-mysql/ubuntu/Dockerfile b/Dockerfiles/build-mysql/ubuntu/Dockerfile
index 3ab37dbd2..a6dd05492 100644
--- a/Dockerfiles/build-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/build-mysql/ubuntu/Dockerfile
@@ -33,7 +33,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_
 
 RUN --mount=type=cache,target=/root/.cache/go-build/ \
     --mount=type=cache,target=/root/go/ \
-    --mount=type=bind,source=src/,target=/tmp/src \
+    --mount=from=sources,target=/tmp/src \
     --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
     set -eux && \
     cd /tmp/ && \
diff --git a/Dockerfiles/build-mysql/ubuntu/src/.gitkeep b/Dockerfiles/build-mysql/ubuntu/src/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Dockerfiles/build-pgsql/alpine/Dockerfile b/Dockerfiles/build-pgsql/alpine/Dockerfile
index 8cd7d7662..726100db6 100644
--- a/Dockerfiles/build-pgsql/alpine/Dockerfile
+++ b/Dockerfiles/build-pgsql/alpine/Dockerfile
@@ -33,7 +33,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_
 
 RUN --mount=type=cache,target=/root/.cache/go-build/ \
     --mount=type=cache,target=/root/go/ \
-    --mount=type=bind,source=src/,target=/tmp/src \
+    --mount=from=sources,target=/tmp/src \
     --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
     set -eux && \
     cd /tmp/ && \
diff --git a/Dockerfiles/build-pgsql/alpine/src/.gitkeep b/Dockerfiles/build-pgsql/alpine/src/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Dockerfiles/build-pgsql/centos/Dockerfile b/Dockerfiles/build-pgsql/centos/Dockerfile
index f997346a1..f32576e13 100644
--- a/Dockerfiles/build-pgsql/centos/Dockerfile
+++ b/Dockerfiles/build-pgsql/centos/Dockerfile
@@ -33,7 +33,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_
 
 RUN --mount=type=cache,target=/root/.cache/go-build/ \
     --mount=type=cache,target=/root/go/ \
-    --mount=type=bind,source=src/,target=/tmp/src \
+    --mount=from=sources,target=/tmp/src \
     --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
     set -eux && \
     cd /tmp/ && \
diff --git a/Dockerfiles/build-pgsql/centos/src/.gitkeep b/Dockerfiles/build-pgsql/centos/src/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Dockerfiles/build-pgsql/ol/Dockerfile b/Dockerfiles/build-pgsql/ol/Dockerfile
index fc753e08a..4b9de4ca9 100644
--- a/Dockerfiles/build-pgsql/ol/Dockerfile
+++ b/Dockerfiles/build-pgsql/ol/Dockerfile
@@ -33,7 +33,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_
 
 RUN --mount=type=cache,target=/root/.cache/go-build/ \
     --mount=type=cache,target=/root/go/ \
-    --mount=type=bind,source=src/,target=/tmp/src \
+    --mount=from=sources,target=/tmp/src \
     --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
     set -eux && \
     cd /tmp/ && \
diff --git a/Dockerfiles/build-pgsql/ol/src/.gitkeep b/Dockerfiles/build-pgsql/ol/src/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Dockerfiles/build-pgsql/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile
index ddc412bd0..f87a69ac9 100644
--- a/Dockerfiles/build-pgsql/ubuntu/Dockerfile
+++ b/Dockerfiles/build-pgsql/ubuntu/Dockerfile
@@ -33,7 +33,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_
 
 RUN --mount=type=cache,target=/root/.cache/go-build/ \
     --mount=type=cache,target=/root/go/ \
-    --mount=type=bind,source=src/,target=/tmp/src \
+    --mount=from=sources,target=/tmp/src \
     --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
     set -eux && \
     cd /tmp/ && \
diff --git a/Dockerfiles/build-pgsql/ubuntu/src/.gitkeep b/Dockerfiles/build-pgsql/ubuntu/src/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Dockerfiles/build-sqlite3/alpine/Dockerfile b/Dockerfiles/build-sqlite3/alpine/Dockerfile
index a868eb245..00d840048 100644
--- a/Dockerfiles/build-sqlite3/alpine/Dockerfile
+++ b/Dockerfiles/build-sqlite3/alpine/Dockerfile
@@ -33,7 +33,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_
 
 RUN --mount=type=cache,target=/root/.cache/go-build/ \
     --mount=type=cache,target=/root/go/ \
-    --mount=type=bind,source=src/,target=/tmp/src \
+    --mount=from=sources,target=/tmp/src \
     set -eux && \
     cd /tmp/ && \
     mkdir -p ${ZBX_OUTPUT_DIR}/agent/sbin/ && \
diff --git a/Dockerfiles/build-sqlite3/centos/Dockerfile b/Dockerfiles/build-sqlite3/centos/Dockerfile
index 9ca124166..6c0fe49ae 100644
--- a/Dockerfiles/build-sqlite3/centos/Dockerfile
+++ b/Dockerfiles/build-sqlite3/centos/Dockerfile
@@ -33,7 +33,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_
 
 RUN --mount=type=cache,target=/root/.cache/go-build/ \
     --mount=type=cache,target=/root/go/ \
-    --mount=type=bind,source=src/,target=/tmp/src \
+    --mount=from=sources,target=/tmp/src \
     set -eux && \
     cd /tmp/ && \
     mkdir -p ${ZBX_OUTPUT_DIR}/agent/sbin/ && \
diff --git a/Dockerfiles/build-sqlite3/ol/Dockerfile b/Dockerfiles/build-sqlite3/ol/Dockerfile
index 5febf2ac8..752c57fc9 100644
--- a/Dockerfiles/build-sqlite3/ol/Dockerfile
+++ b/Dockerfiles/build-sqlite3/ol/Dockerfile
@@ -33,7 +33,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_
 
 RUN --mount=type=cache,target=/root/.cache/go-build/ \
     --mount=type=cache,target=/root/go/ \
-    --mount=type=bind,source=src/,target=/tmp/src \
+    --mount=from=sources,target=/tmp/src \
     set -eux && \
     cd /tmp/ && \
     mkdir -p ${ZBX_OUTPUT_DIR}/agent/sbin/ && \
diff --git a/Dockerfiles/build-sqlite3/ol/src/.gitkeep b/Dockerfiles/build-sqlite3/ol/src/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Dockerfiles/build-sqlite3/rhel/Dockerfile b/Dockerfiles/build-sqlite3/rhel/Dockerfile
index 12efcbc1c..e7790143f 100644
--- a/Dockerfiles/build-sqlite3/rhel/Dockerfile
+++ b/Dockerfiles/build-sqlite3/rhel/Dockerfile
@@ -43,7 +43,7 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_
 
 RUN --mount=type=cache,target=/root/.cache/go-build/ \
     --mount=type=cache,target=/root/go/ \
-    --mount=type=bind,source=src/,target=/tmp/src \
+    --mount=from=sources,target=/tmp/src \
     set -eux && \
     cd /tmp/ && \
     mkdir -p ${ZBX_OUTPUT_DIR}/agent/sbin/ && \
diff --git a/Dockerfiles/build-sqlite3/rhel/src/.gitkeep b/Dockerfiles/build-sqlite3/rhel/src/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/build.sh b/build.sh
index 01875e814..ee2a36882 100755
--- a/build.sh
+++ b/build.sh
@@ -42,7 +42,7 @@ else
     exit 1
 fi
 
-DOCKER_BUILDKIT=1 $exec_command build -t "zabbix-$app_component:$os-$version" --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")" -f Dockerfile .
+DOCKER_BUILDKIT=1 $exec_command build -t "zabbix-$app_component:$os-$version" --build-context sources="../../../sources" --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")" -f Dockerfile .
 
 if [ "$type" != "build" ]; then
     links=""
diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml
index b15b380fa..54d9576ec 100644
--- a/docker-compose_v3_alpine_mysql_local.yaml
+++ b/docker-compose_v3_alpine_mysql_local.yaml
@@ -10,6 +10,8 @@ services:
  zabbix-build-mysql:
   build:
    context: ./Dockerfiles/build-mysql/${ALPINE_OS_TAG_SHORT}
+   additional_contexts:
+    - sources=./sources/
    cache_from:
     - "${ALPINE_CACHE_FROM}"
    args:
@@ -22,6 +24,8 @@ services:
  zabbix-build-sqlite3:
   build:
    context: ./Dockerfiles/build-sqlite3/${ALPINE_OS_TAG_SHORT}
+   additional_contexts:
+    - sources=./sources/
    cache_from:
     - "${ALPINE_CACHE_FROM}"
    args:
diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml
index 56440a319..adea8031b 100644
--- a/docker-compose_v3_alpine_pgsql_local.yaml
+++ b/docker-compose_v3_alpine_pgsql_local.yaml
@@ -10,6 +10,8 @@ services:
  zabbix-build-pgsql:
   build:
    context: ./Dockerfiles/build-pgsql/${ALPINE_OS_TAG_SHORT}
+   additional_contexts:
+    - sources=./sources/
    cache_from:
     - "${ALPINE_CACHE_FROM}"
    args:
@@ -22,6 +24,8 @@ services:
  zabbix-build-mysql:
   build:
    context: ./Dockerfiles/build-mysql/${ALPINE_OS_TAG_SHORT}
+   additional_contexts:
+    - sources=./sources/
    cache_from:
     - "${ALPINE_CACHE_FROM}"
    args:
@@ -36,6 +40,8 @@ services:
  zabbix-build-sqlite3:
   build:
    context: ./Dockerfiles/build-sqlite3/${ALPINE_OS_TAG_SHORT}
+   additional_contexts:
+    - sources=./sources/
    cache_from:
     - "${ALPINE_CACHE_FROM}"
    args:
diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml
index 19c11c72c..bd3cec255 100644
--- a/docker-compose_v3_centos_mysql_local.yaml
+++ b/docker-compose_v3_centos_mysql_local.yaml
@@ -10,6 +10,8 @@ services:
  zabbix-build-mysql:
   build:
    context: ./Dockerfiles/build-mysql/${CENTOS_OS_TAG_SHORT}
+   additional_contexts:
+    - sources=./sources/
    cache_from:
     - "${CENTOS_CACHE_FROM}"
    args:
@@ -22,6 +24,8 @@ services:
  zabbix-build-sqlite3:
   build:
    context: ./Dockerfiles/build-sqlite3/${CENTOS_OS_TAG_SHORT}
+   additional_contexts:
+    - sources=./sources/
    cache_from:
     - "${CENTOS_CACHE_FROM}"
    args:
diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml
index b9f32632a..7ba3d7c54 100644
--- a/docker-compose_v3_centos_pgsql_local.yaml
+++ b/docker-compose_v3_centos_pgsql_local.yaml
@@ -10,6 +10,8 @@ services:
  zabbix-build-pgsql:
   build:
    context: ./Dockerfiles/build-pgsql/${CENTOS_OS_TAG_SHORT}
+   additional_contexts:
+    - sources=./sources/
    cache_from:
     - "${CENTOS_CACHE_FROM}"
    args:
@@ -22,6 +24,8 @@ services:
  zabbix-build-mysql:
   build:
    context: ./Dockerfiles/build-mysql/${CENTOS_OS_TAG_SHORT}
+   additional_contexts:
+    - sources=./sources/
    cache_from:
     - "${CENTOS_CACHE_FROM}"
    args:
diff --git a/docker-compose_v3_ol_mysql_local.yaml b/docker-compose_v3_ol_mysql_local.yaml
index 3fe4e0573..b92351e45 100644
--- a/docker-compose_v3_ol_mysql_local.yaml
+++ b/docker-compose_v3_ol_mysql_local.yaml
@@ -10,6 +10,8 @@ services:
  zabbix-build-mysql:
   build:
    context: ./Dockerfiles/build-mysql/${OL_OS_TAG_SHORT}
+   additional_contexts:
+    - sources=./sources/
    cache_from:
     - "${OL_CACHE_FROM}"
    args:
@@ -22,6 +24,8 @@ services:
  zabbix-build-sqlite3:
   build:
    context: ./Dockerfiles/build-sqlite3/${OL_OS_TAG_SHORT}
+   additional_contexts:
+    - sources=./sources/
    cache_from:
     - "${OL_CACHE_FROM}"
    args:
diff --git a/docker-compose_v3_ol_pgsql_local.yaml b/docker-compose_v3_ol_pgsql_local.yaml
index d09555339..b1f6a8aec 100644
--- a/docker-compose_v3_ol_pgsql_local.yaml
+++ b/docker-compose_v3_ol_pgsql_local.yaml
@@ -10,6 +10,8 @@ services:
  zabbix-build-pgsql:
   build:
    context: ./Dockerfiles/build-pgsql/${OL_OS_TAG_SHORT}
+   additional_contexts:
+    - sources=./sources/
    cache_from:
     - "${OL_CACHE_FROM}"
    args:
@@ -22,6 +24,8 @@ services:
  zabbix-build-mysql:
   build:
    context: ./Dockerfiles/build-mysql/${OL_OS_TAG_SHORT}
+   additional_contexts:
+    - sources=./sources/
    cache_from:
     - "${OL_CACHE_FROM}"
    args:
@@ -36,6 +40,8 @@ services:
  zabbix-build-sqlite3:
   build:
    context: ./Dockerfiles/build-sqlite3/${OL_OS_TAG_SHORT}
+   additional_contexts:
+    - sources=./sources/
    cache_from:
     - "${OL_CACHE_FROM}"
    args:
diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml
index 76954e8c2..7612db877 100644
--- a/docker-compose_v3_ubuntu_mysql_local.yaml
+++ b/docker-compose_v3_ubuntu_mysql_local.yaml
@@ -10,6 +10,8 @@ services:
  zabbix-build-mysql:
   build:
    context: ./Dockerfiles/build-mysql/${UBUNTU_OS_TAG_SHORT}
+   additional_contexts:
+    - sources=./sources/
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
    args:
@@ -22,6 +24,8 @@ services:
  zabbix-build-sqlite3:
   build:
    context: ./Dockerfiles/build-sqlite3/${UBUNTU_OS_TAG_SHORT}
+   additional_contexts:
+    - sources=./sources/
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
    args:
diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml
index 99f7807fa..ca81ec808 100644
--- a/docker-compose_v3_ubuntu_pgsql_local.yaml
+++ b/docker-compose_v3_ubuntu_pgsql_local.yaml
@@ -10,6 +10,8 @@ services:
  zabbix-build-pgsql:
   build:
    context: ./Dockerfiles/build-pgsql/${UBUNTU_OS_TAG_SHORT}
+   additional_contexts:
+    - sources=./sources/
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
    args:
@@ -22,6 +24,8 @@ services:
  zabbix-build-mysql:
   build:
    context: ./Dockerfiles/build-mysql/${UBUNTU_OS_TAG_SHORT}
+   additional_contexts:
+    - sources=./sources/
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
    args:
@@ -36,6 +40,8 @@ services:
  zabbix-build-sqlite3:
   build:
    context: ./Dockerfiles/build-sqlite3/${UBUNTU_OS_TAG_SHORT}
+   additional_contexts:
+    - sources=./sources/
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
    args:
diff --git a/Dockerfiles/build-mysql/alpine/src/.gitkeep b/sources/.gitkeep
similarity index 100%
rename from Dockerfiles/build-mysql/alpine/src/.gitkeep
rename to sources/.gitkeep