diff --git a/lib/modules/datasource/packagist/index.ts b/lib/modules/datasource/packagist/index.ts
index f54129488f650e7226696fd82f07b497cd862fa3..1284745a7efdfaf309309a5b00c6a5dcd3c7a5f9 100644
--- a/lib/modules/datasource/packagist/index.ts
+++ b/lib/modules/datasource/packagist/index.ts
@@ -86,9 +86,9 @@ export class PackagistDatasource extends Datasource {
   }
 
   @cache({
-    namespace: `datasource-${PackagistDatasource.id}-public-files`,
+    namespace: `datasource-${PackagistDatasource.id}`,
     key: (regUrl: string, regFile: RegistryFile) =>
-      PackagistDatasource.getPackagistFileUrl(regUrl, regFile),
+      `getPackagistFile:${PackagistDatasource.getPackagistFileUrl(regUrl, regFile)}`,
     cacheable: (regUrl: string) =>
       !PackagistDatasource.isPrivatePackage(regUrl),
     ttlMinutes: 1440,
@@ -125,9 +125,9 @@ export class PackagistDatasource extends Datasource {
   }
 
   @cache({
-    namespace: `datasource-${PackagistDatasource.id}-org`,
+    namespace: `datasource-${PackagistDatasource.id}`,
     key: (registryUrl: string, metadataUrl: string, packageName: string) =>
-      `${registryUrl}:${metadataUrl}:${packageName}`,
+      `packagistV2Lookup:${registryUrl}:${metadataUrl}:${packageName}`,
     ttlMinutes: 10,
   })
   async packagistV2Lookup(
diff --git a/lib/util/cache/package/types.ts b/lib/util/cache/package/types.ts
index 1ec9ff11b8ce7d52c53e820c6d793f16ad32dd05..41b991b224c3b5005e2561f51ba00995b2766318 100644
--- a/lib/util/cache/package/types.ts
+++ b/lib/util/cache/package/types.ts
@@ -83,8 +83,6 @@ export type PackageCacheNamespace =
   | 'datasource-npm:data'
   | 'datasource-nuget-v3'
   | 'datasource-orb'
-  | 'datasource-packagist-org'
-  | 'datasource-packagist-public-files'
   | 'datasource-packagist'
   | 'datasource-pod'
   | 'datasource-python-version'