diff --git a/.drone.yml b/.drone.yml
index 5596065ad3f..8c16908d2b2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1072,7 +1072,7 @@ steps:
   - echo $DRONE_RUNNER_NAME
 
 - name: clone
-  image: alpine/git:v2.26.2
+  image: grafana/build-container:1.2.27
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.18/grabpl
@@ -1089,7 +1089,8 @@ steps:
   image: grafana/build-container:1.2.27
   commands:
   - export DRONE_TAG=$$(./bin/grabpl parse-tag-ref ${DRONE_COMMIT_REF})
-  - mv grabpl /tmp
+  - mv bin/grabpl /tmp/
+  - rmdir bin
   - mv grafana-enterprise /tmp/
   - /tmp/grabpl init-enterprise /tmp/grafana-enterprise $${DRONE_TAG}
   - mkdir bin
@@ -1835,7 +1836,7 @@ steps:
   - echo $DRONE_RUNNER_NAME
 
 - name: clone
-  image: alpine/git:v2.26.2
+  image: grafana/build-container:1.2.27
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.18/grabpl
@@ -1850,7 +1851,8 @@ steps:
 - name: initialize
   image: grafana/build-container:1.2.27
   commands:
-  - mv grabpl /tmp
+  - mv bin/grabpl /tmp/
+  - rmdir bin
   - mv grafana-enterprise /tmp/
   - /tmp/grabpl init-enterprise /tmp/grafana-enterprise
   - mkdir bin
diff --git a/scripts/lib.star b/scripts/lib.star
index 01804eba986..5a463efb613 100644
--- a/scripts/lib.star
+++ b/scripts/lib.star
@@ -4,7 +4,6 @@ publish_image = 'grafana/grafana-ci-deploy:1.2.6'
 grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
 alpine_image = 'alpine:3.12'
 windows_image = 'mcr.microsoft.com/windows:1809'
-git_image = 'alpine/git:v2.26.2'
 dockerize_version = '0.6.1'
 wix_image = 'grafana/ci-wix:0.1.1'
 test_release_ver = 'v7.3.0-test'
@@ -138,7 +137,7 @@ def init_steps(edition, platform, ver_mode, is_downstream=False, install_deps=Tr
             identify_runner_step,
             {
                 'name': 'clone',
-                'image': git_image,
+                'image': build_image,
                 'environment': {
                     'GITHUB_TOKEN': {
                         'from_secret': 'github_token',
@@ -160,7 +159,8 @@ def init_steps(edition, platform, ver_mode, is_downstream=False, install_deps=Tr
                     'clone',
                 ],
                 'commands': pre_cmds + [
-                    'mv grabpl /tmp',
+                    'mv bin/grabpl /tmp/',
+                    'rmdir bin',
                     'mv grafana-enterprise /tmp/',
                     '/tmp/grabpl init-enterprise /tmp/grafana-enterprise{}'.format(source_commit),
                     'mkdir bin',