diff --git a/images/taginfo/start.sh b/images/taginfo/start.sh
index 951d6a41..2c5d69c5 100755
--- a/images/taginfo/start.sh
+++ b/images/taginfo/start.sh
@@ -48,8 +48,8 @@ process_data() {
     ./update_all.sh $DATADIR
     mv $DATADIR/*.db $DATADIR/
     mv $DATADIR/*/*.db $DATADIR/
-    # if BUCKET_NAME is set upload data
-    if ! aws s3 ls "s3://$BUCKET_NAME/$ENVIRONMENT" 2>&1 | grep -q 'An error occurred'; then
+    # if AWS_S3_BUCKET is set upload data
+    if ! aws s3 ls "s3://$AWS_S3_BUCKET/$ENVIRONMENT" 2>&1 | grep -q 'An error occurred'; then
         aws s3 sync $DATADIR/ s3://$AWS_S3_BUCKET/$ENVIRONMENT/  --exclude "*" --include "*.db"
     fi
 }
diff --git a/osm-seed/templates/taginfo/taginfo-cronJob.yaml b/osm-seed/templates/taginfo/taginfo-cronJob.yaml
index ea06ed5b..a693c8e8 100644
--- a/osm-seed/templates/taginfo/taginfo-cronJob.yaml
+++ b/osm-seed/templates/taginfo/taginfo-cronJob.yaml
@@ -19,6 +19,7 @@ spec:
     spec:
       template:
         spec:
+          serviceAccountName: {{ .Values.taginfo.serviceAccount.name }}
           containers:
           - name: {{ .Release.Name }}-taginfo-job
             image: "{{ .Values.taginfo.image.name }}:{{ .Values.taginfo.image.tag }}"
@@ -41,9 +42,19 @@ spec:
                 cpu: {{ .Values.taginfo.cronjob.resources.limits.cpu }}
             {{- end }}
           restartPolicy: Never
-          {{- if .Values.taginfo.cronjob.nodeSelector.enabled }}
-          nodeSelector:
-            {{ .Values.taginfo.cronjob.nodeSelector.label_key }}: {{ .Values.taginfo.cronjob.nodeSelector.label_value }}
+          # Affinity settings
+          {{- if .Values.taginfo.cronjob.nodeAffinity.enabled }}
+          affinity:
+            nodeAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                nodeSelectorTerms:
+                  - matchExpressions:
+                      - key: {{ .Values.taginfo.cronjob.nodeAffinity.key }}
+                        operator: In
+                        values:
+                        {{- range .Values.taginfo.cronjob.nodeAffinity.values }}
+                          - {{ . | quote }}
+                        {{- end }}
           {{- end }}
 {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/osm-seed/values.yaml b/osm-seed/values.yaml
index b6e76723..e51e32c8 100644
--- a/osm-seed/values.yaml
+++ b/osm-seed/values.yaml
@@ -1059,6 +1059,10 @@ taginfo:
       limits:
         memory: "14Gi"
         cpu: "3800m"
+      nodeAffinity:
+        enabled: false
+        key: "nodegroup_type"
+        values: ["job"]
     nodeSelector:
       enabled: false
       label_key: nodegroup_type