diff --git a/plugins/catalog-graphql/codegen.yml b/plugins/catalog-graphql/codegen.yml
new file mode 100644
index 0000000000..c9e0173256
--- /dev/null
+++ b/plugins/catalog-graphql/codegen.yml
@@ -0,0 +1,15 @@
+overwrite: true
+schema: ./src/schema.gql # You can use .js files as well
+require:
+  - ts-node/register/transpile-only # required if you're using TS-Node
+generates:
+  ./src/generated-models.ts:
+    plugins:
+      - typescript
+      - typescript-resolvers
+
+    hooks:
+      afterOneFileWrite:
+        - prettier --write
+    config:
+      contextType: '@graphql-modules/core#ModuleContext'
diff --git a/plugins/catalog-graphql/package.json b/plugins/catalog-graphql/package.json
index 57fade9654..8c478e767b 100644
--- a/plugins/catalog-graphql/package.json
+++ b/plugins/catalog-graphql/package.json
@@ -22,12 +22,15 @@
   },
   "dependencies": {
     "@backstage/backend-common": "^0.1.1-alpha.16",
+    "@graphql-codegen/cli": "^1.17.7",
+    "@graphql-codegen/typescript": "^1.17.7",
+    "@graphql-codegen/typescript-resolvers": "^1.17.7",
     "@graphql-modules/core": "^0.7.17",
     "@types/express": "^4.17.6",
     "@types/whatwg-fetch": "^0.0.33",
     "graphql": "^15.3.0",
     "node-fetch": "^2.6.0",
-    "whatwg-fetch": "^2.0.0",
+    "ts-node": "^8.10.2",
     "winston": "^3.2.1",
     "yn": "^4.0.0"
   },
diff --git a/plugins/catalog-graphql/src/generated-models.ts b/plugins/catalog-graphql/src/generated-models.ts
new file mode 100644
index 0000000000..f0f7f2f372
--- /dev/null
+++ b/plugins/catalog-graphql/src/generated-models.ts
@@ -0,0 +1,288 @@
+/*
+ * 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.
+ */
+import { GraphQLResolveInfo } from 'graphql';
+import { ModuleContext } from '@graphql-modules/core';
+
+export type Maybe<T> = T | null;
+export type Exact<T extends { [key: string]: unknown }> = {
+  [K in keyof T]: T[K];
+};
+export type RequireFields<T, K extends keyof T> = {
+  [X in Exclude<keyof T, K>]?: T[X];
+} &
+  { [P in K]-?: NonNullable<T[P]> };
+/** All built-in and custom scalars, mapped to their actual values */
+export type Scalars = {
+  ID: string;
+  String: string;
+  Boolean: boolean;
+  Int: number;
+  Float: number;
+};
+
+export type EntityMetadataAnnotation = {
+  __typename?: 'EntityMetadataAnnotation';
+  key: Scalars['String'];
+  value: Scalars['String'];
+};
+
+export type EntityMetadata = {
+  __typename?: 'EntityMetadata';
+  name: Scalars['String'];
+  namespace?: Maybe<Scalars['String']>;
+  annotation?: Maybe<EntityMetadataAnnotation>;
+  annotations: Array<EntityMetadataAnnotation>;
+};
+
+export type EntityMetadataAnnotationArgs = {
+  name?: Maybe<Scalars['String']>;
+};
+
+export type CatalogEntity = {
+  __typename?: 'CatalogEntity';
+  apiVersion?: Maybe<Scalars['String']>;
+  kind: Scalars['String'];
+  metadata?: Maybe<EntityMetadata>;
+};
+
+export type CatalogQuery = {
+  __typename?: 'CatalogQuery';
+  list: Array<CatalogEntity>;
+};
+
+export type Query = {
+  __typename?: 'Query';
+  catalog: CatalogQuery;
+};
+
+export type ResolverTypeWrapper<T> = Promise<T> | T;
+
+export type LegacyStitchingResolver<TResult, TParent, TContext, TArgs> = {
+  fragment: string;
+  resolve: ResolverFn<TResult, TParent, TContext, TArgs>;
+};
+
+export type NewStitchingResolver<TResult, TParent, TContext, TArgs> = {
+  selectionSet: string;
+  resolve: ResolverFn<TResult, TParent, TContext, TArgs>;
+};
+export type StitchingResolver<TResult, TParent, TContext, TArgs> =
+  | LegacyStitchingResolver<TResult, TParent, TContext, TArgs>
+  | NewStitchingResolver<TResult, TParent, TContext, TArgs>;
+export type Resolver<TResult, TParent = {}, TContext = {}, TArgs = {}> =
+  | ResolverFn<TResult, TParent, TContext, TArgs>
+  | StitchingResolver<TResult, TParent, TContext, TArgs>;
+
+export type ResolverFn<TResult, TParent, TContext, TArgs> = (
+  parent: TParent,
+  args: TArgs,
+  context: TContext,
+  info: GraphQLResolveInfo,
+) => Promise<TResult> | TResult;
+
+export type SubscriptionSubscribeFn<TResult, TParent, TContext, TArgs> = (
+  parent: TParent,
+  args: TArgs,
+  context: TContext,
+  info: GraphQLResolveInfo,
+) => AsyncIterator<TResult> | Promise<AsyncIterator<TResult>>;
+
+export type SubscriptionResolveFn<TResult, TParent, TContext, TArgs> = (
+  parent: TParent,
+  args: TArgs,
+  context: TContext,
+  info: GraphQLResolveInfo,
+) => TResult | Promise<TResult>;
+
+export interface SubscriptionSubscriberObject<
+  TResult,
+  TKey extends string,
+  TParent,
+  TContext,
+  TArgs
+> {
+  subscribe: SubscriptionSubscribeFn<
+    { [key in TKey]: TResult },
+    TParent,
+    TContext,
+    TArgs
+  >;
+  resolve?: SubscriptionResolveFn<
+    TResult,
+    { [key in TKey]: TResult },
+    TContext,
+    TArgs
+  >;
+}
+
+export interface SubscriptionResolverObject<TResult, TParent, TContext, TArgs> {
+  subscribe: SubscriptionSubscribeFn<any, TParent, TContext, TArgs>;
+  resolve: SubscriptionResolveFn<TResult, any, TContext, TArgs>;
+}
+
+export type SubscriptionObject<
+  TResult,
+  TKey extends string,
+  TParent,
+  TContext,
+  TArgs
+> =
+  | SubscriptionSubscriberObject<TResult, TKey, TParent, TContext, TArgs>
+  | SubscriptionResolverObject<TResult, TParent, TContext, TArgs>;
+
+export type SubscriptionResolver<
+  TResult,
+  TKey extends string,
+  TParent = {},
+  TContext = {},
+  TArgs = {}
+> =
+  | ((
+      ...args: any[]
+    ) => SubscriptionObject<TResult, TKey, TParent, TContext, TArgs>)
+  | SubscriptionObject<TResult, TKey, TParent, TContext, TArgs>;
+
+export type TypeResolveFn<TTypes, TParent = {}, TContext = {}> = (
+  parent: TParent,
+  context: TContext,
+  info: GraphQLResolveInfo,
+) => Maybe<TTypes> | Promise<Maybe<TTypes>>;
+
+export type IsTypeOfResolverFn<T = {}> = (
+  obj: T,
+  info: GraphQLResolveInfo,
+) => boolean | Promise<boolean>;
+
+export type NextResolverFn<T> = () => Promise<T>;
+
+export type DirectiveResolverFn<
+  TResult = {},
+  TParent = {},
+  TContext = {},
+  TArgs = {}
+> = (
+  next: NextResolverFn<TResult>,
+  parent: TParent,
+  args: TArgs,
+  context: TContext,
+  info: GraphQLResolveInfo,
+) => TResult | Promise<TResult>;
+
+/** Mapping between all available schema types and the resolvers types */
+export type ResolversTypes = {
+  EntityMetadataAnnotation: ResolverTypeWrapper<EntityMetadataAnnotation>;
+  String: ResolverTypeWrapper<Scalars['String']>;
+  EntityMetadata: ResolverTypeWrapper<EntityMetadata>;
+  CatalogEntity: ResolverTypeWrapper<CatalogEntity>;
+  CatalogQuery: ResolverTypeWrapper<CatalogQuery>;
+  Query: ResolverTypeWrapper<{}>;
+  Boolean: ResolverTypeWrapper<Scalars['Boolean']>;
+};
+
+/** Mapping between all available schema types and the resolvers parents */
+export type ResolversParentTypes = {
+  EntityMetadataAnnotation: EntityMetadataAnnotation;
+  String: Scalars['String'];
+  EntityMetadata: EntityMetadata;
+  CatalogEntity: CatalogEntity;
+  CatalogQuery: CatalogQuery;
+  Query: {};
+  Boolean: Scalars['Boolean'];
+};
+
+export type EntityMetadataAnnotationResolvers<
+  ContextType = ModuleContext,
+  ParentType extends ResolversParentTypes['EntityMetadataAnnotation'] = ResolversParentTypes['EntityMetadataAnnotation']
+> = {
+  key?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  value?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType>;
+};
+
+export type EntityMetadataResolvers<
+  ContextType = ModuleContext,
+  ParentType extends ResolversParentTypes['EntityMetadata'] = ResolversParentTypes['EntityMetadata']
+> = {
+  name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  namespace?: Resolver<
+    Maybe<ResolversTypes['String']>,
+    ParentType,
+    ContextType
+  >;
+  annotation?: Resolver<
+    Maybe<ResolversTypes['EntityMetadataAnnotation']>,
+    ParentType,
+    ContextType,
+    RequireFields<EntityMetadataAnnotationArgs, never>
+  >;
+  annotations?: Resolver<
+    Array<ResolversTypes['EntityMetadataAnnotation']>,
+    ParentType,
+    ContextType
+  >;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType>;
+};
+
+export type CatalogEntityResolvers<
+  ContextType = ModuleContext,
+  ParentType extends ResolversParentTypes['CatalogEntity'] = ResolversParentTypes['CatalogEntity']
+> = {
+  apiVersion?: Resolver<
+    Maybe<ResolversTypes['String']>,
+    ParentType,
+    ContextType
+  >;
+  kind?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  metadata?: Resolver<
+    Maybe<ResolversTypes['EntityMetadata']>,
+    ParentType,
+    ContextType
+  >;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType>;
+};
+
+export type CatalogQueryResolvers<
+  ContextType = ModuleContext,
+  ParentType extends ResolversParentTypes['CatalogQuery'] = ResolversParentTypes['CatalogQuery']
+> = {
+  list?: Resolver<
+    Array<ResolversTypes['CatalogEntity']>,
+    ParentType,
+    ContextType
+  >;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType>;
+};
+
+export type QueryResolvers<
+  ContextType = ModuleContext,
+  ParentType extends ResolversParentTypes['Query'] = ResolversParentTypes['Query']
+> = {
+  catalog?: Resolver<ResolversTypes['CatalogQuery'], ParentType, ContextType>;
+};
+
+export type Resolvers<ContextType = ModuleContext> = {
+  EntityMetadataAnnotation?: EntityMetadataAnnotationResolvers<ContextType>;
+  EntityMetadata?: EntityMetadataResolvers<ContextType>;
+  CatalogEntity?: CatalogEntityResolvers<ContextType>;
+  CatalogQuery?: CatalogQueryResolvers<ContextType>;
+  Query?: QueryResolvers<ContextType>;
+};
+
+/**
+ * @deprecated
+ * Use "Resolvers" root object instead. If you wish to get "IResolvers", add "typesPrefix: I" to your config.
+ */
+export type IResolvers<ContextType = ModuleContext> = Resolvers<ContextType>;
diff --git a/plugins/catalog-graphql/src/graphql/module.ts b/plugins/catalog-graphql/src/graphql/module.ts
index 65239d27db..7648b7d302 100644
--- a/plugins/catalog-graphql/src/graphql/module.ts
+++ b/plugins/catalog-graphql/src/graphql/module.ts
@@ -19,6 +19,7 @@ import fetch from 'node-fetch';
 import fs from 'fs';
 import path from 'path';
 import { GraphQLModule } from '@graphql-modules/core';
+import { QueryResolvers } from './types';
 
 export interface ModuleOptions {
   logger: Logger;
diff --git a/plugins/catalog-graphql/src/index.ts b/plugins/catalog-graphql/src/index.ts
index dd6508f88a..2e3f1c1fe2 100644
--- a/plugins/catalog-graphql/src/index.ts
+++ b/plugins/catalog-graphql/src/index.ts
@@ -14,6 +14,4 @@
  * limitations under the License.
  */
 
-require('whatwg-fetch');
-
 export * from './graphql/module';
diff --git a/plugins/catalog-graphql/src/setupTests.ts b/plugins/catalog-graphql/src/setupTests.ts
index ac41ef995a..1485402d0d 100644
--- a/plugins/catalog-graphql/src/setupTests.ts
+++ b/plugins/catalog-graphql/src/setupTests.ts
@@ -13,6 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-require('whatwg-fetch');
-
 export {};