diff --git a/Makefile b/Makefile
index d60a766274..9d31ca1914 100644
--- a/Makefile
+++ b/Makefile
@@ -584,7 +584,7 @@ image/push/internal: docker/login/internal
 
 image/build/fleetshard-operator: IMAGE_REF="$(external_image_registry)/fleetshard-operator:$(image_tag)"
 image/build/fleetshard-operator:
-	$(DOCKER) build -t $(IMAGE_REF) --build-arg FLEETSHARD_SYNC_IMAGE_TAG=$(image_tag) --build-arg EMAILSENDER_IMAGE_TAG=$(image_tag) ${PROJECT_PATH}/dp-terraform/helm
+	$(DOCKER) build -t $(IMAGE_REF) --build-arg FLEETSHARD_SYNC_IMAGE_TAG=$(image_tag) --build-arg EMAILSENDER_IMAGE_TAG=$(image_tag) --load ${PROJECT_PATH}/dp-terraform/helm
 .PHONY: image/build/fleetshard-operator
 
 image/push/fleetshard-operator: IMAGE_REF="$(external_image_registry)/fleetshard-operator:$(image_tag)"
diff --git a/dev/env/manifests/fleetshard-operator/51-fleetshard-cr.yaml b/dev/env/manifests/fleetshard-operator/51-fleetshard-cr.yaml
index 115b8760c9..a7406edda2 100644
--- a/dev/env/manifests/fleetshard-operator/51-fleetshard-cr.yaml
+++ b/dev/env/manifests/fleetshard-operator/51-fleetshard-cr.yaml
@@ -30,8 +30,8 @@ spec:
     tenantImagePullSecret:
       name: "fleetshard-sync"
       key: "tenant-image-pull-secret"
-    nodeSelector: {}
-    tolerations: []
+    nodeSelector: null
+    tolerations: null
     addonAutoUpgradeEnabled: false
   emailsender:
     enabled: $ENABLE_EMAIL_SENDER
diff --git a/dp-terraform/helm/rhacs-terraform/values.yaml b/dp-terraform/helm/rhacs-terraform/values.yaml
index 50ead7ddc2..a011ff75f8 100644
--- a/dp-terraform/helm/rhacs-terraform/values.yaml
+++ b/dp-terraform/helm/rhacs-terraform/values.yaml
@@ -59,8 +59,12 @@ fleetshardSync:
   targetedOperatorUpgrades:
     enabled: false
   affinity: {}
-  nodeSelector: {} # TODO revert
-  tolerations: [] # TODO revert
+  nodeSelector:
+    node-role.kubernetes.io/acscs-infra: ""
+  tolerations:
+    - key: node-role.kubernetes.io/acscs-infra
+      operator: Exists
+      effect: NoSchedule
   addonAutoUpgradeEnabled: true
   addonName: acs-fleetshard
   tenantImagePullSecret: