diff --git a/DistTasks.yml b/DistTasks.yml
index a0bbf89..4431108 100644
--- a/DistTasks.yml
+++ b/DistTasks.yml
@@ -84,7 +84,7 @@ tasks:
           -w /home/build \
           -e CGO_ENABLED=1 \
           {{.CONTAINER}}:{{.CONTAINER_TAG}} \
-          --build-cmd "{{.BUILD_COMMAND}}" \
+          --build-cmd "git config --global --add safe.directory /home/build && {{.BUILD_COMMAND}}" \
           -p "{{.BUILD_PLATFORM}}"
 
         zip \
@@ -94,7 +94,7 @@ tasks:
 
     vars:
       PLATFORM_DIR: "{{.PROJECT_NAME}}_windows_arm64"
-      BUILD_COMMAND: "go build -buildvcs=false -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe {{.LDFLAGS}}"
+      BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}}.exe {{.LDFLAGS}}"
       BUILD_PLATFORM: "windows/arm64"
       CONTAINER_TAG: "{{.GO_VERSION}}-windows-arm64-debian12"
       PACKAGE_PLATFORM: "Windows_ARM64"
@@ -166,7 +166,7 @@ tasks:
           -w /home/build \
           -e CGO_ENABLED=1 \
           {{.CONTAINER}}:{{.CONTAINER_TAG}} \
-          --build-cmd "{{.BUILD_COMMAND}}" \
+          --build-cmd "git config --global --add safe.directory /home/build && {{.BUILD_COMMAND}}" \
           -p "{{.BUILD_PLATFORM}}"
 
         tar cz \
@@ -178,7 +178,7 @@ tasks:
 
     vars:
       PLATFORM_DIR: "{{.PROJECT_NAME}}_linux_arm_7"
-      BUILD_COMMAND: "go build -buildvcs=false -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
+      BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
       BUILD_PLATFORM: "linux/armv7"
       CONTAINER_TAG: "{{.GO_VERSION}}-armhf-debian10"
       PACKAGE_PLATFORM: "Linux_ARMv7"
@@ -194,7 +194,7 @@ tasks:
           -w /home/build \
           -e CGO_ENABLED=1 \
           {{.CONTAINER}}:{{.CONTAINER_TAG}} \
-          --build-cmd "{{.BUILD_COMMAND}}" \
+          --build-cmd "git config --global --add safe.directory /home/build && {{.BUILD_COMMAND}}" \
           -p "{{.BUILD_PLATFORM}}"
 
         tar cz \
@@ -206,7 +206,7 @@ tasks:
 
     vars:
       PLATFORM_DIR: "{{.PROJECT_NAME}}_linux_arm_6"
-      BUILD_COMMAND: "go build -buildvcs=false -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
+      BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
       BUILD_PLATFORM: "linux/armv6"
       CONTAINER_TAG: "{{.GO_VERSION}}-armel-debian12"
       PACKAGE_PLATFORM: "Linux_ARMv6"
@@ -222,7 +222,7 @@ tasks:
           -w /home/build \
           -e CGO_ENABLED=1 \
           {{.CONTAINER}}:{{.CONTAINER_TAG}} \
-          --build-cmd "{{.BUILD_COMMAND}}" \
+          --build-cmd "git config --global --add safe.directory /home/build && {{.BUILD_COMMAND}}" \
           -p "{{.BUILD_PLATFORM}}"
 
         tar cz \
@@ -234,7 +234,7 @@ tasks:
 
     vars:
       PLATFORM_DIR: "{{.PROJECT_NAME}}_linux_arm_64"
-      BUILD_COMMAND: "go build -buildvcs=false -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
+      BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
       BUILD_PLATFORM: "linux/arm64"
       CONTAINER_TAG: "{{.GO_VERSION}}-base-arm-debian10"
       PACKAGE_PLATFORM: "Linux_ARM64"
@@ -250,7 +250,7 @@ tasks:
           -w /home/build \
           -e CGO_ENABLED=1 \
           {{.CONTAINER}}:{{.CONTAINER_TAG}} \
-          --build-cmd "{{.BUILD_COMMAND}}" \
+          --build-cmd "git config --global --add safe.directory /home/build && {{.BUILD_COMMAND}}" \
           -p "{{.BUILD_PLATFORM}}"
 
         tar cz \
@@ -262,7 +262,7 @@ tasks:
 
     vars:
       PLATFORM_DIR: "{{.PROJECT_NAME}}_osx_darwin_amd64"
-      BUILD_COMMAND: "go build -buildvcs=false -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
+      BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
       BUILD_PLATFORM: "darwin/amd64"
       # We are experiencing the following error with macOS_64bit build:
       #
@@ -291,7 +291,7 @@ tasks:
           -w /home/build \
           -e CGO_ENABLED=1 \
           {{.CONTAINER}}:{{.CONTAINER_TAG}} \
-          --build-cmd "{{.BUILD_COMMAND}}" \
+          --build-cmd "git config --global --add safe.directory /home/build && {{.BUILD_COMMAND}}" \
           -p "{{.BUILD_PLATFORM}}"
 
         tar cz \
@@ -303,7 +303,7 @@ tasks:
 
     vars:
       PLATFORM_DIR: "{{.PROJECT_NAME}}_osx_darwin_arm64"
-      BUILD_COMMAND: "go build -buildvcs=false -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
+      BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
       BUILD_PLATFORM: "darwin/arm64"
       CONTAINER_TAG: "{{.GO_VERSION}}-darwin-arm64-debian10"
       PACKAGE_PLATFORM: "macOS_ARM64"