diff --git a/templates/datadirsync/datadirsync-deployment.yaml b/templates/datadirsync/datadirsync-deployment.yaml
index cf67016..58c04b9 100644
--- a/templates/datadirsync/datadirsync-deployment.yaml
+++ b/templates/datadirsync/datadirsync-deployment.yaml
@@ -17,6 +17,11 @@ spec:
       labels:
         app: {{ include "georchestra.fullname" . }}-datadirsync
     spec:
+      nodeSelector:
+        "kubernetes.io/os": linux
+        {{- with .Values.georchestra.nodeSelector }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       serviceAccountName: {{ include "georchestra.fullname" . }}-datadirsync-serviceaccount
       securityContext:
         fsGroup: 1001
@@ -56,4 +61,12 @@ spec:
           secretName: {{ .Values.georchestra.datadir.git.ssh_secret }}
           defaultMode: 0440
       {{- end }}
+      {{- if $webapp.registry_secret }}
+      imagePullSecrets:
+      - name: {{ $webapp.registry_secret }}
+      {{- end }}
+      {{- if $webapp.tolerations }}
+      tolerations:
+        {{- $webapp.tolerations | toYaml | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/values.yaml b/values.yaml
index 362f722..dcca25e 100644
--- a/values.yaml
+++ b/values.yaml
@@ -267,6 +267,8 @@ georchestra:
     enabled: false
     image: georchestra/datadirsync-k8s-agent:1.3.3
     pollInterval: 30
+    tolerations: []
+    # registry_secret: default
     deploymentSuffixNameList:
       - geoserver