diff --git a/packages/backend/src/plugins/scaffolder.ts b/packages/backend/src/plugins/scaffolder.ts
index 70a961819f..fb1d9babef 100644
--- a/packages/backend/src/plugins/scaffolder.ts
+++ b/packages/backend/src/plugins/scaffolder.ts
@@ -37,8 +37,8 @@ export default async function createPlugin({
   templaters.register('cookiecutter', cookiecutterTemplater);
   templaters.register('cra', craTemplater);
 
-  const preparers = await Preparers.fromConfig(config, { logger });
-  const publishers = await Publishers.fromConfig(config);
+  const preparers = await Preparers.fromConfig(config);
+  const publishers = await Publishers.fromConfig(config, { logger });
 
   const dockerClient = new Docker();
 
diff --git a/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
index a0ee16d4ba..590f55c427 100644
--- a/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
+++ b/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
@@ -18,11 +18,12 @@ export default async function createPlugin({
   const cookiecutterTemplater = new CookieCutter();
   const craTemplater = new CreateReactAppTemplater();
   const templaters = new Templaters();
+  
   templaters.register('cookiecutter', cookiecutterTemplater);
   templaters.register('cra', craTemplater);
 
-  const preparers = await Preparers.fromConfig(config, { logger });
-  const publishers = await Publishers.fromConfig(config);
+  const preparers = await Preparers.fromConfig(config);
+  const publishers = await Publishers.fromConfig(config, { logger });
 
   const dockerClient = new Docker();
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/helpers.test.ts b/plugins/scaffolder-backend/src/scaffolder/stages/helpers.test.ts
index d02a0a5ee6..be6d215e5b 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/helpers.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/helpers.test.ts
@@ -13,15 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  makeDeprecatedLocationTypeDetector,
-  parseLocationAnnotation,
-} from './helpers';
+import { parseLocationAnnotation } from './helpers';
 import {
   TemplateEntityV1alpha1,
   LOCATION_ANNOTATION,
 } from '@backstage/catalog-model';
-import { ConfigReader } from '@backstage/config';
 
 describe('Helpers', () => {
   describe('parseLocationAnnotation', () => {
@@ -254,29 +250,4 @@ describe('Helpers', () => {
       });
     });
   });
-
-  describe('makeDeprecatedLocationTypeDetector', () => {
-    it('detects deprecated location types', () => {
-      const detector = makeDeprecatedLocationTypeDetector(
-        new ConfigReader({
-          integrations: {
-            github: [{ host: 'derp.com' }, { host: 'foo.com' }],
-            gitlab: [{ host: 'derp.org' }, { host: 'foo.org' }],
-            azure: [{ host: 'derp.net' }, { host: 'foo.net' }],
-          },
-        }),
-      );
-
-      expect(detector('http://lol:wut@derp.com/wat')).toBe('github');
-      expect(detector('https://foo.com/wat')).toBe('github');
-      expect(detector('http://derp.org:80/wat')).toBe('gitlab');
-      expect(detector('https://foo.org/wat')).toBe('gitlab');
-      expect(detector('http://not.derp.net')).toBe(undefined);
-      expect(detector('http://derp.net')).toBe('azure');
-      expect(detector('http://derp.net:8080/wat')).toBe('azure');
-      expect(detector('http://github.com')).toBe('github');
-      expect(detector('http://gitlab.com')).toBe('gitlab');
-      expect(detector('http://dev.azure.com')).toBe('azure');
-    });
-  });
 });
diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/helpers.ts b/plugins/scaffolder-backend/src/scaffolder/stages/helpers.ts
index c3ef01b359..f8d8229298 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/helpers.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/helpers.ts
@@ -17,12 +17,10 @@ import {
   TemplateEntityV1alpha1,
   LOCATION_ANNOTATION,
 } from '@backstage/catalog-model';
-import { Config } from '@backstage/config';
 import { InputError } from '@backstage/backend-common';
-import { RemoteProtocol } from './types';
 
 export type ParsedLocationAnnotation = {
-  protocol: RemoteProtocol;
+  protocol: 'file' | 'url';
   location: string;
 };
 
@@ -40,7 +38,7 @@ export const parseLocationAnnotation = (
   // split on the first colon for the protocol and the rest after the first split
   // is the location.
   const [protocol, location] = annotation.split(/:(.+)/) as [
-    RemoteProtocol?,
+    ('file' | 'url')?,
     string?,
   ];
 
@@ -55,42 +53,3 @@ export const parseLocationAnnotation = (
     location,
   };
 };
-
-export type DeprecatedLocationTypeDetector = (
-  url: string,
-) => string | undefined;
-
-// The reason for the existence of this is to help in migration to using mostly locations
-// of type 'url'. This allows us to detect the deprecated location type based on the host,
-// which we in turn can use to select out preparer or publisher.
-//
-// TODO(Rugvip): This should be removed in the future once we fully migrate to using
-//               integrations configuration for the scaffolder.
-export function makeDeprecatedLocationTypeDetector(
-  config: Config,
-): DeprecatedLocationTypeDetector {
-  const hostMap = new Map();
-
-  // These are installed by default by the integrations
-  hostMap.set('github.com', 'github');
-  hostMap.set('gitlab.com', 'gitlab');
-  hostMap.set('dev.azure.com', 'azure');
-  hostMap.set('bitbucket.org', 'bitbucket');
-
-  config.getOptionalConfigArray('integrations.github')?.forEach(sub => {
-    hostMap.set(sub.getString('host'), 'github');
-  });
-  config.getOptionalConfigArray('integrations.gitlab')?.forEach(sub => {
-    hostMap.set(sub.getString('host'), 'gitlab');
-  });
-  config.getOptionalConfigArray('integrations.azure')?.forEach(sub => {
-    hostMap.set(sub.getString('host'), 'azure');
-  });
-  config.getOptionalConfigArray('integrations.bitbucket')?.forEach(sub => {
-    hostMap.set(sub.getString('host'), 'bitbucket');
-  });
-  return (url: string): string | undefined => {
-    const parsed = new URL(url);
-    return hostMap.get(parsed.hostname);
-  };
-}
diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/gitlab.test.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/gitlab.test.ts
index b2f1ac7fd9..a223f72bd5 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/gitlab.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/gitlab.test.ts
@@ -24,7 +24,6 @@ import {
   TemplateEntityV1alpha1,
   LOCATION_ANNOTATION,
 } from '@backstage/catalog-model';
-import { ConfigReader } from '@backstage/config';
 import { getVoidLogger, Git } from '@backstage/backend-common';
 
 const mockTemplate = (): TemplateEntityV1alpha1 => ({
diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/preparers.test.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/preparers.test.ts
index 7023f292f3..8dd85690cb 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/preparers.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/preparers.test.ts
@@ -14,20 +14,15 @@
  * limitations under the License.
  */
 import { Preparers } from '.';
-import { TemplateEntityV1alpha1 } from '@backstage/catalog-model';
-import { FilePreparer } from './file';
 import { GithubPreparer } from './github';
-import { ConfigReader } from '@backstage/config';
 
 describe('Preparers', () => {
   it('should return the correct preparer based on the hostname', async () => {
-    const preparer = new GithubPreparer(
-      new ConfigReader({
-        host: 'github.com',
-        apiBaseUrl: 'lols',
-        token: 'something else yo',
-      }),
-    );
+    const preparer = await GithubPreparer.fromConfig({
+      host: 'github.com',
+      apiBaseUrl: 'lols',
+      token: 'something else yo',
+    });
 
     const preparers = new Preparers();
     preparers.register('github.com', preparer);
@@ -38,13 +33,11 @@ describe('Preparers', () => {
   });
 
   it('should throw an error if there is nothing that will match the url provided', async () => {
-    const preparer = new GithubPreparer(
-      new ConfigReader({
-        host: 'github.com',
-        apiBaseUrl: 'lols',
-        token: 'something else yo',
-      }),
-    );
+    const preparer = await GithubPreparer.fromConfig({
+      host: 'github.com',
+      apiBaseUrl: 'lols',
+      token: 'something else yo',
+    });
 
     const preparers = new Preparers();
     preparers.register('github.com', preparer);
diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/types.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/types.ts
index 8ee78eab3c..17ffea5557 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/types.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/types.ts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import type { TemplateEntityV1alpha1 } from '@backstage/catalog-model';
-import { RemoteProtocol } from '../types';
 import { Logger } from 'winston';
 
 export type PreparerOptions = {
diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/publish/github.test.ts b/plugins/scaffolder-backend/src/scaffolder/stages/publish/github.test.ts
index 29e095a152..9a788b960d 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/publish/github.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/publish/github.test.ts
@@ -18,7 +18,6 @@ jest.mock('@octokit/rest');
 jest.mock('./helpers');
 
 import { getVoidLogger } from '@backstage/backend-common';
-import { ConfigReader } from '@backstage/config';
 import { Octokit, RestEndpointMethodTypes } from '@octokit/rest';
 import { GithubPublisher } from './github';
 import { initRepoAndPush } from './helpers';
diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/publish/gitlab.test.ts b/plugins/scaffolder-backend/src/scaffolder/stages/publish/gitlab.test.ts
index 885dfc2fe1..ce207b02c0 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/publish/gitlab.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/publish/gitlab.test.ts
@@ -24,7 +24,6 @@ import { GitlabPublisher } from './gitlab';
 import { Gitlab } from '@gitbeaker/node';
 import { initRepoAndPush } from './helpers';
 import { getVoidLogger } from '@backstage/backend-common';
-import { ConfigReader } from '@backstage/config';
 
 describe('GitLab Publisher', () => {
   const logger = getVoidLogger();
diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/publish/types.ts b/plugins/scaffolder-backend/src/scaffolder/stages/publish/types.ts
index f135d9a39f..456e1c0ca0 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/publish/types.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/publish/types.ts
@@ -15,7 +15,6 @@
  */
 import { RequiredTemplateValues } from '../templater';
 import { JsonValue } from '@backstage/config';
-import { RemoteProtocol } from '../types';
 import { Logger } from 'winston';
 
 /**
@@ -44,6 +43,6 @@ export type PublisherResult = {
 };
 
 export type PublisherBuilder = {
-  register(protocol: RemoteProtocol, publisher: PublisherBase): void;
+  register(host: string, publisher: PublisherBase): void;
   get(storePath: string): PublisherBase;
 };
diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/types.ts b/plugins/scaffolder-backend/src/scaffolder/stages/types.ts
deleted file mode 100644
index 7f12eb71db..0000000000
--- a/plugins/scaffolder-backend/src/scaffolder/stages/types.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2020 Spotify AB
- *
- * 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.
- */
-export type RemoteProtocol =
-  | 'file'
-  | 'github'
-  | 'gitlab'
-  | 'azure'
-  | 'bitbucket';
diff --git a/plugins/scaffolder-backend/src/service/router.test.ts b/plugins/scaffolder-backend/src/service/router.test.ts
index bbc054e519..3bfd81ae69 100644
--- a/plugins/scaffolder-backend/src/service/router.test.ts
+++ b/plugins/scaffolder-backend/src/service/router.test.ts
@@ -47,7 +47,7 @@ describe('createRouter - working directory', () => {
     const mockPreparer = {
       prepare: mockPrepare,
     };
-    mockPreparers.register('azure', mockPreparer);
+    mockPreparers.register('dev.azure.com', mockPreparer);
   });
 
   beforeEach(() => {
@@ -65,7 +65,7 @@ describe('createRouter - working directory', () => {
     kind: 'Template',
     metadata: {
       annotations: {
-        'backstage.io/managed-by-location': 'azure:dev.azure.com',
+        'backstage.io/managed-by-location': 'azure:https://dev.azure.com',
       },
     },
     spec: {
diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts
index fd051b257c..8af32f6c0c 100644
--- a/plugins/scaffolder-backend/src/service/router.ts
+++ b/plugins/scaffolder-backend/src/service/router.ts
@@ -28,6 +28,7 @@ import {
   TemplaterBuilder,
   PublisherBuilder,
   parseLocationAnnotation,
+  FilePreparer,
 } from '../scaffolder';
 import { CatalogEntityClient } from '../lib/catalog';
 import { validate, ValidatorResult } from 'jsonschema';
@@ -135,7 +136,9 @@ export async function createRouter(
               );
 
               const preparer =
-                protcol === file ? new FilePreparer() : preparers.get(pullPath);
+                protocol === 'file'
+                  ? new FilePreparer()
+                  : preparers.get(pullPath);
 
               const skeletonDir = await preparer.prepare(ctx.entity, {
                 logger: ctx.logger,
@@ -161,9 +164,7 @@ export async function createRouter(
           {
             name: 'Publish template',
             handler: async (ctx: StageContext<{ resultDir: string }>) => {
-              const publisher = publishers.get(ctx.values.storePath, {
-                logger: ctx.logger,
-              });
+              const publisher = publishers.get(ctx.values.storePath);
               ctx.logger.info('Will now store the template');
               const result = await publisher.publish({
                 values: ctx.values,
@@ -176,9 +177,9 @@ export async function createRouter(
         ],
       });
 
-      res.status(201).json({ id: job.id });
-
       jobProcessor.run(job);
+
+      res.status(201).json({ id: job.id });
     });
 
   const app = express();