diff --git a/.changeset/red-kiwis-divide.md b/.changeset/red-kiwis-divide.md
new file mode 100644
index 0000000000..0bfb247093
--- /dev/null
+++ b/.changeset/red-kiwis-divide.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': minor
+---
+
+**BREAKING**: Removed the previously deprecated `OctokitProvider` class.
diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index b18e199f40..80a106bf27 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -21,7 +21,6 @@ import { Knex } from 'knex';
 import { LocationSpec } from '@backstage/plugin-catalog-backend';
 import { Logger as Logger_2 } from 'winston';
 import { Observable } from '@backstage/types';
-import { Octokit } from 'octokit';
 import { PluginDatabaseManager } from '@backstage/backend-common';
 import { Schema } from 'jsonschema';
 import { ScmIntegrationRegistry } from '@backstage/integration';
@@ -388,25 +387,6 @@ export function fetchContents({
   outputPath: string;
 }): Promise<void>;
 
-// Warning: (ae-missing-release-tag) "OctokitProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public @deprecated
-export class OctokitProvider {
-  constructor(
-    integrations: ScmIntegrationRegistry,
-    githubCredentialsProvider?: GithubCredentialsProvider,
-  );
-  // Warning: (ae-forgotten-export) The symbol "OctokitIntegration" needs to be exported by the entry point index.d.ts
-  //
-  // @deprecated
-  getOctokit(
-    repoUrl: string,
-    options?: {
-      token?: string;
-    },
-  ): Promise<OctokitIntegration>;
-}
-
 // @public (undocumented)
 export interface OctokitWithPullRequestPluginClient {
   // (undocumented)
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.test.ts
deleted file mode 100644
index e2449917ab..0000000000
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.test.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2021 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { OctokitProvider } from './OctokitProvider';
-import {
-  ScmIntegrations,
-  DefaultGithubCredentialsProvider,
-} from '@backstage/integration';
-import { ConfigReader } from '@backstage/config';
-
-describe('getOctokit', () => {
-  const config = new ConfigReader({
-    integrations: {
-      github: [
-        { host: 'github.com', token: 'tokenlols' },
-        { host: 'ghe.github.com' },
-      ],
-    },
-  });
-
-  const integrations = ScmIntegrations.fromConfig(config);
-  const githubCredentialsProvider =
-    DefaultGithubCredentialsProvider.fromIntegrations(integrations);
-  const octokitProvider = new OctokitProvider(
-    integrations,
-    githubCredentialsProvider,
-  );
-
-  beforeEach(() => {
-    jest.resetAllMocks();
-  });
-
-  it('should throw an error when the repoUrl is not well formed', async () => {
-    await expect(
-      octokitProvider.getOctokit('github.com?repo=bob'),
-    ).rejects.toThrow(/missing owner/);
-
-    await expect(
-      octokitProvider.getOctokit('github.com?owner=owner'),
-    ).rejects.toThrow(/missing repo/);
-  });
-
-  it('should throw if there is no integration config provided', async () => {
-    await expect(
-      octokitProvider.getOctokit('missing.com?repo=bob&owner=owner'),
-    ).rejects.toThrow(/No matching integration configuration/);
-  });
-
-  it('should throw if there is no token in the integration config that is returned', async () => {
-    await expect(
-      octokitProvider.getOctokit('ghe.github.com?repo=bob&owner=owner'),
-    ).rejects.toThrow(/No token available for host/);
-  });
-
-  it('should return proper Octokit', async () => {
-    const { client, token, owner, repo } = await octokitProvider.getOctokit(
-      'github.com?repo=bob&owner=owner',
-    );
-    expect(client).toBeDefined();
-    expect(token).toBe('tokenlols');
-    expect(owner).toBe('owner');
-    expect(repo).toBe('bob');
-  });
-
-  it('should return an octokit client with the passed in token if it is provided', async () => {
-    const { client, token, owner, repo } = await octokitProvider.getOctokit(
-      'github.com?repo=bob&owner=owner',
-      { token: 'tokenlols2' },
-    );
-    expect(client).toBeDefined();
-    expect(token).toBe('tokenlols2');
-    expect(owner).toBe('owner');
-    expect(repo).toBe('bob');
-  });
-});
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.ts
deleted file mode 100644
index 2f3c43a6b8..0000000000
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2021 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { InputError } from '@backstage/errors';
-import {
-  DefaultGithubCredentialsProvider,
-  GithubCredentialsProvider,
-  ScmIntegrationRegistry,
-} from '@backstage/integration';
-import { Octokit } from 'octokit';
-import { parseRepoUrl } from '../publish/util';
-
-export type OctokitIntegration = {
-  client: Octokit;
-  token: string;
-  owner: string;
-  repo: string;
-};
-/**
- * OctokitProvider provides Octokit client based on ScmIntegrationsRegistry configuration.
- * OctokitProvider supports GitHub credentials caching out of the box.
- *
- * @deprecated we are no longer providing a way from the scaffolder to generate octokit instances.
- * Implement your own if you're using this method from an external package, or use the internal `getOctokitOptions` function instead
- */
-export class OctokitProvider {
-  private readonly integrations: ScmIntegrationRegistry;
-  private readonly githubCredentialsProvider: GithubCredentialsProvider;
-
-  constructor(
-    integrations: ScmIntegrationRegistry,
-    githubCredentialsProvider?: GithubCredentialsProvider,
-  ) {
-    this.integrations = integrations;
-    this.githubCredentialsProvider =
-      githubCredentialsProvider ||
-      DefaultGithubCredentialsProvider.fromIntegrations(this.integrations);
-  }
-
-  /**
-   * gets standard Octokit client based on repository URL.
-   *
-   * @param repoUrl - Repository URL
-   *
-   * @deprecated we are no longer providing a way from the scaffolder to generate octokit instances.
-   * Implement your own if you're using this method from an external package, or use the internal `getOctokitOptions` function instead
-   */
-  async getOctokit(
-    repoUrl: string,
-    options?: { token?: string },
-  ): Promise<OctokitIntegration> {
-    const { owner, repo, host } = parseRepoUrl(repoUrl, this.integrations);
-
-    if (!owner) {
-      throw new InputError(`No owner provided for repo ${repoUrl}`);
-    }
-
-    const integrationConfig = this.integrations.github.byHost(host)?.config;
-
-    if (!integrationConfig) {
-      throw new InputError(`No integration for host ${host}`);
-    }
-
-    // Short circuit the internal Github Token provider the token provided
-    // by the action or the caller.
-    if (options?.token) {
-      const client = new Octokit({
-        auth: options.token,
-        baseUrl: integrationConfig.apiBaseUrl,
-        previews: ['nebula-preview'],
-      });
-
-      return { client, token: options.token, owner, repo };
-    }
-
-    // TODO(blam): Consider changing this API to have owner, repoo interface instead of URL as the it's
-    // needless to create URL and then parse again the other side.
-    const { token } = await this.githubCredentialsProvider.getCredentials({
-      url: `https://${host}/${encodeURIComponent(owner)}/${encodeURIComponent(
-        repo,
-      )}`,
-    });
-
-    if (!token) {
-      throw new InputError(
-        `No token available for host: ${host}, with owner ${owner}, and repo ${repo}`,
-      );
-    }
-
-    const client = new Octokit({
-      auth: token,
-      baseUrl: integrationConfig.apiBaseUrl,
-      previews: ['nebula-preview'],
-    });
-
-    return { client, token, owner, repo };
-  }
-}
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts
index 865c433c16..07614e8a03 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts
@@ -16,4 +16,3 @@
 
 export { createGithubActionsDispatchAction } from './githubActionsDispatch';
 export { createGithubWebhookAction } from './githubWebhook';
-export { OctokitProvider } from './OctokitProvider';