diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 7510789aacf..ebc5aa34fba 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -41,6 +41,19 @@
     'gomodTidy',
     'gomodVendor',
   ],
+  customManagers: [
+    {
+      description: 'Update tempo-ci-tools image tag in Makefile and build/tools.mk',
+      customType: 'regex',
+      managerFilePatterns: ['/^Makefile$/', '/^build\\/tools\\.mk$/'],
+      matchStrings: [
+        'TEMPO_CI_TOOLS_IMAGE\\s*\\?=\\s*(?<depName>grafana/tempo-ci-tools):(?<currentValue>main-[0-9a-f]{7}-\\d{8}-\\d{6})(?:@(?<currentDigest>sha256:[a-f0-9]+))?',
+        'TOOLS_IMAGE_TAG\\s*\\?=\\s*(?<currentValue>main-[0-9a-f]{7}-\\d{8}-\\d{6})',
+      ],
+      depNameTemplate: 'grafana/tempo-ci-tools',
+      datasourceTemplate: 'docker',
+    },
+  ],
   packageRules: [
     {
       description: 'Disable all non-vulnerability updates for releases',
@@ -100,5 +113,17 @@
       ],
       groupName: 'docker',
     },
+    {
+      description: 'Use regex versioning for tempo-ci-tools (branch-sha-datetime tags)',
+      matchManagers: [
+        'custom.regex',
+      ],
+      matchPackageNames: [
+        'grafana/tempo-ci-tools',
+      ],
+      groupName: 'tempo-ci-tools',
+      versioning: 'regex:^main-[0-9a-f]{7}-(?<major>\\d{8})-(?<patch>\\d{6})$',
+      minimumReleaseAge: '0 days',
+    },
   ],
 }
diff --git a/.github/workflows/docker-ci-tools.yml b/.github/workflows/docker-ci-tools.yml
index b104efbd5c5..8586f58765a 100644
--- a/.github/workflows/docker-ci-tools.yml
+++ b/.github/workflows/docker-ci-tools.yml
@@ -29,7 +29,7 @@ jobs:
 
       - id: get-tag
         run: |
-          echo "tag=$(./tools/image-tag)" >> "$GITHUB_OUTPUT"
+          echo "tag=$(./tools/image-tag)-$(date +%Y%m%d-%H%M%S)" >> "$GITHUB_OUTPUT"
 
   docker-ci-tools:
     if: github.repository == 'grafana/tempo'
@@ -85,5 +85,5 @@ jobs:
           docker manifest create \
           	$IMAGE_NAME:latest            \
           	--amend $IMAGE_NAME:$TAG-amd64   \
-          	--amend $IMAGE_NAME:$TAG-arm64 
+          	--amend $IMAGE_NAME:$TAG-arm64
           docker manifest push $IMAGE_NAME:latest