chore: cherry pick #295 into 0.4 #886

Job	Run time
Build (ubuntu-latest)	1m 23s
Build (ubuntu-latest)	1m 23s
Unit Test	1m 12s
Unit Test	1m 12s
Test patch buildx/default	9m 41s
Test patch buildx/default	9m 41s
Test patch buildx/named	10m 43s
Test patch buildx/named	8m 28s
Test patch direct/tcp	8m 15s
Test patch direct/tcp	8m 15s
Test patch docker/custom-unix	8m 32s
Test patch docker/custom-unix	8m 32s
	1h 17m 17s

Provide feedback