diff --git a/recipes-containers/riddler/files/0001-build-use-to-select-cross-compiler.patch b/recipes-containers/riddler/files/0001-build-use-to-select-cross-compiler.patch
index 8098562e..0c4f3fd2 100644
--- a/recipes-containers/riddler/files/0001-build-use-to-select-cross-compiler.patch
+++ b/recipes-containers/riddler/files/0001-build-use-to-select-cross-compiler.patch
@@ -17,12 +17,12 @@ index c6976af..f3c8d17 100644
  build:
  	@echo "+ $@"
 -	@go build -tags "$(BUILDTAGS) cgo" .
-+	@${GO} build -tags "$(BUILDTAGS) cgo" .
++	@${GO} build ${GOBUILDFLAGS} -tags "$(BUILDTAGS) cgo" .
  
  static:
  	@echo "+ $@"
 -	CGO_ENABLED=1 go build -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static" -o riddler .
-+	CGO_ENABLED=1 ${GO} build -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static" -o riddler .
++	CGO_ENABLED=1 ${GO} build ${GOBUILDFLAGS} -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static" -o riddler .
  
  fmt:
  	@echo "+ $@"
diff --git a/recipes-containers/riddler/riddler_git.bb b/recipes-containers/riddler/riddler_git.bb
index e1033312..191becfe 100644
--- a/recipes-containers/riddler/riddler_git.bb
+++ b/recipes-containers/riddler/riddler_git.bb
@@ -47,6 +47,7 @@ do_compile() {
 	export CGO_CFLAGS="${TARGET_CFLAGS}"
 	export CGO_LDFLAGS="${TARGET_LDFLAGS}"
 	export GO111MODULE=off
+	export GOBUILDFLAGS="-trimpath"
 
 	cd ${S}/src/import