diff --git a/charts/evm-rollup/Chart.yaml b/charts/evm-rollup/Chart.yaml
index 4c56ed4836..eddb185b85 100644
--- a/charts/evm-rollup/Chart.yaml
+++ b/charts/evm-rollup/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: 0.17.2
+version: 0.18.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/evm-rollup/files/genesis/geth-genesis.json b/charts/evm-rollup/files/genesis/geth-genesis.json
index 0546c6e096..464474edbb 100644
--- a/charts/evm-rollup/files/genesis/geth-genesis.json
+++ b/charts/evm-rollup/files/genesis/geth-genesis.json
@@ -45,7 +45,7 @@
         {{- end }}
     },
     "difficulty": "0",
-    "gasLimit": "{{ .Values.config.rollup.genesis.gasLimit }}",
+    "gasLimit": "{{ toString .Values.config.rollup.genesis.gasLimit | replace "\"" "" }}",
     "alloc": {
     {{- range $index, $value := .Values.config.rollup.genesis.alloc }}
         {{- if $index }},{{- end }}
diff --git a/charts/evm-rollup/templates/secretproviderclass.yaml b/charts/evm-rollup/templates/secretproviderclass.yaml
index 3c96978803..0fdbf3d8a9 100644
--- a/charts/evm-rollup/templates/secretproviderclass.yaml
+++ b/charts/evm-rollup/templates/secretproviderclass.yaml
@@ -9,6 +9,7 @@ spec:
     {{- $_ := set $ "key" .Values.config.sequencer.privateKey.secret }}
     {{- tpl $.Values.secretProvider.parametersTemplate $ | nindent 4 }}
 ---
+{{- if .Values.config.faucet.enabled }}
 apiVersion: secrets-store.csi.x-k8s.io/v1
 kind: SecretProviderClass
 metadata:
@@ -26,3 +27,4 @@ spec:
     {{- tpl $.Values.secretProvider.parametersTemplate $ | nindent 4 }}
 ---
 {{- end }}
+{{- end }}
diff --git a/charts/evm-rollup/templates/volumes.yaml b/charts/evm-rollup/templates/volumes.yaml
index 5296cbe251..3c4d7df3e8 100644
--- a/charts/evm-rollup/templates/volumes.yaml
+++ b/charts/evm-rollup/templates/volumes.yaml
@@ -27,7 +27,7 @@ spec:
                 - astria-dev-cluster-control-plane
                 - astria-dev-cluster-worker
 ---
-        {{- if .Values.config.blockscout.enabled }}
+        {{- if $.Values.config.blockscout.enabled }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -76,7 +76,7 @@ spec:
     requests:
       storage: {{ $value.size }}
 ---
-  {{- if .Values.config.blockscout.enabled }}
+  {{- if $.Values.config.blockscout.enabled }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata: