diff --git a/Dockerfile b/Dockerfile
index 6d2ae43..126b693 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 registry.fedoraproject.org/fedora-minimal:38-x86_64
+FROM --platform=linux/amd64 registry.fedoraproject.org/fedora-minimal:40-x86_64
 
 LABEL org.opencontainers.image.source https://github.com/OliveTin/OliveTin
 LABEL org.opencontainers.image.title=OliveTin
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 3657ad9..dd0f3f1 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -1,4 +1,4 @@
-FROM --platform=linux/arm64 registry.fedoraproject.org/fedora-minimal:38-aarch64
+FROM --platform=linux/arm64 registry.fedoraproject.org/fedora-minimal:40-aarch64
 
 LABEL org.opencontainers.image.source https://github.com/OliveTin/OliveTin
 LABEL org.opencontainers.image.title=OliveTin
diff --git a/internal/executor/executor.go b/internal/executor/executor.go
index 443ef06..4e54947 100644
--- a/internal/executor/executor.go
+++ b/internal/executor/executor.go
@@ -380,7 +380,14 @@ func buildEnv(req *ExecutionRequest) []string {
 	ret := append(os.Environ(), "OLIVETIN=1")
 
 	for k, v := range req.Arguments {
-		ret = append(ret, fmt.Sprintf("%v=%v", strings.ToUpper(k), v))
+		varName := fmt.Sprintf("%v", strings.TrimSpace(strings.ToUpper(k)))
+
+		// Skip arguments that might not have a name (eg, confirmation), as this causes weird bugs on Windows.
+		if varName == "" {
+			continue
+		}
+
+		ret = append(ret, fmt.Sprintf("%v=%v", varName, v))
 	}
 
 	return ret