diff --git a/website/src/lib/graphql.ts b/website/src/lib/graphql.ts
index 850829bb8..a1c9a564f 100644
--- a/website/src/lib/graphql.ts
+++ b/website/src/lib/graphql.ts
@@ -1,14 +1,24 @@
+import { print } from 'graphql';
+import { TypedDocumentNode } from '@graphql-typed-document-node/core';
+
 export const NETWORK_SUBGRAPH_MAINNET =
   'https://gateway.thegraph.com/api/{api-key}/subgraphs/id/DZz4kDTdmzWLWsV373w2bSmoar3umKKH9y82SUKr5qmp';
 export const NETWORK_SUBGRAPH_SEPOLIA =
   'https://gateway.thegraph.com/api/{api-key}/subgraphs/id/3xQHhMudr1oh69ut36G2mbzpYmYxwqCeU6wwqyCDCnqV';
 
-export async function networkSubgraphExecute(query: string, endpoint: string, apiKey: string) {
+export async function networkSubgraphExecute<T, V>(
+  query: TypedDocumentNode<T, V>,
+  variables: V,
+  endpoint: string,
+  apiKey: string,
+) {
   const response = await fetch(endpoint.replace('{api-key}', apiKey), {
     method: 'POST',
     body: JSON.stringify({
-      query,
+      query: print(query),
+      variables,
     }),
   });
-  return (await response.json()).data;
+  const result = await response.json();
+  return result.data as T;
 }
diff --git a/website/src/routes/publish.lazy.tsx b/website/src/routes/publish.lazy.tsx
index b297bd6b0..294feacf4 100644
--- a/website/src/routes/publish.lazy.tsx
+++ b/website/src/routes/publish.lazy.tsx
@@ -1,5 +1,6 @@
 import { useState } from 'react';
 import { ConnectKitButton, useModal } from 'connectkit';
+import { graphql } from 'gql.tada';
 import { useForm } from 'react-hook-form';
 import semver from 'semver';
 import { Address } from 'viem';
@@ -128,9 +129,9 @@ const Manifest = z.object({
   repository: z.string().describe('An optional link to where the subgraph lives.').optional(),
 });
 
-const GetSubgraphInfo = (subgraphId: string) => `
-  {
-    subgraph(id: "${subgraphId}") {
+const GetSubgraphInfoQuery = graphql(`
+  query GetSubgraphInfo($subgraphId: ID!) {
+    subgraph(id: $subgraphId) {
       id
       owner {
         id
@@ -154,7 +155,7 @@ const GetSubgraphInfo = (subgraphId: string) => `
       }
     }
   }
-`;
+`);
 
 function getEtherscanUrl({ chainId, hash }: { chainId: number; hash: string }) {
   switch (chainId) {
@@ -238,7 +239,8 @@ function DeploySubgraph({
       if (!subgraphEndpoint) return;
 
       const data = await networkSubgraphExecute(
-        GetSubgraphInfo(subgraphId),
+        GetSubgraphInfoQuery,
+        { subgraphId },
         subgraphEndpoint,
         apiKey,
       );
@@ -265,7 +267,7 @@ function DeploySubgraph({
           form.setValue('displayName', metadata.displayName);
         }
 
-        if (data.subgraph.versions?.length > 0) {
+        if (data.subgraph?.versions?.length) {
           const version = data.subgraph.versions[data.subgraph.versions.length - 1];
           form.setValue('versionLabel', version.metadata?.label ?? '');
         }
@@ -282,7 +284,7 @@ function DeploySubgraph({
     const version = form.watch('versionLabel');
 
     const versionInfo = subgraphInfo.subgraph?.versions.find(
-      ({ metadata }: { metadata: { label: string } }) => metadata?.label === version,
+      ver => ver.metadata?.label === version,
     );
 
     if (!versionInfo) return false;
@@ -298,9 +300,7 @@ function DeploySubgraph({
 
     const version = form.watch('versionLabel');
 
-    return !subgraphInfo.subgraph?.versions.some(
-      ({ metadata }: { metadata: { label: string } }) => metadata?.label === version,
-    );
+    return !subgraphInfo.subgraph?.versions.some(ver => ver.metadata?.label === version);
   }
 
   function isOwner() {