diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/azure.test.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/azure.test.ts
index 4d19069b5e..39efd1c62a 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/azure.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/azure.test.ts
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-const mocks = {
-  Clone: { clone: jest.fn() },
-  CheckoutOptions: jest.fn(() => {}),
-};
-jest.doMock('nodegit', () => mocks);
 jest.doMock('fs-extra', () => ({
   promises: {
     mkdtemp: jest.fn(dir => `${dir}-static`),
@@ -30,10 +25,16 @@ import {
   TemplateEntityV1alpha1,
   LOCATION_ANNOTATION,
 } from '@backstage/catalog-model';
-import { getVoidLogger } from '@backstage/backend-common';
+import { getVoidLogger, Git } from '@backstage/backend-common';
 import { ConfigReader } from '@backstage/config';
 
 describe('AzurePreparer', () => {
+  const mockGitClient = {
+    clone: jest.fn(),
+  };
+
+  jest.spyOn(Git, 'fromAuth').mockReturnValue(mockGitClient as any);
+
   let mockEntity: TemplateEntityV1alpha1;
   beforeEach(() => {
     jest.clearAllMocks();
@@ -77,18 +78,7 @@ describe('AzurePreparer', () => {
     };
   });
 
-  it('calls the clone command with the correct arguments for a repository', async () => {
-    const preparer = new AzurePreparer(new ConfigReader({}));
-    await preparer.prepare(mockEntity, { logger: getVoidLogger() });
-    expect(mocks.Clone.clone).toHaveBeenNthCalledWith(
-      1,
-      'https://dev.azure.com/backstage-org/backstage-project/_git/template-repo',
-      expect.any(String),
-      {},
-    );
-  });
-
-  it('calls the clone command with the correct arguments if an access token is provided for a repository', async () => {
+  it('initializes git client with the correct arguments if an access token is provided for a repository', async () => {
     const preparer = new AzurePreparer(
       new ConfigReader({
         scaffolder: {
@@ -100,36 +90,44 @@ describe('AzurePreparer', () => {
         },
       }),
     );
+    const logger = getVoidLogger();
+    await preparer.prepare(mockEntity, { logger });
+
+    expect(Git.fromAuth).toHaveBeenCalledWith({
+      username: 'notempty',
+      password: 'fake-token',
+      logger,
+    });
+  });
+  it('calls the clone command with the correct arguments for a repository', async () => {
+    const preparer = new AzurePreparer(new ConfigReader({}));
+
     await preparer.prepare(mockEntity, { logger: getVoidLogger() });
-    expect(mocks.Clone.clone).toHaveBeenNthCalledWith(
-      1,
-      'https://dev.azure.com/backstage-org/backstage-project/_git/template-repo',
-      expect.any(String),
-      {
-        fetchOpts: {
-          callbacks: {
-            credentials: expect.anything(),
-          },
-        },
-      },
-    );
+
+    expect(mockGitClient.clone).toHaveBeenCalledWith({
+      url:
+        'https://dev.azure.com/backstage-org/backstage-project/_git/template-repo',
+      dir: expect.any(String),
+    });
   });
 
   it('calls the clone command with the correct arguments for a repository when no path is provided', async () => {
     const preparer = new AzurePreparer(new ConfigReader({}));
     delete mockEntity.spec.path;
+
     await preparer.prepare(mockEntity, { logger: getVoidLogger() });
-    expect(mocks.Clone.clone).toHaveBeenNthCalledWith(
-      1,
-      'https://dev.azure.com/backstage-org/backstage-project/_git/template-repo',
-      expect.any(String),
-      {},
-    );
+
+    expect(mockGitClient.clone).toHaveBeenCalledWith({
+      url:
+        'https://dev.azure.com/backstage-org/backstage-project/_git/template-repo',
+      dir: expect.any(String),
+    });
   });
 
   it('return the temp directory with the path to the folder if it is specified', async () => {
     const preparer = new AzurePreparer(new ConfigReader({}));
     mockEntity.spec.path = './template/test/1/2/3';
+
     const response = await preparer.prepare(mockEntity, {
       logger: getVoidLogger(),
     });
@@ -142,6 +140,7 @@ describe('AzurePreparer', () => {
   it('return the working directory with the path to the folder if it is specified', async () => {
     const preparer = new AzurePreparer(new ConfigReader({}));
     mockEntity.spec.path = './template/test/1/2/3';
+
     const response = await preparer.prepare(mockEntity, {
       logger: getVoidLogger(),
       workingDirectory: '/workDir',