diff --git a/helm/name-lookup/renci-dev-values-populated.yaml b/helm/name-lookup/renci-dev-values-populated.yaml
index fcf01d23..a8560b87 100644
Binary files a/helm/name-lookup/renci-dev-values-populated.yaml and b/helm/name-lookup/renci-dev-values-populated.yaml differ
diff --git a/helm/name-lookup/templates/solr-deployment.yaml b/helm/name-lookup/templates/solr-deployment.yaml
index e2853e41..797840c0 100644
--- a/helm/name-lookup/templates/solr-deployment.yaml
+++ b/helm/name-lookup/templates/solr-deployment.yaml
@@ -46,6 +46,7 @@ spec:
           image: "{{ .Values.solr.image.repository }}:{{ .Values.solr.image.tag }}"
           args:
           - '-DzkRun'
+          - '-DzkClientTimeout=5000'
           - '-q'
           - '-Dlog4j2.disable.jmx=true'
           - '-Dlog4j2.formatMsgNoLookups=true'
@@ -69,6 +70,19 @@ spec:
           volumeMounts:
             - mountPath: /var/solr/data
               name: {{ include "name-lookup.fullname" . }}-solr-data-vol
+          startupProbe:
+            httpGet:
+              port: {{ .Values.solr.port }}
+              path: /solr/admin/cores?action=STATUS
+            periodSeconds: 60
+            timeoutSeconds: 120
+          livenessProbe:
+            httpGet:
+              port: {{ .Values.solr.port }}
+              path: /solr/admin/cores?action=STATUS
+            periodSeconds: 120
+            timeoutSeconds: 120
+            terminationGracePeriodSeconds: 600
       {{- with .Values.solr.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -89,4 +103,4 @@ spec:
         resources:
           requests:
             storage: {{ .Values.solr.storage }}
-            
+
diff --git a/helm/name-lookup/templates/web-deployment.yaml b/helm/name-lookup/templates/web-deployment.yaml
index 094d24cd..e66c218b 100644
--- a/helm/name-lookup/templates/web-deployment.yaml
+++ b/helm/name-lookup/templates/web-deployment.yaml
@@ -14,7 +14,7 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "name-lookup.selectorLabels" . | nindent 8 }}
+        {{- include "name-lookup.labels" . | nindent 8 }}
         app-name: web-server
     spec:
       containers:
@@ -48,6 +48,16 @@ spec:
           resources:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          startupProbe:
+            httpGet:
+              port: {{ .Values.webServer.port }}
+              path: /status
+            periodSeconds: 120
+          readinessProbe:
+            httpGet:
+              port: {{ .Values.webServer.port }}
+              path: /status
+            periodSeconds: 120
       {{- with .Values.app.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/helm/name-lookup/values.yaml b/helm/name-lookup/values.yaml
index 4facbc7d..fc8a968b 100644
--- a/helm/name-lookup/values.yaml
+++ b/helm/name-lookup/values.yaml
@@ -55,10 +55,10 @@ solr:
     #
     requests:
       memory: "16Gi"
-      cpu: 1000m
+      cpu: 2000m
     limits:
       memory: "32Gi"
-      cpu: 4000m
+      cpu: 6000m
 
   # You can control the nodeSelector/affinity/tolerations settings for Solr with the following settings.
   # Other pods (web, restore, backup) are controlled via app.nodeSelector/affinity/tolerations below.
@@ -99,11 +99,11 @@ app:
   tolerations:
   resources:
     requests:
-      memory: "300M"
-      cpu: 250m
-    limits:
       memory: "512M"
       cpu: 500m
+    limits:
+      memory: "2G"
+      cpu: 1000m
 
 nameOverride: ""
 fullnameOverride: ""