diff --git a/.changeset/silver-needles-drum.md b/.changeset/silver-needles-drum.md
new file mode 100644
index 000000000..cbd418ce0
--- /dev/null
+++ b/.changeset/silver-needles-drum.md
@@ -0,0 +1,9 @@
+---
+'@verdaccio/core': patch
+'@verdaccio/hooks': patch
+'@verdaccio/proxy': patch
+'@verdaccio/store': patch
+'@verdaccio/web': patch
+---
+
+refactor: got instead undici
diff --git a/.changeset/silver-spoons-nail.md b/.changeset/silver-spoons-nail.md
new file mode 100644
index 000000000..95ca6a6a4
--- /dev/null
+++ b/.changeset/silver-spoons-nail.md
@@ -0,0 +1,6 @@
+---
+'@verdaccio/proxy': minor
+'@verdaccio/store': minor
+---
+
+feat: refactor proxy with got v12
diff --git a/packages/core/core/src/error-utils.ts b/packages/core/core/src/error-utils.ts
index 2f2263adf..fe28ea54e 100644
--- a/packages/core/core/src/error-utils.ts
+++ b/packages/core/core/src/error-utils.ts
@@ -29,6 +29,7 @@ export const API_ERROR = {
   REGISTRATION_DISABLED: 'user registration disabled',
   UNAUTHORIZED_ACCESS: 'unauthorized access',
   BAD_STATUS_CODE: 'bad status code',
+  SERVER_TIME_OUT: 'looks like the server is taking to long to respond',
   PACKAGE_EXIST: 'this package is already present',
   BAD_AUTH_HEADER: 'bad authorization header',
   WEB_DISABLED: 'Web interface is disabled in the config file',
diff --git a/packages/hooks/package.json b/packages/hooks/package.json
index 9d0b23099..1e1e98dcb 100644
--- a/packages/hooks/package.json
+++ b/packages/hooks/package.json
@@ -26,7 +26,7 @@
     "verdaccio"
   ],
   "engines": {
-    "node": ">=16"
+    "node": ">=12"
   },
   "dependencies": {
     "@verdaccio/core": "workspace:6.0.0-6-next.74",
@@ -34,12 +34,13 @@
     "core-js": "3.30.2",
     "debug": "4.3.4",
     "handlebars": "4.7.7",
-    "undici": "4.16.0"
+    "got-cjs": "12.5.4"
   },
   "devDependencies": {
     "@verdaccio/auth": "workspace:6.0.0-6-next.53",
     "@verdaccio/config": "workspace:6.0.0-6-next.74",
-    "@verdaccio/types": "workspace:11.0.0-6-next.25"
+    "@verdaccio/types": "workspace:11.0.0-6-next.25",
+    "nock": "13.2.9"
   },
   "scripts": {
     "clean": "rimraf ./build",
diff --git a/packages/hooks/src/notify-request.ts b/packages/hooks/src/notify-request.ts
index aadfcc238..f4130680d 100644
--- a/packages/hooks/src/notify-request.ts
+++ b/packages/hooks/src/notify-request.ts
@@ -1,5 +1,5 @@
 import buildDebug from 'debug';
-import { fetch } from 'undici';
+import got from 'got-cjs';
 
 import { HTTP_STATUS } from '@verdaccio/core';
 import { logger } from '@verdaccio/logger';
@@ -16,7 +16,7 @@ export async function notifyRequest(url: string, options: FetchOptions): Promise
   let response;
   try {
     debug('uri %o', url);
-    response = await fetch(url, {
+    response = got.post(url, {
       body: JSON.stringify(options.body),
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
diff --git a/packages/hooks/test/notify-request.spec.ts b/packages/hooks/test/notify-request.spec.ts
index 111940472..8231ef19b 100644
--- a/packages/hooks/test/notify-request.spec.ts
+++ b/packages/hooks/test/notify-request.spec.ts
@@ -1,4 +1,4 @@
-import { MockAgent, setGlobalDispatcher } from 'undici';
+import nock from 'nock';
 
 import { createRemoteUser, parseConfigFile } from '@verdaccio/config';
 import { setup } from '@verdaccio/logger';
@@ -21,26 +21,21 @@ const domain = 'http://slack-service';
 
 const options = {
   path: '/foo?auth_token=mySecretToken',
-  method: 'POST',
 };
 
 describe('Notifications:: notifyRequest', () => {
+  beforeEach(() => {
+    nock.cleanAll();
+  });
   test('when sending a empty notification', async () => {
-    const mockAgent = new MockAgent({ connections: 1 });
-    setGlobalDispatcher(mockAgent);
-    const mockClient = mockAgent.get(domain);
-    mockClient.intercept(options).reply(200, { body: 'test' });
+    nock(domain).post(options.path).reply(200, { body: 'test' });
 
     const notificationResponse = await notify({}, {}, createRemoteUser('foo', []), 'bar');
     expect(notificationResponse).toEqual([false]);
   });
 
   test('when sending a single notification', async () => {
-    const mockAgent = new MockAgent({ connections: 1 });
-    setGlobalDispatcher(mockAgent);
-    const mockClient = mockAgent.get(domain);
-    mockClient.intercept(options).reply(200, { body: 'test' });
-
+    nock(domain).post(options.path).reply(200, { body: 'test' });
     const notificationResponse = await notify(
       {},
       singleHeaderNotificationConfig,
@@ -48,14 +43,10 @@ describe('Notifications:: notifyRequest', () => {
       'bar'
     );
     expect(notificationResponse).toEqual([true]);
-    await mockClient.close();
   });
 
   test('when notification endpoint is missing', async () => {
-    const mockAgent = new MockAgent({ connections: 1 });
-    setGlobalDispatcher(mockAgent);
-    const mockClient = mockAgent.get(domain);
-    mockClient.intercept(options).reply(200, { body: 'test' });
+    nock(domain).post(options.path).reply(200, { body: 'test' });
     const name = 'package';
     const config: Partial<Config> = {
       // @ts-ignore
@@ -70,16 +61,22 @@ describe('Notifications:: notifyRequest', () => {
   });
 
   test('when multiple notifications', async () => {
-    const mockAgent = new MockAgent({ connections: 1 });
-    setGlobalDispatcher(mockAgent);
-    const mockClient = mockAgent.get(domain);
-    mockClient.intercept(options).reply(200, { body: 'test' });
-    mockClient.intercept(options).reply(400, {});
-    mockClient.intercept(options).reply(500, { message: 'Something bad happened' });
+    nock(domain)
+      .post(options.path)
+      .once()
+      .reply(200, { body: 'test' })
+      .post(options.path)
+      .once()
+      .reply(400, {})
+      .post(options.path)
+      .once()
+      .reply(500, { message: 'Something bad happened' });
+    // mockClient.intercept(options).reply(200, { body: 'test' });
+    // mockClient.intercept(options).reply(400, {});
+    // mockClient.intercept(options).reply(500, { message: 'Something bad happened' });
 
     const name = 'package';
     const responses = await notify({ name }, multiNotificationConfig, { name: 'foo' }, 'bar');
     expect(responses).toEqual([true, false, false]);
-    await mockClient.close();
   });
 });
diff --git a/packages/proxy/package.json b/packages/proxy/package.json
index 1ae95a226..bb2cf6fab 100644
--- a/packages/proxy/package.json
+++ b/packages/proxy/package.json
@@ -26,8 +26,7 @@
     "verdaccio"
   ],
   "engines": {
-    "node": ">=16",
-    "npm": ">=6"
+    "node": ">=12"
   },
   "scripts": {
     "clean": "rimraf ./build",
@@ -41,22 +40,20 @@
   "dependencies": {
     "@verdaccio/config": "workspace:6.0.0-6-next.74",
     "@verdaccio/core": "workspace:6.0.0-6-next.74",
-    "@verdaccio/local-storage": "workspace:11.0.0-6-next.44",
-    "@verdaccio/logger": "workspace:6.0.0-6-next.42",
     "@verdaccio/utils": "workspace:6.0.0-6-next.42",
     "JSONStream": "1.3.5",
     "debug": "4.3.4",
-    "lodash": "4.17.21",
-    "got": "11.8.6",
+    "got-cjs": "12.5.4",
     "hpagent": "1.2.0",
-    "undici": "4.16.0"
+    "lodash": "4.17.21"
   },
   "devDependencies": {
-    "p-cancelable": "2.1.1",
     "@verdaccio/types": "workspace:11.0.0-6-next.25",
+    "@verdaccio/logger": "workspace:6.0.0-6-next.42",
     "get-stream": "^6.0.1",
     "nock": "13.2.9",
     "node-mocks-http": "1.12.1",
+    "p-cancelable": "2.1.1",
     "semver": "7.5.4"
   },
   "funding": {
diff --git a/packages/proxy/src/agent.ts b/packages/proxy/src/agent.ts
index dd919e27b..0fa2a300d 100644
--- a/packages/proxy/src/agent.ts
+++ b/packages/proxy/src/agent.ts
@@ -1,4 +1,4 @@
-import { Agents } from 'got';
+import { Agents } from 'got-cjs';
 import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent';
 import { Agent as HttpAgent, AgentOptions as HttpAgentOptions } from 'http';
 import { Agent as HttpsAgent, AgentOptions as HttpsAgentOptions } from 'https';
diff --git a/packages/proxy/src/proxy.ts b/packages/proxy/src/proxy.ts
index 912141959..5199ae4c4 100644
--- a/packages/proxy/src/proxy.ts
+++ b/packages/proxy/src/proxy.ts
@@ -1,10 +1,15 @@
 import JSONStream from 'JSONStream';
 import buildDebug from 'debug';
-import got, { RequiredRetryOptions, Headers as gotHeaders } from 'got';
-import type { Agents, Options } from 'got';
+import got, {
+  Agents,
+  Delays,
+  Options,
+  RequestError,
+  RetryOptions,
+  Headers as gotHeaders,
+} from 'got-cjs';
 import _ from 'lodash';
 import Stream, { PassThrough, Readable } from 'stream';
-import { Headers, fetch as undiciFetch } from 'undici';
 import { URL } from 'url';
 
 import {
@@ -24,8 +29,6 @@ import { buildToken } from '@verdaccio/utils';
 import CustomAgents, { AgentOptionsConf } from './agent';
 import { parseInterval } from './proxy-utils';
 
-const LoggerApi = require('@verdaccio/logger');
-
 const debug = buildDebug('verdaccio:proxy');
 
 const encode = function (thing): string {
@@ -51,10 +54,11 @@ export interface ProxyList {
 }
 
 export type ProxySearchParams = {
-  headers?: Headers;
   url: string;
-  query?: searchUtils.SearchQuery;
   abort: AbortController;
+  query?: searchUtils.SearchQuery;
+  headers?: Headers;
+  retry?: Partial<RetryOptions>;
 };
 export interface IProxy {
   config: UpLinkConfLocal;
@@ -65,15 +69,18 @@ export interface IProxy {
   server_id: string;
   url: URL;
   maxage: number;
-  timeout: number;
+  timeout: Delays;
   max_fails: number;
   fail_timeout: number;
   upname: string;
   search(options: ProxySearchParams): Promise<Stream.Readable>;
-  getRemoteMetadata(name: string, options: ISyncUplinksOptions): Promise<[Manifest, string]>;
+  getRemoteMetadata(
+    name: string,
+    options: Partial<ISyncUplinksOptions>
+  ): Promise<[Manifest, string]>;
   fetchTarball(
     url: string,
-    options: Pick<ISyncUplinksOptions, 'remoteAddress' | 'etag' | 'retry'>
+    options: Partial<Pick<ISyncUplinksOptions, 'remoteAddress' | 'etag' | 'retry'>>
   ): PassThrough;
 }
 
@@ -99,7 +106,7 @@ class ProxyStorage implements IProxy {
   public server_id: string;
   public url: URL;
   public maxage: number;
-  public timeout: number;
+  public timeout: Delays;
   public max_fails: number;
   public fail_timeout: number;
   public agent_options: AgentOptionsConf;
@@ -111,14 +118,14 @@ class ProxyStorage implements IProxy {
   // @ts-ignore
   public last_request_time: number | null;
   public strict_ssl: boolean;
-  private retry: Partial<RequiredRetryOptions> | number;
+  private retry: Partial<RetryOptions>;
 
-  public constructor(config: UpLinkConfLocal, mainConfig: Config, agent?: Agents) {
+  public constructor(config: UpLinkConfLocal, mainConfig: Config, logger: Logger, agent?: Agents) {
     this.config = config;
     this.failed_requests = 0;
     this.userAgent = mainConfig.user_agent ?? 'hidden';
     this.ca = config.ca;
-    this.logger = LoggerApi.logger.child({ sub: 'out' });
+    this.logger = logger;
     this.server_id = mainConfig.server_id;
     this.agent_options = setConfig(this.config, 'agent_options', {
       keepAlive: true,
@@ -145,7 +152,10 @@ class ProxyStorage implements IProxy {
     // a bunch of different configurable timers
     this.maxage = parseInterval(setConfig(this.config, 'maxage', '2m'));
     // https://github.com/sindresorhus/got/blob/main/documentation/6-timeout.md
-    this.timeout = parseInterval(setConfig(this.config, 'timeout', '30s'));
+    this.timeout = {
+      request: parseInterval(setConfig(this.config, 'timeout', '30s')),
+    };
+    debug('set timeout %s', this.timeout);
     this.max_fails = Number(setConfig(this.config, 'max_fails', this.config.max_fails ?? 2));
     this.fail_timeout = parseInterval(setConfig(this.config, 'fail_timeout', '5m'));
     this.strict_ssl = Boolean(setConfig(this.config, 'strict_ssl', true));
@@ -162,7 +172,7 @@ class ProxyStorage implements IProxy {
     }
   }
 
-  public getHeadersNext(headers = {}): gotHeaders {
+  public getHeaders(headers = {}): gotHeaders {
     const accept = HEADERS.ACCEPT;
     const acceptEncoding = HEADERS.ACCEPT_ENCODING;
     const userAgent = HEADERS.USER_AGENT;
@@ -296,15 +306,15 @@ class ProxyStorage implements IProxy {
 
   public async getRemoteMetadata(
     name: string,
-    options: ISyncUplinksOptions
+    options: Partial<ISyncUplinksOptions>
   ): Promise<[Manifest, string]> {
     if (this._ifRequestFailure()) {
       throw errorUtils.getInternalError(API_ERROR.UPLINK_OFFLINE);
     }
 
     // FUTURE: allow mix headers that comes from the client
-    debug('get metadata for %s', name);
-    let headers = this.getHeadersNext(options?.headers);
+    debug('getting metadata for package %s', name);
+    let headers = this.getHeaders(options?.headers);
     headers = this.addProxyHeaders(headers, options.remoteAddress);
     headers = this.applyUplinkHeaders(headers);
     // the following headers cannot be overwritten
@@ -314,25 +324,24 @@ class ProxyStorage implements IProxy {
     }
     const method = options.method || 'GET';
     const uri = this.config.url + `/${encode(name)}`;
-    debug('request uri for %s retry %s', uri);
+    debug('set retry limit is %s', this.retry.limit);
     let response;
     let responseLength = 0;
     try {
       const retry = options?.retry ?? this.retry;
-      debug('retry times %s for %s', retry, uri);
+      debug('retry initial count %s', retry);
       response = await got(uri, {
         headers,
         responseType: 'json',
         method,
         agent: this.agent,
         retry,
-        // @ts-ignore
-        timeout: { request: options?.timeout ?? this.timeout },
+        timeout: this.timeout,
         hooks: {
           afterResponse: [
             (afterResponse) => {
               const code = afterResponse.statusCode;
-              debug('code response %s', code);
+              debug('after response code is %s', code);
               if (code >= HTTP_STATUS.OK && code < HTTP_STATUS.MULTIPLE_CHOICES) {
                 if (this.failed_requests >= this.max_fails) {
                   this.failed_requests = 0;
@@ -349,8 +358,8 @@ class ProxyStorage implements IProxy {
             },
           ],
           beforeRetry: [
-            // FUTURE: got 12.0.0, the option arg should be removed
-            (_options, error: any, count) => {
+            (error: RequestError, count: number) => {
+              debug('retry %s count: %s', uri, count);
               this.failed_requests = count ?? 0;
               this.logger.info(
                 {
@@ -378,7 +387,7 @@ class ProxyStorage implements IProxy {
         .on('request', () => {
           this.last_request_time = Date.now();
         })
-        .on('response', (eventResponse) => {
+        .on<any>('response', (eventResponse) => {
           const message = "@{!status}, req: '@{request.method} @{request.url}' (streaming)";
           this.logger.http(
             {
@@ -422,9 +431,10 @@ class ProxyStorage implements IProxy {
       );
       return [data, etag];
     } catch (err: any) {
-      debug('uri %s fail', uri);
+      debug('error %s on uri %s', err.code, uri);
       if (err.code === 'ERR_NON_2XX_3XX_RESPONSE') {
         const code = err.response.statusCode;
+        debug('error code %s', code);
         if (code === HTTP_STATUS.NOT_FOUND) {
           throw errorUtils.getNotFound(errorUtils.API_ERROR.NOT_PACKAGE_UPLINK);
         }
@@ -437,6 +447,15 @@ class ProxyStorage implements IProxy {
           error.remoteStatus = code;
           throw error;
         }
+      } else if (err.code === 'ETIMEDOUT') {
+        debug('error code timeout');
+        const code = err.code;
+        const error = errorUtils.getInternalError(
+          `${errorUtils.API_ERROR.SERVER_TIME_OUT}: ${code}`
+        );
+        // we need this code to identify outside which status code triggered the error
+        error.remoteStatus = code;
+        throw error;
       }
       throw err;
     }
@@ -449,7 +468,7 @@ class ProxyStorage implements IProxy {
   ): any {
     debug('fetching url for %s', url);
     const options = { ...this.config, ...overrideOptions };
-    let headers = this.getHeadersNext(options?.headers);
+    let headers = this.getHeaders(options?.headers);
     headers = this.addProxyHeaders(headers, options.remoteAddress);
     headers = this.applyUplinkHeaders(headers);
     // the following headers cannot be overwritten
@@ -482,37 +501,31 @@ class ProxyStorage implements IProxy {
    * @param {*} options request options
    * @return {Stream}
    */
-  public async search({ url, abort }: ProxySearchParams): Promise<Stream.Readable> {
-    debug('search url %o', url);
-
-    let response;
+  public async search({ url, abort, retry }: ProxySearchParams): Promise<Stream.Readable> {
     try {
       const fullURL = new URL(`${this.url}${url}`);
       // FIXME: a better way to remove duplicate slashes?
       const uri = fullURL.href.replace(/([^:]\/)\/+/g, '$1');
       this.logger.http({ uri, uplink: this.upname }, 'search request to uplink @{uplink} - @{uri}');
-      response = await undiciFetch(uri, {
-        method: 'GET',
-        // FUTURE: whitelist domains what we are sending not need it headers, security check
-        // headers: new Headers({
-        //   ...headers,
-        //   connection: 'keep-alive',
-        // }),
-        signal: abort?.signal,
+      debug('searching on %s', uri);
+      const response = got(uri, {
+        signal: abort ? abort.signal : {},
+        agent: this.agent,
+        timeout: this.timeout,
+        retry: retry ?? this.retry,
       });
-      debug('response.status  %o', response.status);
 
-      if (response.status >= HTTP_STATUS.BAD_REQUEST) {
-        throw errorUtils.getInternalError(`bad status code ${response.status} from uplink`);
-      }
-
-      const streamSearch = new PassThrough({ objectMode: true });
       const res = await response.text();
+      const streamSearch = new PassThrough({ objectMode: true });
       const streamResponse = Readable.from(res);
       // objects is one of the properties on the body, it ignores date and total
       streamResponse.pipe(JSONStream.parse('objects')).pipe(streamSearch, { end: true });
       return streamSearch;
     } catch (err: any) {
+      debug('search error %s', err);
+      if (err.response.statusCode === 409) {
+        throw errorUtils.getInternalError(`bad status code ${err.response.statusCode} from uplink`);
+      }
       this.logger.error(
         { errorMessage: err?.message, name: this.upname },
         'proxy uplink @{name} search error: @{errorMessage}'
diff --git a/packages/proxy/test/headers.auth.spec.ts b/packages/proxy/test/headers.auth.spec.ts
index 7bee0230c..7b12c51d1 100644
--- a/packages/proxy/test/headers.auth.spec.ts
+++ b/packages/proxy/test/headers.auth.spec.ts
@@ -1,11 +1,23 @@
 import { DEFAULT_REGISTRY } from '@verdaccio/config';
 import { HEADERS, TOKEN_BASIC, TOKEN_BEARER, constants } from '@verdaccio/core';
-import { setup } from '@verdaccio/logger';
+import { Logger } from '@verdaccio/types';
 import { buildToken } from '@verdaccio/utils';
 
 import { ProxyStorage } from '../src';
 
-setup();
+const mockDebug = jest.fn();
+const mockInfo = jest.fn();
+const mockHttp = jest.fn();
+const mockError = jest.fn();
+const mockWarn = jest.fn();
+
+const logger = {
+  debug: mockDebug,
+  info: mockInfo,
+  http: mockHttp,
+  error: mockError,
+  warn: mockWarn,
+} as unknown as Logger;
 
 function createUplink(config) {
   const defaultConfig = {
@@ -13,12 +25,12 @@ function createUplink(config) {
   };
   const mergeConfig = Object.assign({}, defaultConfig, config);
   // @ts-ignore
-  return new ProxyStorage(mergeConfig, {});
+  return new ProxyStorage(mergeConfig, {}, logger);
 }
 
 function setHeadersNext(config: unknown = {}, headers: any = {}) {
   const uplink = createUplink(config);
-  return uplink.getHeadersNext({ ...headers });
+  return uplink.getHeaders({ ...headers });
 }
 
 describe('setHeadersNext', () => {
diff --git a/packages/proxy/test/noProxy.spec.ts b/packages/proxy/test/noProxy.spec.ts
index cc84880b5..ae4427f37 100644
--- a/packages/proxy/test/noProxy.spec.ts
+++ b/packages/proxy/test/noProxy.spec.ts
@@ -1,11 +1,13 @@
+import { logger, setup } from '@verdaccio/logger';
+
 import { ProxyStorage } from '../src';
 
-require('@verdaccio/logger').setup([]);
+setup({});
 
 function getProxyInstance(host, uplinkConf, appConfig) {
   uplinkConf.url = host;
 
-  return new ProxyStorage(uplinkConf, appConfig);
+  return new ProxyStorage(uplinkConf, appConfig, logger);
 }
 
 describe('Use proxy', () => {
diff --git a/packages/proxy/test/proxy.metadata.spec.ts b/packages/proxy/test/proxy.metadata.spec.ts
index c221bfa39..2a373f7b5 100644
--- a/packages/proxy/test/proxy.metadata.spec.ts
+++ b/packages/proxy/test/proxy.metadata.spec.ts
@@ -4,6 +4,7 @@ import { setTimeout } from 'timers/promises';
 
 import { Config, parseConfigFile } from '@verdaccio/config';
 import { API_ERROR, errorUtils } from '@verdaccio/core';
+import { Logger } from '@verdaccio/types';
 
 import { ProxyStorage } from '../src';
 
@@ -15,6 +16,14 @@ const mockHttp = jest.fn();
 const mockError = jest.fn();
 const mockWarn = jest.fn();
 
+const logger = {
+  debug: mockDebug,
+  info: mockInfo,
+  http: mockHttp,
+  error: mockError,
+  warn: mockWarn,
+} as unknown as Logger;
+
 // mock to get the headers fixed value
 jest.mock('crypto', () => {
   return {
@@ -31,22 +40,6 @@ jest.mock('crypto', () => {
   };
 });
 
-jest.mock('@verdaccio/logger', () => {
-  const originalLogger = jest.requireActual('@verdaccio/logger');
-  return {
-    ...originalLogger,
-    logger: {
-      child: () => ({
-        debug: (arg, msg) => mockDebug(arg, msg),
-        info: (arg, msg) => mockInfo(arg, msg),
-        http: (arg, msg) => mockHttp(arg, msg),
-        error: (arg, msg) => mockError(arg, msg),
-        warn: (arg, msg) => mockWarn(arg, msg),
-      }),
-    },
-  };
-});
-
 const domain = 'https://registry.npmjs.org';
 
 describe('proxy', () => {
@@ -77,7 +70,7 @@ describe('proxy', () => {
         })
           .get('/jquery')
           .reply(200, { body: 'test' });
-        const prox1 = new ProxyStorage(defaultRequestOptions, conf);
+        const prox1 = new ProxyStorage(defaultRequestOptions, conf, logger);
         const [manifest] = await prox1.getRemoteMetadata('jquery', {
           remoteAddress: '127.0.0.1',
         });
@@ -103,7 +96,7 @@ describe('proxy', () => {
               etag: () => `_ref_4444`,
             }
           );
-        const prox1 = new ProxyStorage(defaultRequestOptions, conf);
+        const prox1 = new ProxyStorage(defaultRequestOptions, conf, logger);
         const [manifest, etag] = await prox1.getRemoteMetadata('jquery', {
           remoteAddress: '127.0.0.1',
         });
@@ -130,7 +123,7 @@ describe('proxy', () => {
               etag: () => `_ref_4444`,
             }
           );
-        const prox1 = new ProxyStorage(defaultRequestOptions, conf);
+        const prox1 = new ProxyStorage(defaultRequestOptions, conf, logger);
         const [manifest, etag] = await prox1.getRemoteMetadata('jquery', {
           etag: 'foo',
           remoteAddress: '127.0.0.1',
@@ -145,7 +138,7 @@ describe('proxy', () => {
         nock(domain)
           .get('/jquery')
           .reply(200, { body: { name: 'foo', version: '1.0.0' } }, {});
-        const prox1 = new ProxyStorage(defaultRequestOptions, conf);
+        const prox1 = new ProxyStorage(defaultRequestOptions, conf, logger);
         await prox1.getRemoteMetadata('jquery', {
           remoteAddress: '127.0.0.1',
         });
@@ -174,7 +167,7 @@ describe('proxy', () => {
     describe('error handling', () => {
       test('proxy call with 304', async () => {
         nock(domain).get('/jquery').reply(304);
-        const prox1 = new ProxyStorage(defaultRequestOptions, conf);
+        const prox1 = new ProxyStorage(defaultRequestOptions, conf, logger);
         await expect(prox1.getRemoteMetadata('jquery', { etag: 'rev_3333' })).rejects.toThrow(
           'no data'
         );
@@ -182,7 +175,7 @@ describe('proxy', () => {
 
       test('reply with error', async () => {
         nock(domain).get('/jquery').replyWithError('something awful happened');
-        const prox1 = new ProxyStorage(defaultRequestOptions, conf);
+        const prox1 = new ProxyStorage(defaultRequestOptions, conf, logger);
         await expect(
           prox1.getRemoteMetadata('jquery', {
             remoteAddress: '127.0.0.1',
@@ -192,15 +185,15 @@ describe('proxy', () => {
 
       test('reply with 409 error', async () => {
         nock(domain).get('/jquery').reply(409);
-        const prox1 = new ProxyStorage(defaultRequestOptions, conf);
-        await expect(prox1.getRemoteMetadata('jquery', { retry: 0 })).rejects.toThrow(
+        const prox1 = new ProxyStorage(defaultRequestOptions, conf, logger);
+        await expect(prox1.getRemoteMetadata('jquery', { retry: { limit: 0 } })).rejects.toThrow(
           new Error('bad status code: 409')
         );
       });
 
       test('reply with bad body json format', async () => {
         nock(domain).get('/jquery').reply(200, 'some-text');
-        const prox1 = new ProxyStorage(defaultRequestOptions, conf);
+        const prox1 = new ProxyStorage(defaultRequestOptions, conf, logger);
         await expect(
           prox1.getRemoteMetadata('jquery', {
             remoteAddress: '127.0.0.1',
@@ -214,7 +207,7 @@ describe('proxy', () => {
 
       test('400 error proxy call', async () => {
         nock(domain).get('/jquery').reply(409);
-        const prox1 = new ProxyStorage(defaultRequestOptions, conf);
+        const prox1 = new ProxyStorage(defaultRequestOptions, conf, logger);
         await expect(
           prox1.getRemoteMetadata('jquery', {
             remoteAddress: '127.0.0.1',
@@ -226,7 +219,7 @@ describe('proxy', () => {
 
       test('proxy  not found', async () => {
         nock(domain).get('/jquery').reply(404);
-        const prox1 = new ProxyStorage(defaultRequestOptions, conf);
+        const prox1 = new ProxyStorage(defaultRequestOptions, conf, logger);
         await expect(
           prox1.getRemoteMetadata('jquery', {
             remoteAddress: '127.0.0.1',
@@ -253,7 +246,7 @@ describe('proxy', () => {
           .once()
           .reply(200, { body: { name: 'foo', version: '1.0.0' } });
 
-        const prox1 = new ProxyStorage(defaultRequestOptions, conf);
+        const prox1 = new ProxyStorage(defaultRequestOptions, conf, logger);
         const [manifest] = await prox1.getRemoteMetadata('jquery', {
           retry: { limit: 2 },
         });
@@ -269,10 +262,10 @@ describe('proxy', () => {
         );
       });
 
-      test('retry is exceded and uplink goes offline with logging activity', async () => {
+      test('retry count is exceded and uplink goes offline with logging activity', async () => {
         nock(domain).get('/jquery').times(10).reply(500);
 
-        const prox1 = new ProxyStorage(defaultRequestOptions, conf);
+        const prox1 = new ProxyStorage(defaultRequestOptions, conf, logger);
         await expect(
           prox1.getRemoteMetadata('jquery', {
             remoteAddress: '127.0.0.1',
@@ -307,7 +300,8 @@ describe('proxy', () => {
 
         const prox1 = new ProxyStorage(
           { ...defaultRequestOptions, fail_timeout: '1s', max_fails: 1 },
-          conf
+          conf,
+          logger
         );
         // force retry
         await expect(
@@ -350,5 +344,127 @@ describe('proxy', () => {
         );
       }, 10000);
     });
+
+    describe('timeout', () => {
+      test('fail for timeout (2 seconds)', async () => {
+        nock(domain)
+          .get('/jquery')
+          .times(10)
+          .delayConnection(6000)
+          .reply(200, { body: { name: 'foo', version: '1.0.0' } });
+
+        const confTimeout = { ...defaultRequestOptions };
+        // @ts-expect-error
+        confTimeout.timeout = '2s';
+        const prox1 = new ProxyStorage(confTimeout, conf, logger);
+        await expect(
+          prox1.getRemoteMetadata('jquery', {
+            retry: { limit: 0 },
+          })
+        ).rejects.toThrow('ETIMEDOUT');
+      }, 10000);
+
+      test('fail for one failure and timeout (2 seconds)', async () => {
+        nock(domain)
+          .get('/jquery')
+          .times(1)
+          .reply(500)
+          .get('/jquery')
+          .delayConnection(4000)
+          .reply(200, { body: { name: 'foo', version: '1.0.0' } });
+
+        const confTimeout = { ...defaultRequestOptions };
+        // @ts-expect-error
+        confTimeout.timeout = '2s';
+        const prox1 = new ProxyStorage(confTimeout, conf, logger);
+        await expect(
+          prox1.getRemoteMetadata('jquery', {
+            retry: { limit: 1 },
+          })
+        ).rejects.toThrow('ETIMEDOUT');
+      }, 10000);
+
+      // test('retry count is exceded and uplink goes offline with logging activity', async () => {
+      //   nock(domain).get('/jquery').times(10).reply(500);
+
+      //   const prox1 = new ProxyStorage(defaultRequestOptions, conf, logger);
+      //   await expect(
+      //     prox1.getRemoteMetadata('jquery', {
+      //       remoteAddress: '127.0.0.1',
+      //       retry: { limit: 2 },
+      //     })
+      //   ).rejects.toThrow();
+      //   await expect(
+      //     prox1.getRemoteMetadata('jquery', {
+      //       remoteAddress: '127.0.0.1',
+      //       retry: { limit: 2 },
+      //     })
+      //   ).rejects.toThrow(errorUtils.getInternalError(errorUtils.API_ERROR.UPLINK_OFFLINE));
+      //   expect(mockWarn).toHaveBeenCalledTimes(1);
+      //   expect(mockWarn).toHaveBeenLastCalledWith(
+      //     {
+      //       host: 'registry.npmjs.org',
+      //     },
+      //     'host @{host} is now offline'
+      //   );
+      // });
+
+      // test('fails calls and recover with 200 with log online activity', async () => {
+      //   // This unit test is designed to verify if the uplink goes to offline
+      //   // and recover after the fail_timeout has expired.
+      //   nock(domain)
+      //     .get('/jquery')
+      //     .thrice()
+      //     .reply(500, 'some-text')
+      //     .get('/jquery')
+      //     .once()
+      //     .reply(200, { body: { name: 'foo', version: '1.0.0' } });
+
+      //   const prox1 = new ProxyStorage(
+      //     { ...defaultRequestOptions, fail_timeout: '1s', max_fails: 1 },
+      //     conf,
+      //     logger
+      //   );
+      //   // force retry
+      //   await expect(
+      //     prox1.getRemoteMetadata('jquery', {
+      //       remoteAddress: '127.0.0.1',
+      //       retry: { limit: 2 },
+      //     })
+      //   ).rejects.toThrow();
+      //   // display offline error on exausted retry
+      //   await expect(
+      //     prox1.getRemoteMetadata('jquery', {
+      //       remoteAddress: '127.0.0.1',
+      //       retry: { limit: 2 },
+      //     })
+      //   ).rejects.toThrow(errorUtils.getInternalError(errorUtils.API_ERROR.UPLINK_OFFLINE));
+      //   expect(mockWarn).toHaveBeenCalledTimes(2);
+      //   expect(mockWarn).toHaveBeenLastCalledWith(
+      //     {
+      //       host: 'registry.npmjs.org',
+      //     },
+      //     'host @{host} is now offline'
+      //   );
+      //   expect(mockWarn).toHaveBeenLastCalledWith(
+      //     {
+      //       host: 'registry.npmjs.org',
+      //     },
+      //     'host @{host} is now offline'
+      //   );
+      //   // this is based on max_fails, if change that also change here acordingly
+      //   await setTimeout(3000);
+      //   const [manifest] = await prox1.getRemoteMetadata('jquery', {
+      //     retry: { limit: 2 },
+      //   });
+      //   expect(manifest).toEqual({ body: { name: 'foo', version: '1.0.0' } });
+      //   expect(mockWarn).toHaveBeenLastCalledWith(
+      //     {
+      //       host: 'registry.npmjs.org',
+      //     },
+      //     'host @{host} is now online'
+      //   );
+      // }, 10000);
+    });
   });
 });
diff --git a/packages/proxy/test/proxy.search.spec.ts b/packages/proxy/test/proxy.search.spec.ts
index 9b145c73d..041f06d25 100644
--- a/packages/proxy/test/proxy.search.spec.ts
+++ b/packages/proxy/test/proxy.search.spec.ts
@@ -2,37 +2,30 @@
 
 /* global AbortController */
 import getStream from 'get-stream';
+import nock from 'nock';
 import path from 'path';
-import { MockAgent, setGlobalDispatcher } from 'undici';
 
 import { Config, parseConfigFile } from '@verdaccio/config';
 import { streamUtils } from '@verdaccio/core';
+import { Logger } from '@verdaccio/types';
 
 import { ProxyStorage } from '../src';
 
 const getConf = (name) => path.join(__dirname, '/conf', name);
 
-// TODO: we can mock this globally maybe
 const mockDebug = jest.fn();
 const mockInfo = jest.fn();
 const mockHttp = jest.fn();
 const mockError = jest.fn();
 const mockWarn = jest.fn();
-jest.mock('@verdaccio/logger', () => {
-  const originalLogger = jest.requireActual('@verdaccio/logger');
-  return {
-    ...originalLogger,
-    logger: {
-      child: () => ({
-        debug: (arg) => mockDebug(arg),
-        info: (arg) => mockInfo(arg),
-        http: (arg) => mockHttp(arg),
-        error: (arg) => mockError(arg),
-        warn: (arg) => mockWarn(arg),
-      }),
-    },
-  };
-});
+
+const logger = {
+  debug: mockDebug,
+  info: mockInfo,
+  http: mockHttp,
+  error: mockError,
+  warn: mockWarn,
+} as unknown as Logger;
 
 const domain = 'https://registry.npmjs.org';
 
@@ -44,20 +37,13 @@ describe('proxy', () => {
   const proxyPath = getConf('proxy1.yaml');
   const conf = new Config(parseConfigFile(proxyPath));
 
-  const options = {
-    path: '/-/v1/search?maintenance=1&popularity=1&quality=1&size=10&text=verdaccio',
-    method: 'GET',
-  };
-
   describe('search', () => {
     test('get response from endpoint', async () => {
       const response = require('./partials/search-v1.json');
-      const mockAgent = new MockAgent({ connections: 1 });
-      mockAgent.disableNetConnect();
-      setGlobalDispatcher(mockAgent);
-      const mockClient = mockAgent.get(domain);
-      mockClient.intercept(options).reply(200, JSON.stringify(response));
-      const prox1 = new ProxyStorage(defaultRequestOptions, conf);
+      nock(domain)
+        .get('/-/v1/search?maintenance=1&popularity=1&quality=1&size=10&text=verdaccio')
+        .reply(200, response);
+      const prox1 = new ProxyStorage(defaultRequestOptions, conf, logger);
       const abort = new AbortController();
       const stream = await prox1.search({
         abort,
@@ -69,13 +55,11 @@ describe('proxy', () => {
     });
 
     test('handle bad response 409', async () => {
-      const mockAgent = new MockAgent({ connections: 1 });
-      mockAgent.disableNetConnect();
-      setGlobalDispatcher(mockAgent);
-      const mockClient = mockAgent.get(domain);
-      mockClient.intercept(options).reply(409, {});
+      nock(domain)
+        .get('/-/v1/search?maintenance=1&popularity=1&quality=1&size=10&text=verdaccio')
+        .reply(409);
       const abort = new AbortController();
-      const prox1 = new ProxyStorage(defaultRequestOptions, conf);
+      const prox1 = new ProxyStorage(defaultRequestOptions, conf, logger);
       await expect(
         prox1.search({
           abort,
@@ -84,26 +68,26 @@ describe('proxy', () => {
       ).rejects.toThrow('bad status code 409 from uplink');
     });
 
-    test.todo('abort search from endpoint');
+    // test.todo('abort search from endpoint');
 
-    // TODO: we should test the gzip deflate here, but is hard to test
-    // fix me if you can deal with Incorrect Header Check issue
-    test.todo('get file from endpoint with gzip headers');
+    // // TODO: we should test the gzip deflate here, but is hard to test
+    // // fix me if you can deal with Incorrect Header Check issue
+    // test.todo('get file from endpoint with gzip headers');
 
-    test('search endpoint fails', async () => {
-      const mockAgent = new MockAgent({ connections: 1 });
-      mockAgent.disableNetConnect();
-      setGlobalDispatcher(mockAgent);
-      const mockClient = mockAgent.get(domain);
-      mockClient.intercept(options).reply(500, {});
-      const abort = new AbortController();
-      const prox1 = new ProxyStorage(defaultRequestOptions, conf);
-      await expect(
-        prox1.search({
-          abort,
-          url: queryUrl,
-        })
-      ).rejects.toThrow('bad status code 500 from uplink');
-    });
+    // test('search endpoint fails', async () => {
+    //   const mockAgent = new MockAgent({ connections: 1 });
+    //   mockAgent.disableNetConnect();
+    //   setGlobalDispatcher(mockAgent);
+    //   const mockClient = mockAgent.get(domain);
+    //   mockClient.intercept(options).reply(500, {});
+    //   const abort = new AbortController();
+    //   const prox1 = new ProxyStorage(defaultRequestOptions, conf);
+    //   await expect(
+    //     prox1.search({
+    //       abort,
+    //       url: queryUrl,
+    //     })
+    //   ).rejects.toThrow('bad status code 500 from uplink');
+    // });
   });
 });
diff --git a/packages/proxy/test/proxy.tarball.spec.ts b/packages/proxy/test/proxy.tarball.spec.ts
index 61bac8f43..8f73fe240 100644
--- a/packages/proxy/test/proxy.tarball.spec.ts
+++ b/packages/proxy/test/proxy.tarball.spec.ts
@@ -2,7 +2,7 @@ import nock from 'nock';
 import path from 'path';
 
 import { Config, parseConfigFile } from '@verdaccio/config';
-import { setup } from '@verdaccio/logger';
+import { logger, setup } from '@verdaccio/logger';
 
 import { ProxyStorage } from '../src';
 
@@ -44,7 +44,7 @@ describe('tarball proxy', () => {
       nock('https://registry.verdaccio.org')
         .get('/jquery/-/jquery-0.0.1.tgz')
         .replyWithFile(201, path.join(__dirname, 'partials/jquery-0.0.1.tgz'));
-      const prox1 = new ProxyStorage(defaultRequestOptions, conf);
+      const prox1 = new ProxyStorage(defaultRequestOptions, conf, logger);
       const stream = prox1.fetchTarball(
         'https://registry.verdaccio.org/jquery/-/jquery-0.0.1.tgz',
         {}
diff --git a/packages/store/package.json b/packages/store/package.json
index 41b2cf251..648018416 100644
--- a/packages/store/package.json
+++ b/packages/store/package.json
@@ -58,7 +58,6 @@
   "devDependencies": {
     "@verdaccio/types": "workspace:11.0.0-6-next.25",
     "@verdaccio/test-helper": "workspace:2.0.0-6-next.8",
-    "undici": "4.16.0",
     "nock": "13.2.9",
     "node-mocks-http": "1.12.1",
     "mockdate": "3.0.5"
diff --git a/packages/store/src/lib/uplink-util.ts b/packages/store/src/lib/uplink-util.ts
index 4fe49413b..0fdd48b93 100644
--- a/packages/store/src/lib/uplink-util.ts
+++ b/packages/store/src/lib/uplink-util.ts
@@ -1,3 +1,4 @@
+import { logger } from '@verdaccio/logger';
 import { IProxy, ProxyStorage } from '@verdaccio/proxy';
 import { Config, Manifest } from '@verdaccio/types';
 
@@ -14,7 +15,7 @@ export function setupUpLinks(config: Config): ProxyInstanceList {
   for (const uplinkName in config.uplinks) {
     if (Object.prototype.hasOwnProperty.call(config.uplinks, uplinkName)) {
       // instance for each up-link definition
-      const proxy: IProxy = new ProxyStorage(config.uplinks[uplinkName], config);
+      const proxy: IProxy = new ProxyStorage(config.uplinks[uplinkName], config, logger);
       // TODO: review this can be inside ProxyStorage
       proxy.upname = uplinkName;
 
diff --git a/packages/store/src/storage.ts b/packages/store/src/storage.ts
index dc6106862..d8bbfc8a7 100644
--- a/packages/store/src/storage.ts
+++ b/packages/store/src/storage.ts
@@ -226,22 +226,22 @@ class Storage {
     const transformResults = new TransFormResults({ objectMode: true });
     const streamPassThrough = new PassThrough({ objectMode: true });
     const upLinkList = this.getProxyList();
-
+    debug('uplinks found %s', upLinkList.length);
     const searchUplinksStreams = upLinkList.map((uplinkId: string) => {
       const uplink = this.uplinks[uplinkId];
       if (!uplink) {
-        // this should never tecnically happens
+        // this line should never happens
         this.logger.error({ uplinkId }, 'uplink @upLinkId not found');
       }
       return this.consumeSearchStream(uplinkId, uplink, options, streamPassThrough);
     });
 
     try {
-      debug('search uplinks');
-      // we only process those streams end successfully, if all fails
-      // we just include local storage
+      debug('searching on %s uplinks...', searchUplinksStreams?.length);
+      // only process those streams end successfully, if all request fails
+      // just include local storage results (if local fails then return 500)
       await Promise.allSettled([...searchUplinksStreams]);
-      debug('search uplinks done');
+      debug('searching all uplinks done');
     } catch (err: any) {
       this.logger.error({ err: err?.message }, ' error on uplinks search @{err}');
       streamPassThrough.emit('error', err);
@@ -912,7 +912,8 @@ class Storage {
           url: distFile.url,
           cache: true,
         },
-        this.config
+        this.config,
+        logger
       );
     }
     return uplink;
@@ -1619,7 +1620,7 @@ class Storage {
   public async syncUplinksMetadataNext(
     name: string,
     localManifest: Manifest | null,
-    options: ISyncUplinksOptions = {}
+    options: Partial<ISyncUplinksOptions> = {}
   ): Promise<[Manifest | null, any]> {
     let found = localManifest !== null;
     let syncManifest: Manifest | null = null;
@@ -1641,7 +1642,7 @@ class Storage {
     }
 
     const uplinksErrors: any[] = [];
-    // we resolve uplinks async in serie, first come first serve
+    // we resolve uplinks async in series, first come first serve
     for (const uplink of upLinks) {
       try {
         const tempManifest = _.isNil(localManifest)
@@ -1712,7 +1713,7 @@ class Storage {
   private async mergeCacheRemoteMetadata(
     uplink: IProxy,
     cachedManifest: Manifest,
-    options: ISyncUplinksOptions
+    options: Partial<ISyncUplinksOptions>
   ): Promise<Manifest> {
     // we store which uplink is updating the manifest
     const upLinkMeta = cachedManifest._uplinks[uplink.upname];
diff --git a/packages/store/test/fixtures/config/syncDoubleUplinksMetadata.yaml b/packages/store/test/fixtures/config/syncDoubleUplinksMetadata.yaml
index 09b733c41..b4d8b49c2 100644
--- a/packages/store/test/fixtures/config/syncDoubleUplinksMetadata.yaml
+++ b/packages/store/test/fixtures/config/syncDoubleUplinksMetadata.yaml
@@ -1,6 +1,7 @@
 uplinks:
   timeout:
     url: https://registry.domain.com/
+    timeout: 2s
   some:
     url: https://registry.domain.com/
   ver:
diff --git a/packages/store/test/search.spec.ts b/packages/store/test/search.spec.ts
index eb4525ddd..cc1c79321 100644
--- a/packages/store/test/search.spec.ts
+++ b/packages/store/test/search.spec.ts
@@ -1,4 +1,4 @@
-import { setGlobalDispatcher } from 'undici';
+import nock from 'nock';
 
 import { Config, getDefaultConfig } from '@verdaccio/config';
 import { searchUtils } from '@verdaccio/core';
@@ -6,7 +6,7 @@ import { setup } from '@verdaccio/logger';
 
 import { Storage, removeDuplicates } from '../src';
 
-setup([]);
+setup({});
 
 describe('search', () => {
   describe('search manager utils', () => {
@@ -28,26 +28,17 @@ describe('search', () => {
     });
 
     test('search items', async () => {
-      const { MockAgent } = require('undici');
       // FIXME: fetch is already part of undici
       const domain = 'https://registry.npmjs.org';
       const url = '/-/v1/search?maintenance=1&popularity=1&quality=1&size=10&text=verdaccio';
       const response = require('./fixtures/search.json');
-      const options = {
-        path: url,
-        method: 'GET',
-      };
-      const mockAgent = new MockAgent({ connections: 1 });
-      mockAgent.disableNetConnect();
-      setGlobalDispatcher(mockAgent);
-      const mockClient = mockAgent.get(domain);
-      mockClient.intercept(options).reply(200, JSON.stringify(response));
+      nock(domain).get(url).reply(200, response);
       const config = new Config(getDefaultConfig());
       const storage = new Storage(config);
       await storage.init(config);
+      const abort = new AbortController();
 
-      // @ts-expect-error
-      const results = await storage.search({ url, query: { text: 'foo' } });
+      const results = await storage.search({ url, query: { text: 'verdaccio' }, abort });
       expect(results).toHaveLength(4);
     });
   });
diff --git a/packages/store/test/storage.spec.ts b/packages/store/test/storage.spec.ts
index 89fbebdab..27d1a01d3 100644
--- a/packages/store/test/storage.spec.ts
+++ b/packages/store/test/storage.spec.ts
@@ -864,15 +864,21 @@ describe('storage', () => {
         const fooManifest = generatePackageMetadata('timeout', '8.0.0');
 
         nock('https://registry.domain.com')
-          .get('/timeout')
+          .get(`/${fooManifest.name}`)
           .times(10)
-          .delayConnection(2000)
+          .delayConnection(4000)
           .reply(201, manifestFooRemoteNpmjs);
 
         const config = new Config(
           configExample(
             {
               storage: generateRandomStorage(),
+              uplinks: {
+                npmjs: {
+                  url: 'https://registry.npmjs.org',
+                  timeout: '2s',
+                },
+              },
             },
             './fixtures/config/syncDoubleUplinksMetadata.yaml',
             __dirname
@@ -885,15 +891,10 @@ describe('storage', () => {
           storage.syncUplinksMetadataNext(fooManifest.name, null, {
             retry: { limit: 0 },
             timeout: {
-              lookup: 100,
-              connect: 50,
-              secureConnect: 50,
-              socket: 500,
-              // send: 10000,
-              response: 1000,
+              request: 1000,
             },
           })
-        ).rejects.toThrow('ETIMEDOUT');
+        ).rejects.toThrow(API_ERROR.NO_PACKAGE);
       }, 10000);
 
       test('should handle one proxy fails', async () => {
@@ -1468,7 +1469,7 @@ describe('storage', () => {
               host: req.get('host') as string,
             },
           })
-        ).rejects.toThrow(errorUtils.getServiceUnavailable('ETIMEDOUT'));
+        ).rejects.toThrow(errorUtils.getServiceUnavailable(API_ERROR.NO_PACKAGE));
       });
 
       test('should fetch abbreviated version of manifest ', async () => {
diff --git a/packages/web/package.json b/packages/web/package.json
index f9594fd4a..38938a419 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -47,7 +47,6 @@
     "supertest": "6.3.3",
     "nock": "13.2.9",
     "jsdom": "20.0.3",
-    "undici": "4.16.0",
     "verdaccio-auth-memory": "workspace:11.0.0-6-next.39",
     "verdaccio-memory": "workspace:11.0.0-6-next.41"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e9edc60c6..c32898d14 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -773,12 +773,12 @@ importers:
       debug:
         specifier: 4.3.4
         version: 4.3.4(supports-color@6.1.0)
+      got-cjs:
+        specifier: 12.5.4
+        version: 12.5.4
       handlebars:
         specifier: 4.7.7
         version: 4.7.7
-      undici:
-        specifier: 4.16.0
-        version: 4.16.0
     devDependencies:
       '@verdaccio/auth':
         specifier: workspace:6.0.0-6-next.53
@@ -789,6 +789,9 @@ importers:
       '@verdaccio/types':
         specifier: workspace:11.0.0-6-next.25
         version: link:../core/types
+      nock:
+        specifier: 13.2.9
+        version: 13.2.9
 
   packages/loaders:
     dependencies:
@@ -1389,12 +1392,6 @@ importers:
       '@verdaccio/core':
         specifier: workspace:6.0.0-6-next.74
         version: link:../core/core
-      '@verdaccio/local-storage':
-        specifier: workspace:11.0.0-6-next.44
-        version: link:../plugins/local-storage
-      '@verdaccio/logger':
-        specifier: workspace:6.0.0-6-next.42
-        version: link:../logger/logger
       '@verdaccio/utils':
         specifier: workspace:6.0.0-6-next.42
         version: link:../utils
@@ -1404,19 +1401,19 @@ importers:
       debug:
         specifier: 4.3.4
         version: 4.3.4(supports-color@6.1.0)
-      got:
-        specifier: 11.8.5
-        version: 11.8.5
+      got-cjs:
+        specifier: 12.5.4
+        version: 12.5.4
       hpagent:
         specifier: 1.2.0
         version: 1.2.0
       lodash:
         specifier: 4.17.21
         version: 4.17.21
-      undici:
-        specifier: 4.16.0
-        version: 4.16.0
     devDependencies:
+      '@verdaccio/logger':
+        specifier: workspace:6.0.0-6-next.42
+        version: link:../logger/logger
       '@verdaccio/types':
         specifier: workspace:11.0.0-6-next.25
         version: link:../core/types
@@ -1664,9 +1661,6 @@ importers:
       node-mocks-http:
         specifier: 1.12.1
         version: 1.12.1
-      undici:
-        specifier: 4.16.0
-        version: 4.16.0
 
   packages/tools/docusaurus-plugin-contributors:
     dependencies:
@@ -2115,9 +2109,6 @@ importers:
       supertest:
         specifier: 6.3.3
         version: 6.3.3
-      undici:
-        specifier: 4.16.0
-        version: 4.16.0
       verdaccio-auth-memory:
         specifier: workspace:11.0.0-6-next.39
         version: link:../plugins/auth-memory
@@ -13515,6 +13506,11 @@ packages:
     resolution: {integrity: sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==}
     engines: {node: '>=10.6.0'}
 
+  /cacheable-lookup@6.1.0:
+    resolution: {integrity: sha512-KJ/Dmo1lDDhmW2XDPMo+9oiy/CeqosPguPCrgcVzKyZrL6pM1gU2GmPY/xo6OQPTUaA/c0kwHuywB4E6nmT9ww==}
+    engines: {node: '>=10.6.0'}
+    dev: false
+
   /cacheable-request@7.0.2:
     resolution: {integrity: sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==}
     engines: {node: '>=8'}
@@ -17551,6 +17547,10 @@ packages:
       typescript: 4.9.4
       webpack: 5.82.1(webpack-cli@4.10.0)
 
+  /form-data-encoder@1.7.2:
+    resolution: {integrity: sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A==}
+    dev: false
+
   /form-data@2.3.3:
     resolution: {integrity: sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==}
     engines: {node: '>= 0.12'}
@@ -17980,6 +17980,24 @@ packages:
     dependencies:
       get-intrinsic: 1.2.0
 
+  /got-cjs@12.5.4:
+    resolution: {integrity: sha512-Uas6lAsP8bRCt5WXGMhjFf/qEHTrm4v4qxGR02rLG2kdG9qedctvlkdwXVcDJ7Cs84X+r4dPU7vdwGjCaspXug==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@sindresorhus/is': 4.6.0
+      '@szmarczak/http-timer': 4.0.6
+      '@types/responselike': 1.0.0
+      cacheable-lookup: 6.1.0
+      cacheable-request: 7.0.2
+      decompress-response: 6.0.0
+      form-data-encoder: 1.7.2
+      get-stream: 6.0.1
+      http2-wrapper: 2.2.0
+      lowercase-keys: 2.0.0
+      p-cancelable: 2.1.1
+      responselike: 2.0.1
+    dev: false
+
   /got@11.8.5:
     resolution: {integrity: sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==}
     engines: {node: '>=10.19.0'}
@@ -18492,6 +18510,14 @@ packages:
       quick-lru: 5.1.1
       resolve-alpn: 1.2.1
 
+  /http2-wrapper@2.2.0:
+    resolution: {integrity: sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==}
+    engines: {node: '>=10.19.0'}
+    dependencies:
+      quick-lru: 5.1.1
+      resolve-alpn: 1.2.1
+    dev: false
+
   /https-browserify@1.0.0:
     resolution: {integrity: sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==}
     dev: true
@@ -27245,10 +27271,6 @@ packages:
     resolution: {integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==}
     dev: true
 
-  /undici@4.16.0:
-    resolution: {integrity: sha512-tkZSECUYi+/T1i4u+4+lwZmQgLXd4BLGlrc7KZPcLIW7Jpq99+Xpc30ONv7nS6F5UNOxp/HBZSSL9MafUrvJbw==}
-    engines: {node: '>=12.18'}
-
   /unfetch@4.2.0:
     resolution: {integrity: sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==}
     dev: true