diff --git a/CHANGELOG.md b/CHANGELOG.md
index 793f622c4aa..887979ac4e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 ## Next release
 (Add entries below in the order of server, console, cli, docs, others)
 
+## v2.0.4
+
 - server: Support computed fields in permission check/filter (close #7102)
 - server: support computed fields in query 'order_by' (close #7103)
 - server: log warning if there are errors while executing clean up actions after "drop source" (previously it would throw an error) 
diff --git a/install-manifests/azure-container-with-pg/azuredeploy.json b/install-manifests/azure-container-with-pg/azuredeploy.json
index 8bed5195995..1010863d284 100644
--- a/install-manifests/azure-container-with-pg/azuredeploy.json
+++ b/install-manifests/azure-container-with-pg/azuredeploy.json
@@ -98,7 +98,7 @@
     "firewallRuleName": "allow-all-azure-firewall-rule",
     "containerGroupName": "[concat(parameters('name'), '-container-group')]",
     "containerName": "hasura-graphql-engine",
-    "containerImage": "hasura/graphql-engine:v2.0.3"
+    "containerImage": "hasura/graphql-engine:v2.0.4"
   },
   "resources": [
     {
diff --git a/install-manifests/azure-container/azuredeploy.json b/install-manifests/azure-container/azuredeploy.json
index 2b05b606f2b..f1adff882ec 100644
--- a/install-manifests/azure-container/azuredeploy.json
+++ b/install-manifests/azure-container/azuredeploy.json
@@ -55,7 +55,7 @@
     "dbName": "[parameters('postgresDatabaseName')]",
     "containerGroupName": "[concat(parameters('name'), '-container-group')]",
     "containerName": "hasura-graphql-engine",
-    "containerImage": "hasura/graphql-engine:v2.0.3"
+    "containerImage": "hasura/graphql-engine:v2.0.4"
   },
   "resources": [
     {
diff --git a/install-manifests/docker-compose-https/docker-compose.yaml b/install-manifests/docker-compose-https/docker-compose.yaml
index d0f82136931..e3724946bcf 100644
--- a/install-manifests/docker-compose-https/docker-compose.yaml
+++ b/install-manifests/docker-compose-https/docker-compose.yaml
@@ -8,7 +8,7 @@ services:
     environment:
       POSTGRES_PASSWORD: postgrespassword
   graphql-engine:
-    image: hasura/graphql-engine:v2.0.3
+    image: hasura/graphql-engine:v2.0.4
     depends_on:
     - "postgres"
     restart: always
diff --git a/install-manifests/docker-compose-ms-sql-server/docker-compose.yaml b/install-manifests/docker-compose-ms-sql-server/docker-compose.yaml
index 6a9daffcc33..199d474c761 100644
--- a/install-manifests/docker-compose-ms-sql-server/docker-compose.yaml
+++ b/install-manifests/docker-compose-ms-sql-server/docker-compose.yaml
@@ -8,7 +8,7 @@ services:
     environment:
       POSTGRES_PASSWORD: postgrespassword
   graphql-engine:
-    image: hasura/graphql-engine:v2.0.3
+    image: hasura/graphql-engine:v2.0.4
     ports:
     - "8080:8080"
     depends_on:
diff --git a/install-manifests/docker-compose-pgadmin/docker-compose.yaml b/install-manifests/docker-compose-pgadmin/docker-compose.yaml
index ba9ae7fceb4..977680a2f37 100644
--- a/install-manifests/docker-compose-pgadmin/docker-compose.yaml
+++ b/install-manifests/docker-compose-pgadmin/docker-compose.yaml
@@ -19,7 +19,7 @@ services:
       PGADMIN_DEFAULT_EMAIL: pgadmin@example.com
       PGADMIN_DEFAULT_PASSWORD: admin
   graphql-engine:
-    image: hasura/graphql-engine:v2.0.3
+    image: hasura/graphql-engine:v2.0.4
     ports:
     - "8080:8080"
     depends_on:
diff --git a/install-manifests/docker-compose-postgis/docker-compose.yaml b/install-manifests/docker-compose-postgis/docker-compose.yaml
index 7f6dc4dac68..70120608cd0 100644
--- a/install-manifests/docker-compose-postgis/docker-compose.yaml
+++ b/install-manifests/docker-compose-postgis/docker-compose.yaml
@@ -8,7 +8,7 @@ services:
     environment:
       POSTGRES_PASSWORD: postgrespassword
   graphql-engine:
-    image: hasura/graphql-engine:v2.0.3
+    image: hasura/graphql-engine:v2.0.4
     ports:
     - "8080:8080"
     depends_on:
diff --git a/install-manifests/docker-compose-v2.0.0/docker-compose.yaml b/install-manifests/docker-compose-v2.0.0/docker-compose.yaml
index 34dd53b5926..2c46473d984 100644
--- a/install-manifests/docker-compose-v2.0.0/docker-compose.yaml
+++ b/install-manifests/docker-compose-v2.0.0/docker-compose.yaml
@@ -8,7 +8,7 @@ services:
     environment:
       POSTGRES_PASSWORD: postgrespassword
   graphql-engine:
-    image: hasura/graphql-engine:v2.0.3
+    image: hasura/graphql-engine:v2.0.4
     ports:
     - "8080:8080"
     depends_on:
diff --git a/install-manifests/docker-compose/docker-compose.yaml b/install-manifests/docker-compose/docker-compose.yaml
index 34dd53b5926..2c46473d984 100644
--- a/install-manifests/docker-compose/docker-compose.yaml
+++ b/install-manifests/docker-compose/docker-compose.yaml
@@ -8,7 +8,7 @@ services:
     environment:
       POSTGRES_PASSWORD: postgrespassword
   graphql-engine:
-    image: hasura/graphql-engine:v2.0.3
+    image: hasura/graphql-engine:v2.0.4
     ports:
     - "8080:8080"
     depends_on:
diff --git a/install-manifests/docker-run/docker-run.sh b/install-manifests/docker-run/docker-run.sh
index bcb1c466249..2618ba906aa 100755
--- a/install-manifests/docker-run/docker-run.sh
+++ b/install-manifests/docker-run/docker-run.sh
@@ -3,4 +3,4 @@ docker run -d -p 8080:8080 \
        -e HASURA_GRAPHQL_DATABASE_URL=postgres://username:password@hostname:port/dbname \
        -e HASURA_GRAPHQL_ENABLE_CONSOLE=true \
        -e HASURA_GRAPHQL_DEV_MODE=true \
-       hasura/graphql-engine:v2.0.3
+       hasura/graphql-engine:v2.0.4
diff --git a/install-manifests/google-cloud-k8s-sql/deployment.yaml b/install-manifests/google-cloud-k8s-sql/deployment.yaml
index c431e917e6e..fe60d5f772d 100644
--- a/install-manifests/google-cloud-k8s-sql/deployment.yaml
+++ b/install-manifests/google-cloud-k8s-sql/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: graphql-engine
-          image: hasura/graphql-engine:v2.0.3
+          image: hasura/graphql-engine:v2.0.4
           ports:
             - containerPort: 8080
           readinessProbe:
diff --git a/install-manifests/kubernetes/deployment.yaml b/install-manifests/kubernetes/deployment.yaml
index 906c27ac835..40391c8f287 100644
--- a/install-manifests/kubernetes/deployment.yaml
+++ b/install-manifests/kubernetes/deployment.yaml
@@ -18,7 +18,7 @@ spec:
         app: hasura
     spec:
       containers:
-      - image: hasura/graphql-engine:v2.0.3
+      - image: hasura/graphql-engine:v2.0.4
         imagePullPolicy: IfNotPresent
         name: hasura
         env:
diff --git a/server/src-rsr/catalog_versions.txt b/server/src-rsr/catalog_versions.txt
index 2073da3dd03..8bd8f58ac2d 100644
--- a/server/src-rsr/catalog_versions.txt
+++ b/server/src-rsr/catalog_versions.txt
@@ -51,3 +51,4 @@ v2.0.0 46
 v2.0.1 46
 v2.0.2 46
 v2.0.3 46
+v2.0.4 46