diff --git a/modules/nixos/apps/retroarch/default.nix b/modules/nixos/apps/retroarch/default.nix
index 707de135f..530442ec4 100644
--- a/modules/nixos/apps/retroarch/default.nix
+++ b/modules/nixos/apps/retroarch/default.nix
@@ -20,18 +20,16 @@ in
       (retroarch.override {
         cores = with libretro; [
           beetle-psx-hw
-          # TODO: reenable after fixed
-          # beetle-snes
+          bsnes
           citra
           dolphin
+          dosbox
           genesis-plus-gx
-          # FIX: fix package upstream
-          # mame
+          mame
           mgba
           nestopia
           pcsx2
-          # TODO: reenable after fixed
-          # snes9x
+          snes9x
         ];
       })
     ];
diff --git a/modules/nixos/suites/emulation/default.nix b/modules/nixos/suites/emulation/default.nix
index f93916ebf..1189e3e44 100644
--- a/modules/nixos/suites/emulation/default.nix
+++ b/modules/nixos/suites/emulation/default.nix
@@ -14,6 +14,8 @@ in
   options.khanelinix.suites.emulation = {
     enable =
       mkBoolOpt false "Whether or not to enable emulation configuration.";
+    retroarchFull =
+      mkBoolOpt false "Whether or not to enable emulation configuration.";
   };
 
   config = mkIf cfg.enable {
@@ -27,17 +29,16 @@ in
       nestopia
       pcsx2
       pcsxr
-      retroarch
       rpcs3
       snes9x
       xemu
       yuzu-early-access
-    ];
+    ] ++ lib.optionals cfg.retroarchFull [ retroarchFull ];
 
     khanelinix = {
       apps = {
         dolphin = enabled;
-        retroarch = enabled;
+        retroarch.enable = !mkIf cfg.retroarchFull;
       };
     };
   };
diff --git a/systems/x86_64-linux/khanelinix/default.nix b/systems/x86_64-linux/khanelinix/default.nix
index bd0913404..fcca5f9ba 100644
--- a/systems/x86_64-linux/khanelinix/default.nix
+++ b/systems/x86_64-linux/khanelinix/default.nix
@@ -166,7 +166,11 @@ in
         rustEnable = true;
         sqlEnable = true;
       };
-      emulation = enabled;
+
+      emulation = {
+        enable = true;
+        # retroarchFull = true;
+      };
     };
 
     system = {