diff --git a/hardware/amd/amdgpu.nix b/hardware/amd/amdgpu.nix
index 09b94c8..ed27c6c 100644
--- a/hardware/amd/amdgpu.nix
+++ b/hardware/amd/amdgpu.nix
@@ -8,26 +8,14 @@ in {
   config = mkIf (cfg.enable && cfg.kernelDriver == "amdgpu") {  
     boot.initrd.kernelModules = [ "amdgpu" ];
 
-    aviallon.boot.cmdline = {
-      # for Southern Islands (SI ie. GCN 1) cards
-      "radeon.si_support" = 0;
-      "amdgpu.si_support" = 1;
-      # for Sea Islands (CIK ie. GCN 2) cards
-      "radeon.cik_support" = 0;
-      "amdgpu.cik_support" = 1;
+    hardware.amdgpu.legacySupport.enable = true;
 
+    aviallon.boot.cmdline = {
       "amdgpu.ppfeaturemask" = mkIf generalCfg.unsafeOptimizations "0xfff7ffff";
       #"amdgpu.mes" = mkIf generalCfg.unsafeOptimizations 1;
       "amdgpu.seamless" = mkIf generalCfg.unsafeOptimizations 1;
     };
 
-    environment.systemPackages = with pkgs; []
-      ++ [ rocmPackages.rocm-smi ]
-      ++ optionals devCfg.enable [
-        rocmPackages.rocminfo
-      ]
-    ;
-
     aviallon.programs.config.rocmSupport = mkDefault devCfg.enable;
 
     services.xserver.videoDrivers = 
@@ -39,29 +27,10 @@ in {
     hardware.amdgpu.amdvlk.enable = cfg.defaultVulkanImplementation == "amdvlk";
     hardware.amdgpu.amdvlk.support32Bit.enable = mkDefault config.hardware.amdgpu.amdvlk.enable;
 
-    systemd.tmpfiles.rules = [
-      "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"
-    ];
-
     environment.variables = {
       AMD_VULKAN_ICD = mkIf (cfg.defaultVulkanImplementation == "amdvlk") (strings.toUpper cfg.defaultVulkanImplementation);
       ROC_ENABLE_PRE_VEGA = "1"; # Enable OpenCL with Polaris GPUs
     };
 
-    # Make rocblas and rocfft work
-    nix.settings.extra-sandbox-paths = [
-      "/dev/kfd?"
-      "/sys/devices/virtual/kfd?"
-      "/dev/dri/renderD128?"
-    ];
-
-    nix.settings.substituters = [ "https://nixos-rocm.cachix.org" ];
-    nix.settings.trusted-public-keys = [ "nixos-rocm.cachix.org-1:VEpsf7pRIijjd8csKjFNBGzkBqOmw8H9PRmgAq14LnE=" ];
-
-    nixpkgs.overlays = [(final: prev: {
-        # Overlay Blender to use the HIP build if we have a compatible AMD GPU
-        blender = final.blender-hip;
-        blender-prev = prev.blender;
-      })];
   };
 }
diff --git a/hardware/amd/default.nix b/hardware/amd/default.nix
index c82cffa..73be5ad 100644
--- a/hardware/amd/default.nix
+++ b/hardware/amd/default.nix
@@ -23,6 +23,7 @@ in {
     ./cpu.nix
     ./amdgpu.nix
     ./radeon.nix
+    ./rocm.nix
   ];
   
   config = mkIf cfg.enable {
diff --git a/hardware/amd/rocm.nix b/hardware/amd/rocm.nix
new file mode 100644
index 0000000..f345254
--- /dev/null
+++ b/hardware/amd/rocm.nix
@@ -0,0 +1,117 @@
+{ config, pkgs, lib, ... }:
+with lib;
+let
+  cfg = config.aviallon.hardware.amd;
+  localCfg = config.aviallon.hardware.amd.rocm;
+  devCfg = config.aviallon.developer;
+  generalCfg = config.aviallon.general;
+
+  gfxToCompatibleMap = {
+    gfx900 = "9.0.0";
+    gfx902 = "9.0.0";
+    gfx904 = "9.0.0";
+    gfx909 = "9.0.0";
+    gfx90c = "9.0.0";
+    gfx1011 = "10.1.0";
+    gfx1012 = "10.1.0";
+    gfx1031 = "10.3.0";
+    gfx1032 = "10.3.0";
+    gfx1033 = "10.3.0";
+    gxf1034 = "10.3.0";
+    gxf1035 = "10.3.0";
+    gxf1036 = "10.3.0";
+  };
+
+  autoDetectGPU = pkgs: pkgs.callPackage (
+    { runCommandLocal,
+      gnugrep,
+      rocmPackages,
+    }: runCommandLocal "hsa-version" { nativeBuildInputs = [ gnugrep rocmPackages.rocminfo ]; } ''
+        set +e
+        mkdir -p $out/
+        echo "Computing HSA version" &>/dev/stderr
+        ls -l /dev/kfd
+        rocminfo &>/dev/stderr
+        rocminfo | grep --only-matching --perl-regexp '^\s*Name:\s+\Kgfx[0-9a-f]+' | tee $out/output
+       ''
+  ) { };
+
+  gfxToCompatible = gfxISA: if (hasAttr gfxISA gfxToCompatibleMap) then (getAttr gfxISA gfxToCompatibleMap) else "";
+in {
+
+  options.aviallon.hardware.amd.rocm = {
+    enable = (mkEnableOption "ROCm configuration") // { default = true; };
+    gfxISA = mkOption {
+      description = "What is the GFX ISA of your system. Leave blank if you have several GPUs of incompatible ISAs";
+      default = "";
+      example = "gfx902";
+      type = types.string;
+    };
+  };
+
+  config = mkIf (cfg.enable && localCfg.enable) {  
+    environment.systemPackages = with pkgs;
+      [
+        rocmPackages.rocm-smi
+        rocmPackages.meta.rocm-ml-libraries
+        rocmPackages.meta.rocm-hip-runtime
+
+        #pkgs.autoDetectGPU
+      ] ++ optionals devCfg.enable [
+        rocmPackages.rocminfo
+      ]
+    ;
+
+    systemd.tmpfiles.rules = [
+      "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.meta.rocm-hip-runtime}"
+      #"L+    /tmp/hsa-version - - - - ${pkgs.autoDetectGPU}"
+    ];
+
+    environment.variables = {
+      ROC_ENABLE_PRE_VEGA = "1"; # Enable OpenCL with Polaris GPUs  
+    } // (mkIf (gfxToCompatible cfg.rocm.gfxISA != "") {
+      HSA_OVERRIDE_GFX_VERSION = gfxToCompatible cfg.rocm.gfxISA;
+    });
+
+    # Make rocblas and rocfft work
+    nix.settings.extra-sandbox-paths = [
+      "/dev/kfd?"
+      "/sys/devices/virtual/kfd?"
+      "/dev/dri/renderD128?"
+    ];
+
+    nix.settings.substituters = [ "https://nixos-rocm.cachix.org" ];
+    nix.settings.trusted-public-keys = [ "nixos-rocm.cachix.org-1:VEpsf7pRIijjd8csKjFNBGzkBqOmw8H9PRmgAq14LnE=" ];
+
+    nixpkgs.overlays = [(final: prev: {
+        # Overlay Blender to use the HIP build if we have a compatible AMD GPU
+        blender = final.blender-hip;
+        blender-cpu = prev.blender;
+
+        magma = final.magma-hip;
+        magma-cpu = prev.magma;
+
+        autoDetectGPU = autoDetectGPU final;
+
+        rocmPackages = prev.rocmPackages // rec {
+          rocmlir = prev.rocmPackages.rocmlir.overrideAttrs (finalAttrs: previousAttrs: {
+            patches = [
+              {
+                name = "fix-mlir-Conversion-RocMLIRPasses.h.inc-not-found.patch";
+                url = "https://patch-diff.githubusercontent.com/raw/ROCm/rocMLIR/pull/1640.patch";
+                hash = "";
+              }
+            ];
+          });
+
+          rocmlir-rock = rocmlir.override {
+            buildRockCompiler = true;
+          };
+
+          miopen = prev.rocmPackages.miopen.override { rocmlir = rocmlir-rock; };
+
+          migraphx = prev.rocmPackages.migraphx.override { rocmlir = rocmlir-rock; };
+        };
+      })];
+  };
+}