diff --git a/Resources/k8s/kustomize/base/deployments/graphql-deployment.yaml b/Resources/k8s/kustomize/base/deployments/graphql-deployment.yaml
index 20a80d40..8e2f4347 100644
--- a/Resources/k8s/kustomize/base/deployments/graphql-deployment.yaml
+++ b/Resources/k8s/kustomize/base/deployments/graphql-deployment.yaml
@@ -25,7 +25,7 @@ spec:
               done;
       containers:
         - name: graphql-engine
-          image: hasura/graphql-engine:v2.16.1
+          image: hasura/graphql-engine:v2.36.4
           ports:
             - containerPort: 8080
           env:
diff --git a/Resources/k8s/kustomize/base/jobs/load-graphql.yaml b/Resources/k8s/kustomize/base/jobs/load-graphql.yaml
index c644ad5f..1674318f 100644
--- a/Resources/k8s/kustomize/base/jobs/load-graphql.yaml
+++ b/Resources/k8s/kustomize/base/jobs/load-graphql.yaml
@@ -30,7 +30,7 @@ spec:
             - apt-get update &&
               apt-get install -y git curl &&
               curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | bash &&
-              hasura update-cli --version v2.0.8 &&
+              hasura update-cli --version v2.36.4 &&
               git clone https://github.com/PokeAPI/pokeapi.git &&
               cd pokeapi &&
               git checkout staging &&
diff --git a/docker-compose.yml b/docker-compose.yml
index 7b53f7c7..10587881 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,7 +44,7 @@ services:
       - ./Resources/nginx/ssl:/ssl:ro
       - graphql_cache:/tmp/cache
   graphql-engine:
-    image: hasura/graphql-engine:v2.36.1-ce
+    image: hasura/graphql-engine:v2.36.4
     ports:
       - "8080:8080"
     depends_on: