Merge pull request #8139 from aluzzardi/fix-drone-integration-goenv

Fix drone integration