diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c120f572..0d3e42d1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
       run:
         working-directory: ./mkchain
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up Python 3.9
         uses: actions/setup-python@v1
@@ -102,7 +102,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
           submodules: "true"
@@ -123,7 +123,7 @@ jobs:
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-multi-buildx-${{ matrix.container }}-${{ github.sha }}
@@ -171,7 +171,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Helm
         uses: azure/setup-helm@v1
@@ -186,7 +186,7 @@ jobs:
     needs: lint_helm_charts
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Helm
         uses: azure/setup-helm@v1
@@ -202,7 +202,7 @@ jobs:
     if: github.event_name == 'release' && github.event.action == 'created'
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install yq
         run: |
diff --git a/charts/tezos-reward-distributor/templates/volume.yaml b/charts/tezos-reward-distributor/templates/volume.yaml
index eeff7c0b..b4e986fa 100644
--- a/charts/tezos-reward-distributor/templates/volume.yaml
+++ b/charts/tezos-reward-distributor/templates/volume.yaml
@@ -3,7 +3,9 @@ kind: PersistentVolumeClaim
 metadata:
   name: {{ include "tezos-reward-distributor.fullname" . }}-volume
 spec:
- storageClassName:
+ {{- if .Values.storageClassName }}
+ storageClassName: {{ .Values.storageClassName }}
+ {{- end }}
  accessModes:
     - ReadWriteOnce
  resources:
diff --git a/charts/tezos/scripts/dal-node.sh b/charts/tezos/scripts/dal-node.sh
index 9f645d49..dd95e801 100644
--- a/charts/tezos/scripts/dal-node.sh
+++ b/charts/tezos/scripts/dal-node.sh
@@ -22,9 +22,9 @@ if [ "${PUBLIC_ADDR}" != "" ]; then
 fi
 # populate identity, if provided
 if [ -n "$IDENTITY_JSON" ]; then
-    identity_path=/var/tezos/dal/identity.json
-    printf "Found persistent identity, writing to $identity_path"
-    echo "$IDENTITY_JSON" >  $identity_path
+  identity_path=/var/tezos/dal/identity.json
+  printf "Found persistent identity, writing to $identity_path"
+  echo "$IDENTITY_JSON" >$identity_path
 fi
 #
 
diff --git a/charts/tezos/templates/octez-baker.yaml b/charts/tezos/templates/octez-baker.yaml
index c4514d70..4828fbf6 100644
--- a/charts/tezos/templates/octez-baker.yaml
+++ b/charts/tezos/templates/octez-baker.yaml
@@ -88,6 +88,9 @@ spec:
       spec:
         accessModes:
           - ReadWriteOnce
+        {{- if $v.storageClassName }}
+        storageClassName: {{ $v.storageClassName }}
+        {{- end }}
         resources:
           requests:
             storage: "1Gi"
diff --git a/charts/tezos/templates/octez-dal-node.yaml b/charts/tezos/templates/octez-dal-node.yaml
index f941244e..afd3aece 100644
--- a/charts/tezos/templates/octez-dal-node.yaml
+++ b/charts/tezos/templates/octez-dal-node.yaml
@@ -36,6 +36,10 @@ spec:
       labels:
         app: dal-{{ $k }}
     spec:
+{{- if $v.node_selector | default false }}
+      nodeSelector:
+{{ toYaml $v.node_selector | indent 8 }}
+{{- end }}
       initContainers:
       - image: {{ $.Values.tezos_k8s_images.utils }}
         imagePullPolicy: {{ $.Values.tezos_k8s_images_pull_policy }}
@@ -95,6 +99,10 @@ spec:
         - name: PUBLIC_ADDR
           value: "{{ $v.publicAddr }}"
 {{- end }}
+{{- if $v.flexible_ip | default false }}
+        - name: PUBLIC_ADDR
+          value: "{{ $v.flexible_ip }}"
+{{- end }}
 {{- if $v.identity | default false }}
         - name: IDENTITY_JSON
           value: {{ toJson $v.identity | quote }}
@@ -112,6 +120,9 @@ spec:
       spec:
         accessModes:
           - ReadWriteOnce
+        {{- if $v.storageClassName }}
+        storageClassName: {{ $v.storageClassName }}
+        {{- end }}
         resources:
           requests:
 {{- if $v.storageSize | default false }}