diff --git a/packages/app/package.json b/packages/app/package.json
index ed2f547ad7..0af25d6f3a 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -73,10 +73,10 @@
       }
     },
     "/catalog/api": {
-      "target": "http://localhost:3003",
+      "target": "http://localhost:7000",
       "changeOrigin": true,
       "pathRewrite": {
-        "^/catalog/api/": "/"
+        "^/catalog/api/": "/catalog/"
       }
     }
   }
diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
index 5b1fc54330..a6299ca829 100644
--- a/packages/backend/src/index.ts
+++ b/packages/backend/src/index.ts
@@ -70,12 +70,12 @@ async function main() {
   app.use(requestLoggingHandler());
   app.use('/catalog', await catalog(createEnv('catalog')));
   app.use('/scaffolder', await scaffolder(createEnv('scaffolder')));
-  app.use(
-    '/sentry',
-    await sentry(getRootLogger().child({ type: 'plugin', plugin: 'sentry' })),
-  );
-  app.use('/auth', await auth(createEnv('auth')));
-  app.use('/identity', await identity(createEnv('identity')));
+  // app.use(
+  //   '/sentry',
+  //   await sentry(getRootLogger().child({ type: 'plugin', plugin: 'sentry' })),
+  // );
+  // app.use('/auth', await auth(createEnv('auth')));
+  // app.use('/identity', await identity(createEnv('identity')));
   app.use(notFoundHandler());
   app.use(errorHandler());
 
diff --git a/plugins/catalog/src/api/CatalogClient.ts b/plugins/catalog/src/api/CatalogClient.ts
index 42ef1c4da5..7449ce2f2c 100644
--- a/plugins/catalog/src/api/CatalogClient.ts
+++ b/plugins/catalog/src/api/CatalogClient.ts
@@ -16,6 +16,7 @@
 
 import { CatalogApi } from './types';
 import { DescriptorEnvelope } from '../types';
+import {} from '@backstage/catalog-model';
 
 export class CatalogClient implements CatalogApi {
   private apiOrigin: string;
@@ -42,4 +43,20 @@ export class CatalogClient implements CatalogApi {
     if (entity) return entity;
     throw new Error(`'Entity not found: ${name}`);
   }
+
+  async addLocation(type: string, target: string): Promise<{}> {
+    const response = await fetch(
+      `${this.apiOrigin}${this.basePath}/locations`,
+      {
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        method: 'POST',
+        body: JSON.stringify({ type, target }),
+      },
+    );
+    const location = await response.json();
+    if (location) return location;
+    throw new Error(`'Location wasn't added: ${target}`);
+  }
 }
diff --git a/plugins/scaffolder/src/components/ScaffolderPage/index.tsx b/plugins/scaffolder/src/components/ScaffolderPage/index.tsx
index e6fed50cef..59eb6cff43 100644
--- a/plugins/scaffolder/src/components/ScaffolderPage/index.tsx
+++ b/plugins/scaffolder/src/components/ScaffolderPage/index.tsx
@@ -24,7 +24,8 @@ import {
   Page,
   pageTheme,
 } from '@backstage/core';
-import { Typography, Link } from '@material-ui/core';
+import { Typography, Link, Button } from '@material-ui/core';
+import { Link as RouterLink } from 'react-router-dom';
 
 // TODO(blam): Connect to backend
 const STATIC_DATA = [
@@ -49,7 +50,16 @@ const ScaffolderPage: React.FC<{}> = () => {
         subtitle="Create new software components using standard templates"
       />
       <Content>
-        <ContentHeader title="Available templates" />
+        <ContentHeader title="Available templates">
+          <Button
+            variant="contained"
+            color="primary"
+            component={RouterLink}
+            to="/register-component"
+          >
+            Register existing entity
+          </Button>
+        </ContentHeader>
         <Typography variant="body2" paragraph style={{ fontStyle: 'italic' }}>
           <strong>NOTE!</strong> This feature is WIP. You can follow progress{' '}
           <Link href="https://github.com/spotify/backstage/milestone/11">