diff --git a/.gitignore b/.gitignore
index 53ca0d1e..abc31068 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,9 +48,6 @@ Thumbs.db
 # edgedb
 libs/main-db/dbschema/edgeql-js
 
-# website
-!apps/website/app/lib
-
 # Moon
 .moon/cache
 .moon/docker
diff --git a/apps/website/.gitignore b/apps/website/.gitignore
index 6cebf206..3aba17f8 100644
--- a/apps/website/.gitignore
+++ b/apps/website/.gitignore
@@ -5,3 +5,4 @@ public/build
 
 app/tailwind.css
 app/lib/routes.d.ts
+!app/lib
diff --git a/apps/website/app/lib/services/graphql.server.ts b/apps/website/app/lib/services/graphql.server.ts
index e39822bd..bb6e7aac 100644
--- a/apps/website/app/lib/services/graphql.server.ts
+++ b/apps/website/app/lib/services/graphql.server.ts
@@ -1,5 +1,7 @@
-import axios from 'axios';
-import { Thunder, ZeusScalars } from '@codefarem/generated/orchestrator-graphql';
+import {
+  Thunder,
+  ZeusScalars,
+} from '@codefarem/generated/orchestrator-graphql';
 import { ApplicationConfig } from '../config.server';
 
 /**
@@ -8,20 +10,17 @@ import { ApplicationConfig } from '../config.server';
 export const graphqlSdk = (authorizationToken = '') => {
   const headers: Record<string, string> = {
     'Content-Type': 'application/json',
+    connection: 'keep-alive',
   };
   if (authorizationToken)
     headers.Authorization = `Bearer ${authorizationToken}`;
   return Thunder(async (query) => {
-    const response = await axios.post(
+    const response = await fetch(
       `${ApplicationConfig.APPLICATION_API_URL}/graphql`,
-      JSON.stringify({ query }),
-      { headers }
+      { method: 'POST', body: JSON.stringify({ query }), headers }
     );
-    if (!response?.data?.data) {
-      console.dir(response?.data?.errors, { depth: Infinity })
-      throw new Error(`There was an error in the graphql request, please check developer logs`)
-    }
-    return response.data.data;
+    const data = await response.json();
+    return data.data;
   });
 };
 
diff --git a/apps/website/package.json b/apps/website/package.json
index 5e9f19e8..eded273b 100644
--- a/apps/website/package.json
+++ b/apps/website/package.json
@@ -22,7 +22,6 @@
     "@routes-gen/remix": "0.3.5",
     "@types/uuid": "8.3.4",
     "@uiw/react-codemirror": "4.12.3",
-    "axios": "1.1.3",
     "change-case": "4.1.2",
     "clsx": "1.2.1",
     "codemirror": "6.0.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9f4f7e16..412f0a97 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -66,7 +66,6 @@ importers:
       '@types/react-dom': 18.0.6
       '@types/uuid': 8.3.4
       '@uiw/react-codemirror': 4.12.3
-      axios: 1.1.3
       change-case: 4.1.2
       clsx: 1.2.1
       codemirror: 6.0.1
@@ -104,7 +103,6 @@ importers:
       '@routes-gen/remix': 0.3.5_@remix-run+dev@1.7.4
       '@types/uuid': 8.3.4
       '@uiw/react-codemirror': 4.12.3_os2i4b4c4r6ynotuwzkce5wzcu
-      axios: 1.1.3
       change-case: 4.1.2
       clsx: 1.2.1
       codemirror: 6.0.1_@lezer+common@1.0.1
@@ -4638,6 +4636,7 @@ packages:
 
   /asynckit/0.4.0:
     resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
+    dev: true
 
   /at-least-node/1.0.0:
     resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==}
@@ -4663,16 +4662,6 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /axios/1.1.3:
-    resolution: {integrity: sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==}
-    dependencies:
-      follow-redirects: 1.15.2
-      form-data: 4.0.0
-      proxy-from-env: 1.1.0
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
   /axobject-query/2.2.0:
     resolution: {integrity: sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==}
     dev: true
@@ -5329,6 +5318,7 @@ packages:
     engines: {node: '>= 0.8'}
     dependencies:
       delayed-stream: 1.0.0
+    dev: true
 
   /comma-separated-tokens/2.0.2:
     resolution: {integrity: sha512-G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg==}
@@ -5750,6 +5740,7 @@ packages:
   /delayed-stream/1.0.0:
     resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
     engines: {node: '>=0.4.0'}
+    dev: true
 
   /depd/2.0.0:
     resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
@@ -7121,16 +7112,6 @@ packages:
     resolution: {integrity: sha512-wTOuvmW6YyrcqkuLggk/GeSl65R5KQPEbxh0eAfCvlwxp8X08r+5owgZjdbLf8/typZQl/cSJL6D9vVwCkzf3g==}
     engines: {node: '>=0.4.0'}
 
-  /follow-redirects/1.15.2:
-    resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-    dev: false
-
   /for-each/0.3.3:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
     dependencies:
@@ -7147,6 +7128,7 @@ packages:
       asynckit: 0.4.0
       combined-stream: 1.0.8
       mime-types: 2.1.35
+    dev: true
 
   /format/0.2.2:
     resolution: {integrity: sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==}