diff --git a/charts/README.md b/charts/README.md
index 92ec3d3e..ac30565a 100644
--- a/charts/README.md
+++ b/charts/README.md
@@ -68,6 +68,7 @@ Parameter | Description | Default
 `extraCoreComponentPodConfig` | Extend the container specs for the core fission pods. Can be used to add things like affinty/tolerations/nodeSelectors/etc. | None
 `executor.adoptExistingResources` | If true, executor will try to adopt existing resources created by the old executor instance. | `false`
 `router.deployAsDaemonSet` | Deploy router as DaemonSet instead of Deployment | `false`
+`router.extraCoreComponentPodConfig` | Extend the container specs for the router fission pods. Can be used to add things like affinty/tolerations/nodeSelectors/etc. Overrides the generic `extraCoreComponentPodConfig`| None
 `router.svcAddressMaxRetries` | Max retries times for router to retry on a certain service URL returns from cache/executor | `5`
 `router.svcAddressUpdateTimeout` | The length of update lock expiry time for router to get a service URL returns from executor | `30`
 `router.svcAnnotations` | Annotations for router service | None
diff --git a/charts/fission-all/templates/router.yaml b/charts/fission-all/templates/router.yaml
index d598e27f..e9f662bf 100644
--- a/charts/fission-all/templates/router.yaml
+++ b/charts/fission-all/templates/router.yaml
@@ -84,6 +84,10 @@ spec:
         - containerPort: 8888
           name: http
       serviceAccountName: fission-svc
+{{- if .Values.router.extraCoreComponentPodConfig }}
+{{ toYaml .Values.router.extraCoreComponentPodConfig | indent 6 -}}
+{{- else }}
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
+{{- end }}
diff --git a/charts/fission-all/values.yaml b/charts/fission-all/values.yaml
index 6611daff..fa8f01a9 100644
--- a/charts/fission-all/values.yaml
+++ b/charts/fission-all/values.yaml
@@ -140,6 +140,24 @@ router:
 
   ## Sample with a rate per time window (traces/second)
   traceSamplingRate: 0.5
+  
+  ## Extend the container specs for the core fission pods.
+  ## Can be used to add things like affinty/tolerations/nodeSelectors/etc.
+  ## For example:
+  ## extraCoreComponentPodConfig:
+  ##   affinity:
+  ##     nodeAffinity:
+  ##       requiredDuringSchedulingIgnoredDuringExecution:
+  ##         nodeSelectorTerms:
+  ##           - matchExpressions:
+  ##             - key: capability
+  ##               operator: In
+  ##               values:
+  ##                 - app
+  #extraCoreComponentPodConfig:
+  #  affinity:
+  #  tolerations:
+  #  nodeSelector:
 
 ## Message queue trigger config
 ### NATS Streaming, enabled by default
@@ -334,4 +352,4 @@ mqt_keda:
       tag: v0.5
     nats_steaming:
       image: fission/keda-nats-streaming-http-connector
-      tag: v0.5
\ No newline at end of file
+      tag: v0.5
diff --git a/charts/fission-core/templates/router.yaml b/charts/fission-core/templates/router.yaml
index d598e27f..e9f662bf 100644
--- a/charts/fission-core/templates/router.yaml
+++ b/charts/fission-core/templates/router.yaml
@@ -84,6 +84,10 @@ spec:
         - containerPort: 8888
           name: http
       serviceAccountName: fission-svc
+{{- if .Values.router.extraCoreComponentPodConfig }}
+{{ toYaml .Values.router.extraCoreComponentPodConfig | indent 6 -}}
+{{- else }}
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
+{{- end }}
diff --git a/charts/fission-core/values.yaml b/charts/fission-core/values.yaml
index 984eb648..8dc6d996 100644
--- a/charts/fission-core/values.yaml
+++ b/charts/fission-core/values.yaml
@@ -108,6 +108,24 @@ router:
 
   ## Sample with a rate per time window (traces/second)
   traceSamplingRate: 0.5
+  
+  ## Extend the container specs for the router fission pods.
+  ## Can be used to add things like affinty/tolerations/nodeSelectors/etc.
+  ## For example:
+  ## extraCoreComponentPodConfig:
+  ##   affinity:
+  ##     nodeAffinity:
+  ##       requiredDuringSchedulingIgnoredDuringExecution:
+  ##         nodeSelectorTerms:
+  ##           - matchExpressions:
+  ##             - key: capability
+  ##               operator: In
+  ##               values:
+  ##                 - app
+  #extraCoreComponentPodConfig:
+  #  affinity:
+  #  tolerations:
+  #  nodeSelector:
 
 ## Persist data to a persistent volume.
 persistence: