diff --git a/.gitignore b/.gitignore
index b8e5e2b8..1725614d 100755
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,3 @@ yarn-error.log
 .env
 generated/
 result*
-schema.graphql
diff --git a/codegen.yml b/codegen.yml
index ee1c1d5a..cbb645d7 100644
--- a/codegen.yml
+++ b/codegen.yml
@@ -1,5 +1,5 @@
 overwrite: true
-schema: schema.graphql
+schema: node_modules/@cardano-graphql/client-ts/api/schema.graphql
 documents: "source/**/*.graphql"
 generates:
   generated/typings/graphql-schema.d.ts:
diff --git a/package.json b/package.json
index 118edd15..b2fb8943 100644
--- a/package.json
+++ b/package.json
@@ -13,8 +13,7 @@
     "test": "jest",
     "test:e2e": "cypress run",
     "test:e2e:dev": "cypress open",
-    "generate:graphql-schema": "node source/utils/generateGraphQLSchema.js",
-    "generate:graphql-typings": "yarn generate:graphql-schema && graphql-codegen",
+    "generate:graphql-typings": "graphql-codegen",
     "export": "next export source --outdir build/static",
     "static:build": "NODE_ENV=production yarn build && yarn export",
     "static:serve": "serve ./build/static",
@@ -72,7 +71,7 @@
     "@babel/plugin-transform-react-display-name": "7.8.3",
     "@babel/plugin-transform-react-jsx-self": "7.9.0",
     "@babel/plugin-transform-react-jsx-source": "7.9.0",
-    "@cardano-graphql/client-ts": "2.1.0",
+    "@cardano-graphql/client-ts": "2.2.0-beta",
     "@cypress/webpack-preprocessor": "4.1.1",
     "@graphql-codegen/cli": "1.2.0",
     "@graphql-codegen/typescript": "1.2.0",
diff --git a/packages-cache/@cardano-graphql-client-ts-2.1.0.tgz b/packages-cache/@cardano-graphql-client-ts-2.1.0.tgz
deleted file mode 100644
index 6a83cb66..00000000
Binary files a/packages-cache/@cardano-graphql-client-ts-2.1.0.tgz and /dev/null differ
diff --git a/packages-cache/@cardano-graphql-client-ts-2.2.0-beta.tgz b/packages-cache/@cardano-graphql-client-ts-2.2.0-beta.tgz
new file mode 100644
index 00000000..f1d5beaa
Binary files /dev/null and b/packages-cache/@cardano-graphql-client-ts-2.2.0-beta.tgz differ
diff --git a/source/utils/generateGraphQLSchema.js b/source/utils/generateGraphQLSchema.js
deleted file mode 100644
index 94f1a144..00000000
--- a/source/utils/generateGraphQLSchema.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-const { loadFilesSync } = require('@graphql-tools/load-files');
-const { mergeTypeDefs } = require('@graphql-tools/merge');
-const { printSchemaWithDirectives } = require('@graphql-tools/utils');
-const { makeExecutableSchema } = require('@graphql-tools/schema');
-
-const cardanoDbHasuraSchema = loadFilesSync('./node_modules/@cardano-graphql/client-ts/api/cardano-db-hasura/schema.graphql');
-const genesisSchema = loadFilesSync('./node_modules/@cardano-graphql/client-ts/api/genesis/schema.graphql');
-const mergedTypes = mergeTypeDefs([cardanoDbHasuraSchema, genesisSchema], {
-  throwOnConflict: true
-});
-
-const executableSchema = makeExecutableSchema({ typeDefs: [mergedTypes] });
-const schema = printSchemaWithDirectives(executableSchema);
-
-fs.writeFileSync(path.join(__dirname, '../../schema.graphql'), schema);
diff --git a/yarn.lock b/yarn.lock
index b19022f1..6a3877cf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1443,10 +1443,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@cardano-graphql/client-ts@2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@cardano-graphql/client-ts/-/client-ts-2.1.0.tgz#f93ddbe4cb88c7b4f5048bc0692e575bd81d9993"
-  integrity sha512-OnvlWkMxSoH2NFfSLPTNRGnzqg4efZmXc34wBUefTfPvmGaNO1NxYVP1wW2nS5/lfkNxwSyFPKX3yNu+MNKh2Q==
+"@cardano-graphql/client-ts@2.2.0-beta":
+  version "2.2.0-beta"
+  resolved "https://registry.yarnpkg.com/@cardano-graphql/client-ts/-/client-ts-2.2.0-beta.tgz#1dd59ccd5b4369e9f1806364df5012967345cb1f"
+  integrity sha512-YkXykkEe5oQ7kuol2dXBskhVx8CCl8D7VOrkuka98GcqMXaJml2q0XK0/L8frHVIw/GX6AgWX0Ue/+AR0BR4ag==
 
 "@cnakazawa/watch@^1.0.3":
   version "1.0.4"