diff --git a/lib/util/exec/containerbase.ts b/lib/util/exec/containerbase.ts
index d0966006b5feea3b09806f03b146cf27a24b29da..7c05ad685b2135d2510d63529af94a0ebb892fcf 100644
--- a/lib/util/exec/containerbase.ts
+++ b/lib/util/exec/containerbase.ts
@@ -5,6 +5,8 @@ import { logger } from '../../logger';
 import { getPkgReleases } from '../../modules/datasource';
 import * as allVersioning from '../../modules/versioning';
 import { id as composerVersioningId } from '../../modules/versioning/composer';
+import { id as gradleVersioningId } from '../../modules/versioning/gradle';
+import { id as mavenVersioningId } from '../../modules/versioning/maven';
 import { id as nodeVersioningId } from '../../modules/versioning/node';
 import { id as npmVersioningId } from '../../modules/versioning/npm';
 import { id as pep440VersioningId } from '../../modules/versioning/pep440';
@@ -60,6 +62,16 @@ const allToolConfig: Record<string, ToolConfig> = {
     packageName: 'golang',
     versioning: npmVersioningId,
   },
+  gradle: {
+    datasource: 'gradle-version',
+    packageName: 'gradle',
+    versioning: gradleVersioningId,
+  },
+  hashin: {
+    datasource: 'pypi',
+    packageName: 'hashin',
+    versioning: pep440VersioningId,
+  },
   helm: {
     datasource: 'github-releases',
     packageName: 'helm/helm',
@@ -91,6 +103,11 @@ const allToolConfig: Record<string, ToolConfig> = {
     packageName: 'lerna',
     versioning: npmVersioningId,
   },
+  maven: {
+    datasource: 'maven',
+    packageName: 'org.apache.maven:maven',
+    versioning: mavenVersioningId,
+  },
   nix: {
     datasource: 'github-tags',
     packageName: 'NixOS/nix',
@@ -112,6 +129,16 @@ const allToolConfig: Record<string, ToolConfig> = {
     packageName: 'containerbase/php-prebuild',
     versioning: composerVersioningId,
   },
+  'pip-tools': {
+    datasource: 'pypi',
+    packageName: 'pip-tools',
+    versioning: pep440VersioningId,
+  },
+  pipenv: {
+    datasource: 'pypi',
+    packageName: 'pipenv',
+    versioning: pep440VersioningId,
+  },
   pnpm: {
     datasource: 'npm',
     packageName: 'pnpm',
@@ -219,7 +246,10 @@ export async function resolveConstraint(
         return constraint;
       }
     } else {
-      logger.warn({ toolName, constraint }, 'Invalid tool constraint');
+      logger.warn(
+        { toolName, constraint, versioning: toolConfig.versioning },
+        'Invalid tool constraint'
+      );
       constraint = undefined;
     }
   }