diff --git a/charts/substreams-tier-1/Chart.yaml b/charts/substreams-tier-1/Chart.yaml
index f60aae7..5eca815 100644
--- a/charts/substreams-tier-1/Chart.yaml
+++ b/charts/substreams-tier-1/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "v1.6.4"
+version: "4.0.0"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/substreams-tier-2/Chart.yaml b/charts/substreams-tier-2/Chart.yaml
index 7ffb4c4..0b9a4c8 100644
--- a/charts/substreams-tier-2/Chart.yaml
+++ b/charts/substreams-tier-2/Chart.yaml
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.7
+version: 1.0.8
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.6.4"
+appVersion: "v1.6.4"
diff --git a/charts/substreams-tier-2/values.yaml b/charts/substreams-tier-2/values.yaml
index 7e31680..6247e46 100644
--- a/charts/substreams-tier-2/values.yaml
+++ b/charts/substreams-tier-2/values.yaml
@@ -14,7 +14,7 @@ serviceAccount:
 # -- Image configuration for substreams tier 2
 image:
   # -- The repository where the Docker image is located.
-  repository: ghcr.io/streamingfast/firehose-ethereum
+  repository: ghcr.io/streamingfast/firehose-core
   
   # -- The pull policy for the Docker image.
   # Valid options are "Always", "IfNotPresent", and "Never".
@@ -22,7 +22,7 @@ image:
   
   # -- The tag of the Docker image to use.
   # If not set, the default tag will be used.
-  tag: "v2.6.4"
+  tag: "v1.6.4"
 
 # -- Overrides the name of the chart.
 # If not set, the name will be derived from the chart name.