diff --git a/nix/steam_deck/configuration/roles/shipwright/default.nix b/nix/steam_deck/configuration/roles/shipwright/default.nix
index 3779a35..33df6db 100644
--- a/nix/steam_deck/configuration/roles/shipwright/default.nix
+++ b/nix/steam_deck/configuration/roles/shipwright/default.nix
@@ -52,18 +52,18 @@ in
               optimizeWithFlags =
                 pkg: flags:
                 pkg.overrideAttrs (old: {
-                  NIX_CFLAGS_COMPILE = [ (old.NIX_CFLAGS_COMPILE or "") ] ++ flags;
+                  env.NIX_CFLAGS_COMPILE =
+                    (old.env.NIX_CFLAGS_COMPILE or "") + (lib.strings.concatStringsSep " " flags);
                 });
-              original_package = prev.shipwright;
-              # Optimization is broken for shipwright, fails to build "The following attributes are overlapping"
-              # original_package =
-              #   if !config.me.optimizations.enable then
-              #     (optimizeWithFlags prev.shipwright [
-              #       "-march=znver2"
-              #       "-mtune=znver2"
-              #     ])
-              #   else
-              #     prev.shipwright;
+              original_package =
+                if config.me.optimizations.enable then
+                  (optimizeWithFlags prev.shipwright [
+                    # Verified working with ps
+                    "-march=znver2"
+                    "-mtune=znver2"
+                  ])
+                else
+                  prev.shipwright;
             in
             {
               shipwright = pkgs.buildEnv {