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 0fc7efc77..64f5afe2c 100644
--- a/Dockerfiles/build-mysql/alpine/Dockerfile
+++ b/Dockerfiles/build-mysql/alpine/Dockerfile
@@ -34,7 +34,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=patches/,target=/tmp/patches \
     --mount=from=config_templates,target=/tmp/conf \
     set -eux && \
diff --git a/Dockerfiles/build-mysql/centos/Dockerfile b/Dockerfiles/build-mysql/centos/Dockerfile
index f72fde264..ba47c3faa 100644
--- a/Dockerfiles/build-mysql/centos/Dockerfile
+++ b/Dockerfiles/build-mysql/centos/Dockerfile
@@ -34,7 +34,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=patches/,target=/tmp/patches \
     --mount=from=config_templates,target=/tmp/conf \
     set -eux && \
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 5987e5117..c06a54b5a 100644
--- a/Dockerfiles/build-mysql/ol/Dockerfile
+++ b/Dockerfiles/build-mysql/ol/Dockerfile
@@ -34,7 +34,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=patches/,target=/tmp/patches \
     --mount=from=config_templates,target=/tmp/conf \
     set -eux && \
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 a032f5485..59d98c041 100644
--- a/Dockerfiles/build-mysql/rhel/Dockerfile
+++ b/Dockerfiles/build-mysql/rhel/Dockerfile
@@ -45,7 +45,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=patches/,target=/tmp/patches \
     --mount=from=config_templates,target=/tmp/conf \
     set -eux && \
diff --git a/Dockerfiles/build-mysql/ubuntu/Dockerfile b/Dockerfiles/build-mysql/ubuntu/Dockerfile
index dc556d921..abf08c2a2 100644
--- a/Dockerfiles/build-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/build-mysql/ubuntu/Dockerfile
@@ -34,7 +34,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=patches/,target=/tmp/patches \
     --mount=from=config_templates,target=/tmp/conf \
     set -eux && \
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 84f54ff77..84a6d8b0b 100644
--- a/Dockerfiles/build-pgsql/alpine/Dockerfile
+++ b/Dockerfiles/build-pgsql/alpine/Dockerfile
@@ -34,7 +34,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=patches/,target=/tmp/patches \
     --mount=from=config_templates,target=/tmp/conf \
     set -eux && \
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 201525082..193850e18 100644
--- a/Dockerfiles/build-pgsql/centos/Dockerfile
+++ b/Dockerfiles/build-pgsql/centos/Dockerfile
@@ -34,7 +34,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=patches/,target=/tmp/patches \
     --mount=from=config_templates,target=/tmp/conf \
     set -eux && \
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 0328941d7..ee730cd21 100644
--- a/Dockerfiles/build-pgsql/ol/Dockerfile
+++ b/Dockerfiles/build-pgsql/ol/Dockerfile
@@ -34,7 +34,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=patches/,target=/tmp/patches \
     --mount=from=config_templates,target=/tmp/conf \
     set -eux && \
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/rhel/Dockerfile b/Dockerfiles/build-pgsql/rhel/Dockerfile
index 5fbc4b6e6..c045f2bde 100644
--- a/Dockerfiles/build-pgsql/rhel/Dockerfile
+++ b/Dockerfiles/build-pgsql/rhel/Dockerfile
@@ -45,9 +45,14 @@ 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/ \
+<<<<<<< HEAD
     --mount=type=bind,source=src/,target=/tmp/src \
     --mount=type=bind,source=patches/,target=/tmp/patches \
     --mount=from=config_templates,target=/tmp/conf \
+=======
+    --mount=from=sources,target=/tmp/src \
+    --mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
+>>>>>>> b0f7df6f6 (Move sources directory and introduce additional build context)
     set -eux && \
     cd /tmp/ && \
     mkdir -p ${ZBX_OUTPUT_DIR}/agent/sbin/ && \
diff --git a/Dockerfiles/build-pgsql/rhel/src/.gitkeep b/Dockerfiles/build-pgsql/rhel/src/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Dockerfiles/build-pgsql/ubuntu/Dockerfile b/Dockerfiles/build-pgsql/ubuntu/Dockerfile
index 092402d5d..3fa8605c9 100644
--- a/Dockerfiles/build-pgsql/ubuntu/Dockerfile
+++ b/Dockerfiles/build-pgsql/ubuntu/Dockerfile
@@ -34,7 +34,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=patches/,target=/tmp/patches \
     --mount=from=config_templates,target=/tmp/conf \
     set -eux && \
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 1ed338cc7..2ddbdf81f 100644
--- a/Dockerfiles/build-sqlite3/alpine/Dockerfile
+++ b/Dockerfiles/build-sqlite3/alpine/Dockerfile
@@ -34,7 +34,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=patches/,target=/tmp/patches \
     --mount=from=config_templates,target=/tmp/conf \
     set -eux && \
diff --git a/Dockerfiles/build-sqlite3/centos/Dockerfile b/Dockerfiles/build-sqlite3/centos/Dockerfile
index 68f761ed6..ac34c7837 100644
--- a/Dockerfiles/build-sqlite3/centos/Dockerfile
+++ b/Dockerfiles/build-sqlite3/centos/Dockerfile
@@ -34,7 +34,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=patches/,target=/tmp/patches \
     --mount=from=config_templates,target=/tmp/conf \
     set -eux && \
diff --git a/Dockerfiles/build-sqlite3/ol/Dockerfile b/Dockerfiles/build-sqlite3/ol/Dockerfile
index 22b78e449..18a114c48 100644
--- a/Dockerfiles/build-sqlite3/ol/Dockerfile
+++ b/Dockerfiles/build-sqlite3/ol/Dockerfile
@@ -34,7 +34,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=patches/,target=/tmp/patches \
     --mount=from=config_templates,target=/tmp/conf \
     set -eux && \
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 a1c73475c..b4e18b347 100644
--- a/Dockerfiles/build-sqlite3/rhel/Dockerfile
+++ b/Dockerfiles/build-sqlite3/rhel/Dockerfile
@@ -45,7 +45,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=patches/,target=/tmp/patches \
     --mount=from=config_templates,target=/tmp/conf \
     set -eux && \
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/Dockerfiles/build-sqlite3/ubuntu/Dockerfile b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile
index 367f2a0b5..668ebb372 100644
--- a/Dockerfiles/build-sqlite3/ubuntu/Dockerfile
+++ b/Dockerfiles/build-sqlite3/ubuntu/Dockerfile
@@ -34,7 +34,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=patches/,target=/tmp/patches \
     --mount=from=config_templates,target=/tmp/conf \
     set -eux && \
diff --git a/Dockerfiles/build-sqlite3/ubuntu/src/.gitkeep b/Dockerfiles/build-sqlite3/ubuntu/src/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/build.sh b/build.sh
index 6a81f3d84..aa0aad9f9 100755
--- a/build.sh
+++ b/build.sh
@@ -42,7 +42,12 @@ else
     exit 1
 fi
 
-DOCKER_BUILDKIT=1 $exec_command build -t "zabbix-$app_component:$os-$version" --build-context config_templates="../../../config_templates" --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-context config_templates="../../../config_templates" \
+        --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 d8cf78c64..bd6f33ae8 100644
--- a/docker-compose_v3_alpine_mysql_local.yaml
+++ b/docker-compose_v3_alpine_mysql_local.yaml
@@ -14,6 +14,7 @@ services:
    context: ./Dockerfiles/build-mysql/${ALPINE_OS_TAG_SHORT}
    additional_contexts:
     - config_templates=./config_templates/
+    - sources=./sources/
    cache_from:
     - "${ALPINE_CACHE_FROM}"
    args:
@@ -28,6 +29,7 @@ services:
    context: ./Dockerfiles/build-sqlite3/${ALPINE_OS_TAG_SHORT}
    additional_contexts:
     - config_templates=./config_templates/
+    - 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 bdfd2161a..27a362328 100644
--- a/docker-compose_v3_alpine_pgsql_local.yaml
+++ b/docker-compose_v3_alpine_pgsql_local.yaml
@@ -12,6 +12,7 @@ services:
    context: ./Dockerfiles/build-pgsql/${ALPINE_OS_TAG_SHORT}
    additional_contexts:
     - config_templates=./config_templates/
+    - sources=./sources/
    cache_from:
     - "${ALPINE_CACHE_FROM}"
    args:
@@ -26,6 +27,7 @@ services:
    context: ./Dockerfiles/build-mysql/${ALPINE_OS_TAG_SHORT}
    additional_contexts:
     - config_templates=./config_templates/
+    - sources=./sources/
    cache_from:
     - "${ALPINE_CACHE_FROM}"
    args:
@@ -42,6 +44,7 @@ services:
    context: ./Dockerfiles/build-sqlite3/${ALPINE_OS_TAG_SHORT}
    additional_contexts:
     - config_templates=./config_templates/
+    - 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 c8c00e666..2e2bf77a6 100644
--- a/docker-compose_v3_centos_mysql_local.yaml
+++ b/docker-compose_v3_centos_mysql_local.yaml
@@ -14,6 +14,7 @@ services:
    context: ./Dockerfiles/build-mysql/${CENTOS_OS_TAG_SHORT}
    additional_contexts:
     - config_templates=./config_templates/
+    - sources=./sources/
    cache_from:
     - "${CENTOS_CACHE_FROM}"
    args:
@@ -28,6 +29,7 @@ services:
    context: ./Dockerfiles/build-sqlite3/${CENTOS_OS_TAG_SHORT}
    additional_contexts:
     - config_templates=./config_templates/
+    - 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 b9e768a74..ab009b715 100644
--- a/docker-compose_v3_centos_pgsql_local.yaml
+++ b/docker-compose_v3_centos_pgsql_local.yaml
@@ -12,6 +12,7 @@ services:
    context: ./Dockerfiles/build-pgsql/${CENTOS_OS_TAG_SHORT}
    additional_contexts:
     - config_templates=./config_templates/
+    - sources=./sources/
    cache_from:
     - "${CENTOS_CACHE_FROM}"
    args:
@@ -26,6 +27,7 @@ services:
    context: ./Dockerfiles/build-mysql/${CENTOS_OS_TAG_SHORT}
    additional_contexts:
     - config_templates=./config_templates/
+    - 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 eee663d34..969f9f21d 100644
--- a/docker-compose_v3_ol_mysql_local.yaml
+++ b/docker-compose_v3_ol_mysql_local.yaml
@@ -12,6 +12,7 @@ services:
    context: ./Dockerfiles/build-mysql/${OL_OS_TAG_SHORT}
    additional_contexts:
     - config_templates=./config_templates/
+    - sources=./sources/
    cache_from:
     - "${OL_CACHE_FROM}"
    args:
@@ -26,6 +27,7 @@ services:
    context: ./Dockerfiles/build-sqlite3/${OL_OS_TAG_SHORT}
    additional_contexts:
     - config_templates=./config_templates/
+    - 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 dffc42bea..e419a3f1e 100644
--- a/docker-compose_v3_ol_pgsql_local.yaml
+++ b/docker-compose_v3_ol_pgsql_local.yaml
@@ -12,6 +12,7 @@ services:
    context: ./Dockerfiles/build-pgsql/${OL_OS_TAG_SHORT}
    additional_contexts:
     - config_templates=./config_templates/
+    - sources=./sources/
    cache_from:
     - "${OL_CACHE_FROM}"
    args:
@@ -26,6 +27,7 @@ services:
    context: ./Dockerfiles/build-mysql/${OL_OS_TAG_SHORT}
    additional_contexts:
     - config_templates=./config_templates/
+    - sources=./sources/
    cache_from:
     - "${OL_CACHE_FROM}"
    args:
@@ -42,6 +44,7 @@ services:
    context: ./Dockerfiles/build-sqlite3/${OL_OS_TAG_SHORT}
    additional_contexts:
     - config_templates=./config_templates/
+    - 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 4ccd14239..7ce803e85 100644
--- a/docker-compose_v3_ubuntu_mysql_local.yaml
+++ b/docker-compose_v3_ubuntu_mysql_local.yaml
@@ -12,6 +12,7 @@ services:
    context: ./Dockerfiles/build-mysql/${UBUNTU_OS_TAG_SHORT}
    additional_contexts:
     - config_templates=./config_templates/
+    - sources=./sources/
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
    args:
@@ -26,6 +27,7 @@ services:
    context: ./Dockerfiles/build-sqlite3/${UBUNTU_OS_TAG_SHORT}
    additional_contexts:
     - config_templates=./config_templates/
+    - 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 c6af05cff..d9a768be2 100644
--- a/docker-compose_v3_ubuntu_pgsql_local.yaml
+++ b/docker-compose_v3_ubuntu_pgsql_local.yaml
@@ -12,6 +12,7 @@ services:
    context: ./Dockerfiles/build-pgsql/${UBUNTU_OS_TAG_SHORT}
    additional_contexts:
     - config_templates=./config_templates/
+    - sources=./sources/
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
    args:
@@ -26,6 +27,7 @@ services:
    context: ./Dockerfiles/build-mysql/${UBUNTU_OS_TAG_SHORT}
    additional_contexts:
     - config_templates=./config_templates/
+    - sources=./sources/
    cache_from:
     - "${UBUNTU_CACHE_FROM}"
    args:
@@ -42,6 +44,7 @@ services:
    context: ./Dockerfiles/build-sqlite3/${UBUNTU_OS_TAG_SHORT}
    additional_contexts:
     - config_templates=./config_templates/
+    - 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