diff --git a/.github/workflows/deploy-server-helm-v4.yml b/.github/workflows/deploy-server-helm-v4.yml
index fc95893..6b9ac39 100644
--- a/.github/workflows/deploy-server-helm-v4.yml
+++ b/.github/workflows/deploy-server-helm-v4.yml
@@ -19,6 +19,10 @@ on:
         default: "0.3-server"
         type: string
       
+      PULL_POLICY:
+        default: IfNotPresent
+        type: string
+
     secrets:
       KUBECONFIG:
         required: true
@@ -60,6 +64,7 @@ jobs:
             --set sapi.version=$SAPI_VERSION \
             --set sapi.flavor=${{ inputs.FALVOR }} \
             --set image.tag=${{ inputs.IMAGE_TAG }} \
+            --set image.pullPolicy=${{ inputs.PULL_POLICY }} \
             --reuse-values \
             --history-max 1 \
             ${{ inputs.DEPLOYMENT_NAME }} \
@@ -69,6 +74,7 @@ jobs:
             --set sapi.version=$SAPI_VERSION \
             --set sapi.flavor=${{ inputs.FALVOR }} \
             --set image.tag=${{ inputs.IMAGE_TAG }} \
+            --set image.pullPolicy=${{ inputs.PULL_POLICY }} \
             ${{ inputs.DEPLOYMENT_NAME }} \
             ${{ inputs.HELM_FILE }}
         fi
diff --git a/.github/workflows/docker-img.yml b/.github/workflows/docker-img.yml
index 4febcec..6289652 100644
--- a/.github/workflows/docker-img.yml
+++ b/.github/workflows/docker-img.yml
@@ -252,6 +252,7 @@ jobs:
       DEPLOYMENT_NAME: rc-server
       FALVOR: rc
       IMAGE_TAG: rc-server
+      PULL_POLICY: Always
     secrets:
       KUBECONFIG: ${{ secrets.KUBECONFIG }}
 
diff --git a/.helm/siibra-api-v4-server/Chart.yaml b/.helm/siibra-api-v4-server/Chart.yaml
index dd9d0d2..8d6a815 100644
--- a/.helm/siibra-api-v4-server/Chart.yaml
+++ b/.helm/siibra-api-v4-server/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
 # 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: "0.3.21-rc3"
+appVersion: "0.3.21-rc4"
diff --git a/.helm/siibra-api-v4-server/templates/ingress.yaml b/.helm/siibra-api-v4-server/templates/ingress.yaml
deleted file mode 100644
index 2e97182..0000000
--- a/.helm/siibra-api-v4-server/templates/ingress.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "siibra-api-v4-server.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
-{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
-  {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
-  {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
-  {{- end }}
-{{- end }}
-{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1
-{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    {{- include "siibra-api-v4-server.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
-  ingressClassName: {{ .Values.ingress.className }}
-  {{- end }}
-  {{- if .Values.ingress.tls }}
-  tls:
-    {{- range .Values.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
-  rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
-            pathType: {{ .pathType }}
-            {{- end }}
-            backend:
-              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
-              service:
-                name: {{ $fullName }}
-                port:
-                  number: {{ $svcPort }}
-              {{- else }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-              {{- end }}
-          {{- end }}
-    {{- end }}
-{{- end }}
diff --git a/.helm/siibra-api-v4-server/templates/serviceaccount.yaml b/.helm/siibra-api-v4-server/templates/serviceaccount.yaml
deleted file mode 100644
index 05c9b96..0000000
--- a/.helm/siibra-api-v4-server/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "siibra-api-v4-server.serviceAccountName" . }}
-  labels:
-    {{- include "siibra-api-v4-server.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
-{{- end }}
diff --git a/.helm/siibra-api-v4-worker/Chart.yaml b/.helm/siibra-api-v4-worker/Chart.yaml
index 7a2fa22..6fb71e9 100644
--- a/.helm/siibra-api-v4-worker/Chart.yaml
+++ b/.helm/siibra-api-v4-worker/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
 # 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: "0.3.21-rc3-real"
+appVersion: "0.3.21-rc4"
diff --git a/.helm/siibra-api-v4-worker/templates/ingress.yaml b/.helm/siibra-api-v4-worker/templates/ingress.yaml
deleted file mode 100644
index 017a21c..0000000
--- a/.helm/siibra-api-v4-worker/templates/ingress.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "siibra-api-v4-worker.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
-{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
-  {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
-  {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
-  {{- end }}
-{{- end }}
-{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1
-{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    {{- include "siibra-api-v4-worker.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
-  ingressClassName: {{ .Values.ingress.className }}
-  {{- end }}
-  {{- if .Values.ingress.tls }}
-  tls:
-    {{- range .Values.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
-  rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
-            pathType: {{ .pathType }}
-            {{- end }}
-            backend:
-              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
-              service:
-                name: {{ $fullName }}
-                port:
-                  number: {{ $svcPort }}
-              {{- else }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-              {{- end }}
-          {{- end }}
-    {{- end }}
-{{- end }}
diff --git a/.helm/siibra-api-v4-worker/templates/service.yaml b/.helm/siibra-api-v4-worker/templates/service.yaml
deleted file mode 100644
index 4940286..0000000
--- a/.helm/siibra-api-v4-worker/templates/service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "siibra-api-v4-worker.fullname" . }}
-  labels:
-    {{- include "siibra-api-v4-worker.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    {{- include "siibra-api-v4-worker.selectorLabels" . | nindent 4 }}
diff --git a/.helm/siibra-api-v4-worker/templates/serviceaccount.yaml b/.helm/siibra-api-v4-worker/templates/serviceaccount.yaml
deleted file mode 100644
index b2979eb..0000000
--- a/.helm/siibra-api-v4-worker/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "siibra-api-v4-worker.serviceAccountName" . }}
-  labels:
-    {{- include "siibra-api-v4-worker.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
-{{- end }}