diff --git a/charts/akash-hostname-operator/Chart.yaml b/charts/akash-hostname-operator/Chart.yaml
index 76519c5b..e6057091 100644
--- a/charts/akash-hostname-operator/Chart.yaml
+++ b/charts/akash-hostname-operator/Chart.yaml
@@ -17,7 +17,7 @@ type: application
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
 # Major version bit highlights the mainnet release (e.g. mainnet4 = 4.x.x, mainnet5 = 5.x.x, ...)
-version: 16.0.0-rc0
+version: 16.0.0-rc1
 
 # 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/akash-hostname-operator/templates/deployment.yaml b/charts/akash-hostname-operator/templates/deployment.yaml
index db2cf89d..4db7755e 100644
--- a/charts/akash-hostname-operator/templates/deployment.yaml
+++ b/charts/akash-hostname-operator/templates/deployment.yaml
@@ -97,4 +97,16 @@ spec:
               valueFrom:
                 configMapKeyRef:
                   name: operator-hostname
-                  key: gateway-implementation
\ No newline at end of file
+                  key: gateway-implementation
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
\ No newline at end of file
diff --git a/charts/akash-inventory-operator/Chart.yaml b/charts/akash-inventory-operator/Chart.yaml
index 0a451cf8..efffd420 100644
--- a/charts/akash-inventory-operator/Chart.yaml
+++ b/charts/akash-inventory-operator/Chart.yaml
@@ -17,7 +17,7 @@ type: application
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
 # Major version bit highlights the mainnet release (e.g. mainnet4 = 4.x.x, mainnet5 = 5.x.x, ...)
-version: 16.0.0-rc0
+version: 16.0.0-rc1
 
 # 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/akash-inventory-operator/templates/deployment.yaml b/charts/akash-inventory-operator/templates/deployment.yaml
index 7ba198ad..86a709ba 100644
--- a/charts/akash-inventory-operator/templates/deployment.yaml
+++ b/charts/akash-inventory-operator/templates/deployment.yaml
@@ -88,3 +88,15 @@ spec:
           configMap:
             name: gpu-validation-script
             defaultMode: 0755
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/akash-inventory-operator/values.yaml b/charts/akash-inventory-operator/values.yaml
index 505d3eb8..f5b6c6e5 100644
--- a/charts/akash-inventory-operator/values.yaml
+++ b/charts/akash-inventory-operator/values.yaml
@@ -15,3 +15,9 @@ inventoryConfig:
   exclude:
     nodes: []
     node_storage: []
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}