diff --git a/ci/release.Jenkinsfile b/ci/release.Jenkinsfile
index ab810cbb..9b054580 100644
--- a/ci/release.Jenkinsfile
+++ b/ci/release.Jenkinsfile
@@ -30,6 +30,16 @@ def buildPodDefinition(workerPodImage, ciUtilsEnabled, kanikoEnabled) {
   yaml = """
 kind: Pod
 spec:
+  affinity:
+      nodeAffinity:
+        preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 1
+            preference:
+              matchExpressions:
+                - key: perf
+                  operator: In
+                  values:
+                    - fast
   hostAliases:
   # Custom set env var
   - ip: "${env.JENKINS_IP_ADDRESS}"
diff --git a/src/main/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/semanticdata/optionvalues/AllowedCpuSetOptionValue.kt b/src/main/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/semanticdata/optionvalues/AllowedCpuSetOptionValue.kt
index 23905a3d..32deb887 100644
--- a/src/main/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/semanticdata/optionvalues/AllowedCpuSetOptionValue.kt
+++ b/src/main/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/semanticdata/optionvalues/AllowedCpuSetOptionValue.kt
@@ -4,7 +4,7 @@ import com.intellij.openapi.project.Project
 import net.sjrx.intellij.plugins.systemdunitfiles.semanticdata.Validator
 import java.util.regex.Pattern
 
-class AllowedCpuSetOptionValue() : OptionValueInformation  {
+class AllowedCpuSetOptionValue(val name : String) : OptionValueInformation  {
   override fun getAutoCompleteOptions(project: Project): Set<String> {
     return emptySet()
   }
@@ -47,12 +47,20 @@ class AllowedCpuSetOptionValue() : OptionValueInformation  {
   }
 
   override val validatorName: String
-    get() = VALIDATOR_NAME
+    get() = name
 
   companion object {
-    const val VALIDATOR_NAME = "config_parse_allowed_cpuset"
+    // Old validator name (before June 28th 2025)
+    const val OLD_VALIDATOR_NAME = "config_parse_allowed_cpuset"
+
+    // New validator name (after June 28th 2025)
+    const val NEW_VALIDATOR_NAME = "config_parse_unit_cpu_set"
 
     private val CPU_ELEMENT_REGEX= Pattern.compile("^[0-9]+(-[0-9]+)?$")
-    val validators = mapOf(Validator(VALIDATOR_NAME) to AllowedCpuSetOptionValue())
+    val validators = mapOf(
+      Validator(OLD_VALIDATOR_NAME) to AllowedCpuSetOptionValue(OLD_VALIDATOR_NAME),
+      Validator(NEW_VALIDATOR_NAME) to AllowedCpuSetOptionValue(NEW_VALIDATOR_NAME),
+      )
+
   }
 }
diff --git a/systemd-build/Systemd-Builder.Dockerfile b/systemd-build/Systemd-Builder.Dockerfile
index 21a22aec..707db699 100644
--- a/systemd-build/Systemd-Builder.Dockerfile
+++ b/systemd-build/Systemd-Builder.Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:24.04
 
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 
 RUN ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime
 
@@ -20,7 +20,7 @@ CMD /systemd-build.sh
 
 # Force cache to be invalidated after this point
 ARG BUILDDATE
-ENV BUILDDATE ${BUILDDATE:-notset}
+ENV BUILDDATE=${BUILDDATE:-notset}
 
 RUN git pull
 
diff --git a/systemd-build/Ubuntu-Units.Dockerfile b/systemd-build/Ubuntu-Units.Dockerfile
index b0c293c4..d0510e8c 100644
--- a/systemd-build/Ubuntu-Units.Dockerfile
+++ b/systemd-build/Ubuntu-Units.Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:22.04
 
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get -y install apt-file && apt-file update