diff --git a/.helm-staging.yml b/.helm-staging.yml
index d7f9491..088da03 100644
--- a/.helm-staging.yml
+++ b/.helm-staging.yml
@@ -44,7 +44,7 @@ gitbaseServer:
       url: https://github.com/src-d/siva-java.git
   image:
     repository: srcd/gitbase
-    tag: v0.17.0-rc.3
+    tag: v0.17.0-rc.4
     pullPolicy: IfNotPresent
   squashEnable: "true"
   readonly: "true"
diff --git a/docker-compose.yml b/docker-compose.yml
index 595ff7c..96dab7a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     depends_on:
       - gitbase
   gitbase:
-    image: "srcd/gitbase:v0.17.0-rc.3"
+    image: "srcd/gitbase:v0.17.0-rc.4"
     environment:
       BBLFSH_ENDPOINT: bblfsh:9432
       GITBASE_UNSTABLE_SQUASH_ENABLE: "true"