diff --git a/.github/workflows/benchmark_comment.yml b/.github/workflows/benchmark_comment.yml
index 8fc3d567d1..e04229e8b0 100644
--- a/.github/workflows/benchmark_comment.yml
+++ b/.github/workflows/benchmark_comment.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   macro_benchmarks_comment:
     name: Benchmark comment on commit
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     if: >
       github.event.workflow_run.conclusion == 'success'
     steps:
diff --git a/.github/workflows/benchmark_pr_track.yml b/.github/workflows/benchmark_pr_track.yml
index ff55501085..1f460a26ba 100644
--- a/.github/workflows/benchmark_pr_track.yml
+++ b/.github/workflows/benchmark_pr_track.yml
@@ -12,7 +12,7 @@ concurrency:
 jobs:
   micro_benchmarks_pr_track:
     if: github.event.workflow_run.conclusion == 'success'
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     env:
       BENCHMARK_RESULTS: benchmark_results.txt
       PR_EVENT: event.json
diff --git a/.github/workflows/build-website.yml b/.github/workflows/build-website.yml
index 7f2121a14b..72a1f36f03 100644
--- a/.github/workflows/build-website.yml
+++ b/.github/workflows/build-website.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build_website:
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     steps:
       - name: Build website
         env:
diff --git a/.github/workflows/build_matrix.yml b/.github/workflows/build_matrix.yml
index 555bc8239e..3e09d85b9a 100644
--- a/.github/workflows/build_matrix.yml
+++ b/.github/workflows/build_matrix.yml
@@ -10,7 +10,7 @@ jobs:
   # IMPORTANT: in case of changing the structure of this file make sure to test
   # the changes against `npm/gen-root.ts` file
   setup-matrix:
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.setup-matrix.outputs.matrix }}
     steps:
@@ -33,34 +33,34 @@ jobs:
               ]
             include:
               - build: linux-x64-gnu
-                os: blacksmith-4vcpu-ubuntu-2204
+                os: ubuntu-latest
                 rust: stable
                 target: x86_64-unknown-linux-gnu
                 libc: glibc
 
               - build: linux-x64-musl
-                os: blacksmith-4vcpu-ubuntu-2204
+                os: ubuntu-latest
                 rust: stable
                 target: x86_64-unknown-linux-musl
                 libc: musl
                 cross: true
 
               - build: linux-arm64-gnu
-                os: blacksmith-4vcpu-ubuntu-2204
+                os: ubuntu-latest
                 rust: stable
                 target: aarch64-unknown-linux-gnu
                 libc: glibc
                 cross: true
 
               - build: linux-arm64-musl
-                os: blacksmith-4vcpu-ubuntu-2204
+                os: ubuntu-latest
                 rust: stable
                 target: aarch64-unknown-linux-musl
                 libc: musl
                 cross: true
 
               - build: linux-ia32-gnu
-                os: blacksmith-4vcpu-ubuntu-2204
+                os: ubuntu-latest
                 rust: stable
                 target: i686-unknown-linux-gnu
                 libc: glibc
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9d0a9d7890..52b302ba23 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
 
   check_if_build:
     name: Check if Build
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
@@ -40,7 +40,7 @@ jobs:
   test_aws_build:
     name: Test AWS Lambda Build
     if: github.event_name == 'pull_request'
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     defaults:
       run:
         working-directory: ./tailcall-aws-lambda
@@ -52,7 +52,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
 
       - name: Install Python
-        uses: useblacksmith/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: "3.12"
 
@@ -64,7 +64,7 @@ jobs:
 
   test_wasm:
     name: Run Tests (WASM)
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     defaults:
       run:
         working-directory: ./tailcall-wasm
@@ -76,7 +76,7 @@ jobs:
           target: wasm32-unknown-unknown
 
       - name: Install Node.js
-        uses: useblacksmith/setup-node@v5
+        uses: actions/setup-node@v4
         with:
           node-version: "20.11.0"
 
@@ -90,7 +90,7 @@ jobs:
 
   test_cf:
     name: Run Tests (Cloudflare)
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     defaults:
       run:
         working-directory: ./tailcall-cloudflare
@@ -104,7 +104,7 @@ jobs:
           target: wasm32-unknown-unknown
 
       - name: Install Node.js
-        uses: useblacksmith/setup-node@v5
+        uses: actions/setup-node@v4
         with:
           node-version: "20.11.0"
 
@@ -116,7 +116,7 @@ jobs:
 
   test:
     name: Run Tests on ${{ matrix.build }}
-    runs-on: ${{ matrix.os || 'blacksmith-4vcpu-ubuntu-2204' }}
+    runs-on: ${{ matrix.os || 'ubuntu-latest' }}
     needs: setup_build_matrix
     strategy:
       fail-fast: false
@@ -129,7 +129,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Node.js
-        uses: useblacksmith/setup-node@v5
+        uses: actions/setup-node@v4
         with:
           node-version: "20.11.0"
       - name: Install Prettier
@@ -145,7 +145,7 @@ jobs:
 
       - name: Cache NASM
         if: runner.os == 'Windows'
-        uses: useblacksmith/cache@v5
+        uses: actions/cache@v4
         with:
           path: |
             nasm-2.16.02
@@ -201,7 +201,7 @@ jobs:
 
   check-examples:
     name: Check Examples
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Set up Rust
@@ -223,7 +223,7 @@ jobs:
   draft_release:
     name: Draft Release
     if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     permissions:
       contents: write
       pull-requests: write
@@ -253,7 +253,7 @@ jobs:
     needs: [setup_build_matrix, test, draft_release, check_if_build, test_cf, test_wasm]
     # TODO: put a condition to separate job that other will depend on to remove duplication?
     if: github.event_name == 'push' && github.ref == 'refs/heads/main' && (needs.check_if_build.outputs.check_if_build == 'true')
-    runs-on: ${{ matrix.os || 'blacksmith-4vcpu-ubuntu-2204' }}
+    runs-on: ${{ matrix.os || 'ubuntu-latest' }}
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.setup_build_matrix.outputs.matrix) }}
@@ -288,7 +288,7 @@ jobs:
 
       - name: Install Node.js
         if: (startsWith(github.event.head_commit.message, 'feat') || startsWith(github.event.head_commit.message, 'fix')) && (github.event_name == 'push' && github.ref == 'refs/heads/main')
-        uses: useblacksmith/setup-node@v5
+        uses: actions/setup-node@v4
         with:
           node-version: 20.11.0
           registry-url: https://registry.npmjs.org
@@ -332,7 +332,7 @@ jobs:
     name: Release (AWS Lambda)
     needs: [test, draft_release, check_if_build, test_cf]
     if: github.event_name == 'push' && github.ref == 'refs/heads/main' && (needs.check_if_build.outputs.check_if_build == 'true')
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     permissions:
       contents: write
       pull-requests: write
@@ -348,7 +348,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
 
       - name: Install Python
-        uses: useblacksmith/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: "3.12"
 
@@ -376,7 +376,7 @@ jobs:
     name: Semantic Release
     if: (startsWith(github.event.head_commit.message, 'feat') || startsWith(github.event.head_commit.message, 'fix')) && (github.event_name == 'push' && github.ref == 'refs/heads/main')
     needs: [draft_release, release, release_lambda]
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     permissions:
       contents: write
       pull-requests: write
@@ -396,12 +396,12 @@ jobs:
     name: Publish NPM main package
     needs: [draft_release, release]
     if: (startsWith(github.event.head_commit.message, 'feat') || startsWith(github.event.head_commit.message, 'fix')) && (github.event_name == 'push' && github.ref == 'refs/heads/main')
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout Current Branch (Fast)
         uses: actions/checkout@v4
       - name: Install Node
-        uses: useblacksmith/setup-node@v5
+        uses: actions/setup-node@v4
         with:
           node-version: 20.11.0
           registry-url: https://registry.npmjs.org
@@ -441,7 +441,7 @@ jobs:
       APP_VERSION: ${{ needs.draft_release.outputs.create_release_name }} # Ensure APP_VERSION is set correctly
     needs: [draft_release, release]
     if: (startsWith(github.event.head_commit.message, 'feat') || startsWith(github.event.head_commit.message, 'fix')) && (github.event_name == 'push' && github.ref == 'refs/heads/main')
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
     permissions:
       contents: read
@@ -484,7 +484,7 @@ jobs:
     permissions:
       contents: write
       pull-requests: write
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index fa3663656a..016cb790f8 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   label-sync:
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 46778afd5f..c386752723 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -17,7 +17,7 @@ concurrency:
 jobs:
   lint:
     name: Run Formatter and Lint Check
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     permissions:
       pull-requests: write
       contents: write
@@ -26,7 +26,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install Node.js
-        uses: useblacksmith/setup-node@v5
+        uses: actions/setup-node@v4
         with:
           node-version: "20.11.0"
       - name: Install Prettier
diff --git a/.github/workflows/pr-convention.yml b/.github/workflows/pr-convention.yml
index d319a0e8ed..7492cd48cc 100644
--- a/.github/workflows/pr-convention.yml
+++ b/.github/workflows/pr-convention.yml
@@ -12,7 +12,7 @@ permissions:
 jobs:
   title-check:
     name: Check PR Title
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     steps:
       - name: All PRs
         uses: amannn/action-semantic-pull-request@v5
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index f48360b4c0..59a7cfa8c8 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -18,7 +18,7 @@ jobs:
     permissions:
       contents: write
       pull-requests: write
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     steps:
       - uses: release-drafter/release-drafter@v6
         env:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 62e967add7..bd3654e7e5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   deploy:
     name: Deploy App
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     concurrency:
       group: deploy-job
       cancel-in-progress: true
diff --git a/.github/workflows/spell-check.yml b/.github/workflows/spell-check.yml
index dc34929602..7e5708b558 100644
--- a/.github/workflows/spell-check.yml
+++ b/.github/workflows/spell-check.yml
@@ -19,7 +19,7 @@ on:
 jobs:
   check_spelling:
     name: Check spelling
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 07545a170c..22ea7987b7 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -14,7 +14,7 @@ env:
 
 jobs:
   stale:
-    runs-on: blacksmith-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/stale@v9
         with:
diff --git a/benches/handle_request_bench.rs b/benches/handle_request_bench.rs
index f33c52a895..88035b056e 100644
--- a/benches/handle_request_bench.rs
+++ b/benches/handle_request_bench.rs
@@ -16,13 +16,11 @@ pub fn benchmark_handle_request(c: &mut Criterion) {
     let sdl = std::fs::read_to_string("./ci-benchmark/benchmark.graphql").unwrap();
     let config_module: ConfigModule = Config::from_sdl(sdl.as_str()).to_result().unwrap().into();
 
-    let mut blueprint = Blueprint::try_from(&config_module).unwrap();
-    let mut blueprint_clone = blueprint.clone();
+    let blueprint = Blueprint::try_from(&config_module).unwrap();
 
     let endpoints = config_module.extensions().endpoint_set.clone();
     let endpoints_clone = endpoints.clone();
 
-    blueprint.server.enable_jit = false;
     let server_config = tokio_runtime
         .block_on(ServerConfig::new(blueprint.clone(), endpoints.clone()))
         .unwrap();
@@ -47,9 +45,8 @@ pub fn benchmark_handle_request(c: &mut Criterion) {
         })
     });
 
-    blueprint_clone.server.enable_jit = true;
     let server_config = tokio_runtime
-        .block_on(ServerConfig::new(blueprint_clone, endpoints_clone))
+        .block_on(ServerConfig::new(blueprint, endpoints_clone))
         .unwrap();
     let server_config = Arc::new(server_config);
 
diff --git a/generated/.tailcallrc.schema.json b/generated/.tailcallrc.schema.json
index 55fbf80df1..70ca3e9258 100644
--- a/generated/.tailcallrc.schema.json
+++ b/generated/.tailcallrc.schema.json
@@ -476,12 +476,6 @@
             "null"
           ]
         },
-        "enableJIT": {
-          "type": [
-            "boolean",
-            "null"
-          ]
-        },
         "globalResponseTimeout": {
           "description": "`globalResponseTimeout` sets the maximum query duration before termination, acting as a safeguard against long-running queries.",
           "type": [
diff --git a/src/core/blueprint/server.rs b/src/core/blueprint/server.rs
index 75d5b3e186..e856154dbc 100644
--- a/src/core/blueprint/server.rs
+++ b/src/core/blueprint/server.rs
@@ -14,7 +14,6 @@ use crate::core::config::{self, ConfigModule, HttpVersion, PrivateKey, Routes};
 
 #[derive(Clone, Debug, Setters)]
 pub struct Server {
-    pub enable_jit: bool,
     pub enable_apollo_tracing: bool,
     pub enable_cache_control_header: bool,
     pub enable_set_cookie_header: bool,
@@ -124,7 +123,6 @@ impl TryFrom<crate::core::config::ConfigModule> for Server {
             ))
             .map(
                 |(hostname, http, response_headers, script, experimental_headers, cors)| Server {
-                    enable_jit: (config_server).enable_jit(),
                     enable_apollo_tracing: (config_server).enable_apollo_tracing(),
                     enable_cache_control_header: (config_server).enable_cache_control(),
                     enable_set_cookie_header: (config_server).enable_set_cookies(),
diff --git a/src/core/config/directives/server.rs b/src/core/config/directives/server.rs
index ec006e2023..b9e1897769 100644
--- a/src/core/config/directives/server.rs
+++ b/src/core/config/directives/server.rs
@@ -29,10 +29,9 @@ use crate::core::macros::MergeRight;
 /// comprehensive set of server configurations. It dictates how the server
 /// behaves and helps tune tailcall for various use-cases.
 pub struct Server {
-    // The `enableJIT` option activates Just-In-Time (JIT) compilation. When set to true, it
-    // optimizes execution of each incoming request independently, resulting in significantly
-    // better performance in most cases, it's enabled by default.
-    #[serde(default, skip_serializing_if = "is_default", rename = "enableJIT")]
+    #[deprecated(note = "No longer used, TODO: drop it")]
+    #[serde(default, skip_serializing, rename = "enableJIT")]
+    #[schemars(skip)]
     pub enable_jit: Option<bool>,
 
     #[serde(default, skip_serializing_if = "is_default")]
@@ -262,10 +261,6 @@ impl Server {
         self.pipeline_flush.unwrap_or(true)
     }
 
-    pub fn enable_jit(&self) -> bool {
-        self.enable_jit.unwrap_or(true)
-    }
-
     pub fn get_routes(&self) -> Routes {
         self.routes.clone().unwrap_or_default()
     }
diff --git a/src/core/http/request_handler.rs b/src/core/http/request_handler.rs
index 712929ee0d..e7ab5efae2 100644
--- a/src/core/http/request_handler.rs
+++ b/src/core/http/request_handler.rs
@@ -119,30 +119,17 @@ async fn execute_query<T: DeserializeOwned + GraphQLRequestLike>(
     request: T,
     req: Parts,
 ) -> anyhow::Result<Response<Body>> {
-    let mut response = if app_ctx.blueprint.server.enable_jit {
-        let operation_id = request.operation_id(&req.headers);
-        let exec = JITExecutor::new(app_ctx.clone(), req_ctx.clone(), operation_id);
-        request
-            .execute_with_jit(exec)
-            .await
-            .set_cache_control(
-                app_ctx.blueprint.server.enable_cache_control_header,
-                req_ctx.get_min_max_age().unwrap_or(0),
-                req_ctx.is_cache_public().unwrap_or(true),
-            )
-            .into_response()?
-    } else {
-        request
-            .data(req_ctx.clone())
-            .execute(&app_ctx.schema)
-            .await
-            .set_cache_control(
-                app_ctx.blueprint.server.enable_cache_control_header,
-                req_ctx.get_min_max_age().unwrap_or(0),
-                req_ctx.is_cache_public().unwrap_or(true),
-            )
-            .into_response()?
-    };
+    let operation_id = request.operation_id(&req.headers);
+    let exec = JITExecutor::new(app_ctx.clone(), req_ctx.clone(), operation_id);
+    let mut response = request
+        .execute_with_jit(exec)
+        .await
+        .set_cache_control(
+            app_ctx.blueprint.server.enable_cache_control_header,
+            req_ctx.get_min_max_age().unwrap_or(0),
+            req_ctx.is_cache_public().unwrap_or(true),
+        )
+        .into_response()?;
 
     update_response_headers(&mut response, req_ctx, app_ctx);
     Ok(response)
diff --git a/src/core/jit/builder.rs b/src/core/jit/builder.rs
index 26ab6d1f66..04f99c45cb 100644
--- a/src/core/jit/builder.rs
+++ b/src/core/jit/builder.rs
@@ -64,16 +64,16 @@ impl Conditions {
     }
 }
 
-pub struct Builder {
+pub struct Builder<'a> {
     pub index: Arc<Index>,
     pub arg_id: Counter<usize>,
     pub field_id: Counter<usize>,
-    pub document: ExecutableDocument,
+    pub document: &'a ExecutableDocument,
 }
 
 // TODO: make generic over Value (Input) type
-impl Builder {
-    pub fn new(blueprint: &Blueprint, document: ExecutableDocument) -> Self {
+impl<'a> Builder<'a> {
+    pub fn new(blueprint: &Blueprint, document: &'a ExecutableDocument) -> Self {
         let index = Arc::new(blueprint.index());
         Self {
             document,
@@ -372,7 +372,7 @@ mod tests {
         let config = Config::from_sdl(CONFIG).to_result().unwrap();
         let blueprint = Blueprint::try_from(&config.into()).unwrap();
         let document = async_graphql::parser::parse_query(query).unwrap();
-        Builder::new(&blueprint, document).build(None).unwrap()
+        Builder::new(&blueprint, &document).build(None).unwrap()
     }
 
     #[tokio::test]
@@ -640,25 +640,23 @@ mod tests {
         let config = Config::from_sdl(CONFIG).to_result().unwrap();
         let blueprint = Blueprint::try_from(&config.into()).unwrap();
         let document = async_graphql::parser::parse_query(query).unwrap();
-        let error = Builder::new(&blueprint, document.clone())
-            .build(None)
-            .unwrap_err();
+        let error = Builder::new(&blueprint, &document).build(None).unwrap_err();
 
         assert_eq!(error, BuildError::OperationNameRequired);
 
-        let error = Builder::new(&blueprint, document.clone())
+        let error = Builder::new(&blueprint, &document)
             .build(Some("unknown"))
             .unwrap_err();
 
         assert_eq!(error, BuildError::OperationNotFound("unknown".to_string()));
 
-        let plan = Builder::new(&blueprint, document.clone())
+        let plan = Builder::new(&blueprint, &document)
             .build(Some("GetPosts"))
             .unwrap();
         assert!(plan.is_query());
         insta::assert_debug_snapshot!(plan.selection);
 
-        let plan = Builder::new(&blueprint, document.clone())
+        let plan = Builder::new(&blueprint, &document)
             .build(Some("CreateNewPost"))
             .unwrap();
         assert!(!plan.is_query());
diff --git a/src/core/jit/fixtures/jp.rs b/src/core/jit/fixtures/jp.rs
index 2d0c99b45c..f743fdc281 100644
--- a/src/core/jit/fixtures/jp.rs
+++ b/src/core/jit/fixtures/jp.rs
@@ -88,10 +88,8 @@ impl<'a, Value: Deserialize<'a> + Clone + 'a + JsonLike<'a> + std::fmt::Debug> J
 
     fn plan(query: &str, variables: &Variables<async_graphql::Value>) -> OperationPlan<Value> {
         let config = ConfigModule::from(Config::from_sdl(Self::CONFIG).to_result().unwrap());
-        let builder = Builder::new(
-            &Blueprint::try_from(&config).unwrap(),
-            async_graphql::parser::parse_query(query).unwrap(),
-        );
+        let doc = async_graphql::parser::parse_query(query).unwrap();
+        let builder = Builder::new(&Blueprint::try_from(&config).unwrap(), &doc);
 
         let plan = builder.build(None).unwrap();
         let plan = transform::Skip::new(variables)
diff --git a/src/core/jit/graphql_executor.rs b/src/core/jit/graphql_executor.rs
index 31afb8af0f..e1c131c374 100644
--- a/src/core/jit/graphql_executor.rs
+++ b/src/core/jit/graphql_executor.rs
@@ -75,6 +75,8 @@ impl JITExecutor {
         &self,
         request: async_graphql::Request,
     ) -> impl Future<Output = AnyResponse<Vec<u8>>> + Send + '_ {
+        // TODO: hash considering only the query itself ignoring specified operation and
+        // variables that could differ for the same query
         let hash = Self::req_hash(&request);
 
         async move {
@@ -135,6 +137,7 @@ impl JITExecutor {
     }
 }
 
+// TODO: used only for introspection, simplify somehow?
 impl From<jit::Request<Value>> for async_graphql::Request {
     fn from(value: jit::Request<Value>) -> Self {
         let mut request = async_graphql::Request::new(value.query);
diff --git a/src/core/jit/request.rs b/src/core/jit/request.rs
index cbd3bc0faf..f37c4a721e 100644
--- a/src/core/jit/request.rs
+++ b/src/core/jit/request.rs
@@ -42,7 +42,7 @@ impl Request<ConstValue> {
         blueprint: &Blueprint,
     ) -> Result<OperationPlan<async_graphql_value::Value>> {
         let doc = async_graphql::parser::parse_query(&self.query)?;
-        let builder = Builder::new(blueprint, doc);
+        let builder = Builder::new(blueprint, &doc);
         let plan = builder.build(self.operation_name.as_deref())?;
 
         transform::CheckConst::new()
diff --git a/src/core/jit/synth/synth.rs b/src/core/jit/synth/synth.rs
index e24b6c50a0..221fa95da2 100644
--- a/src/core/jit/synth/synth.rs
+++ b/src/core/jit/synth/synth.rs
@@ -345,7 +345,7 @@ mod tests {
         let config = Config::from_sdl(CONFIG).to_result().unwrap();
         let config = ConfigModule::from(config);
 
-        let builder = Builder::new(&Blueprint::try_from(&config).unwrap(), doc);
+        let builder = Builder::new(&Blueprint::try_from(&config).unwrap(), &doc);
         let plan = builder.build(None).unwrap();
         let plan = plan
             .try_map(|v| {
diff --git a/tests/core/parse.rs b/tests/core/parse.rs
index a438a31e89..6246c40008 100644
--- a/tests/core/parse.rs
+++ b/tests/core/parse.rs
@@ -273,11 +273,7 @@ impl ExecutionSpec {
         env: HashMap<String, String>,
         http: Arc<Http>,
     ) -> Arc<AppContext> {
-        let mut blueprint = Blueprint::try_from(config).unwrap();
-
-        if cfg!(feature = "force_jit") {
-            blueprint.server.enable_jit = true;
-        }
+        let blueprint = Blueprint::try_from(config).unwrap();
 
         let script = blueprint.server.script.clone();
 
diff --git a/tests/core/snapshots/test-enable-jit.md_merged.snap b/tests/core/snapshots/test-enable-jit.md_merged.snap
index 3d61f7941a..99a8a80fcb 100644
--- a/tests/core/snapshots/test-enable-jit.md_merged.snap
+++ b/tests/core/snapshots/test-enable-jit.md_merged.snap
@@ -3,7 +3,7 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server(enableJIT: true, hostname: "0.0.0.0", port: 8000) @upstream {
+schema @server(hostname: "0.0.0.0", port: 8000) @upstream {
   query: Query
 }
 
diff --git a/tests/core/snapshots/test-required-fields.md_merged.snap b/tests/core/snapshots/test-required-fields.md_merged.snap
index 32c7a45a63..5cb6c7f4f3 100644
--- a/tests/core/snapshots/test-required-fields.md_merged.snap
+++ b/tests/core/snapshots/test-required-fields.md_merged.snap
@@ -3,7 +3,7 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server(enableJIT: true) @upstream {
+schema @server @upstream {
   query: Query
 }