diff --git a/recipes/common/gaming.yml b/recipes/common/gaming.yml
index c5acf31..7f57dc6 100644
--- a/recipes/common/gaming.yml
+++ b/recipes/common/gaming.yml
@@ -13,9 +13,8 @@ modules:
   #   scripts:
   #     - install-steam.sh
   - type: rpm-ostree
-    # There's a bug preventing me from doing a separate optfix call
-    # https://github.com/blue-build/modules/issues/365
-    # optfix:
-    #   - r2modman
+    source: ghcr.io/blue-build/modules/rpm-ostree:optfix-auto-ln
+    optfix:
+      - r2modman
     install:
       - https://github.com/ebkr/r2modmanPlus/releases/download/v3.1.49/r2modman-3.1.49.x86_64.rpm
diff --git a/recipes/common/jp-packages.yml b/recipes/common/jp-packages.yml
index 5469908..9882899 100644
--- a/recipes/common/jp-packages.yml
+++ b/recipes/common/jp-packages.yml
@@ -5,9 +5,9 @@ modules:
     snippets:
       - rpm --import https://brave-browser-rpm-release.s3.brave.com/brave-core.asc
   - type: rpm-ostree
+    source: ghcr.io/blue-build/modules/rpm-ostree:optfix-auto-ln
     optfix:
       - brave.com
-      - r2modman
     repos:
       - https://pkgs.tailscale.com/stable/fedora/tailscale.repo
       - https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo