diff --git a/config.yaml b/config.yaml
index fd0561bbc..67be31f79 100644
--- a/config.yaml
+++ b/config.yaml
@@ -70,6 +70,16 @@ clusters:
           F7T_TOKEN_URL: "https://auth-tds.cscs.ch/auth/realms/firecrest-clients/protocol/openid-connect/token"
           SLURM_TIMELIMIT: '500'
           SLURM_CPUS_PER_TASK: '64'
+      -
+        uarch: 'mi300'
+        partition: 'mi300'
+        variables:
+          F7T_CLIENT_ID: $F7T_TDS_CLIENT_ID
+          F7T_CLIENT_SECRET: $F7T_TDS_CLIENT_SECRET
+          F7T_URL: "https://api.tds.cscs.ch/stp/firecrest/v2"
+          F7T_TOKEN_URL: "https://auth-tds.cscs.ch/auth/realms/firecrest-clients/protocol/openid-connect/token"
+          SLURM_TIMELIMIT: '500'
+          SLURM_CPUS_PER_TASK: '64'
     runner: f7t
 uenvs:
   climana:
@@ -327,6 +337,11 @@ uenvs:
         daint: [gh200]
         santis: [gh200]
         eiger: [zen2]
+    "25.4":
+      recipes:
+        mi200: 25.4/amdgpu
+      deploy:
+        beverin: [mi200]
   prgenv-nvfortran:
     "24.11":
       recipes:
diff --git a/recipes/prgenv-gnu/25.4/amdgpu/compilers.yaml b/recipes/prgenv-gnu/25.4/amdgpu/compilers.yaml
new file mode 100644
index 000000000..281fae8b9
--- /dev/null
+++ b/recipes/prgenv-gnu/25.4/amdgpu/compilers.yaml
@@ -0,0 +1,5 @@
+bootstrap:
+  spec: gcc@12.3
+gcc:
+  specs:
+  - gcc@13
diff --git a/recipes/prgenv-gnu/25.4/amdgpu/config.yaml b/recipes/prgenv-gnu/25.4/amdgpu/config.yaml
new file mode 100644
index 000000000..3bcf34c0e
--- /dev/null
+++ b/recipes/prgenv-gnu/25.4/amdgpu/config.yaml
@@ -0,0 +1,9 @@
+name: prgenv-gnu
+spack:
+  #commit: releases/v0.23
+  # 0.24.0.dev0
+  # commit: 19734832eb4eeb6aa15f741846955c41fa82f045
+  commit: releases/v0.23
+  repo: https://github.com/spack/spack.git
+store: /user-environment
+description: GNU Compiler toolchain with cray-mpich, Python, CMake and other development tools for MI300A
diff --git a/recipes/prgenv-gnu/25.4/amdgpu/environments.yaml b/recipes/prgenv-gnu/25.4/amdgpu/environments.yaml
new file mode 100644
index 000000000..cac8dc05f
--- /dev/null
+++ b/recipes/prgenv-gnu/25.4/amdgpu/environments.yaml
@@ -0,0 +1,53 @@
+gcc-env:
+  compiler:
+      - toolchain: gcc
+        spec: gcc
+  mpi:
+      spec: cray-mpich@8.1.32
+      gpu: rocm
+  unify: true
+  specs:
+  - boost +chrono +filesystem +iostreams +mpi +python +regex +serialization +shared +system +timer
+  - cmake
+  - fftw
+  - fmt
+  - gsl
+  - hdf5+cxx+hl+fortran
+  - netlib-scalapack
+  - lua
+  - libtree
+  - lz4
+  - meson
+  - ninja
+  - openblas threads=openmp
+  #- osu-micro-benchmarks@5.9
+  - python@3
+  - zlib-ng
+  # add GPU-specific packages here, for easier comparison with mc version
+  - hip ^mesa@23.3.6 ^llvm@18
+  - hdf5+mpi
+  - hipcub
+  # rocm packages
+  - rocthrust
+  - rocprim
+  - rocblas
+  - rocfft
+  - rocsolver
+  - rocsparse
+  - rocrand
+  - rocm-core
+  - rocm-cmake
+  #- rccl
+  #- aw
+  variants:
+  - +mpi
+  - +rocm
+  - amdgpu_target=gfx942,gfx90a
+  - amdgpu_target_sram_ecc=gfx942,gfx90a
+  views:
+    default:
+      link: roots
+      uenv:
+        add_compilers: true
+        prefix_paths:
+          LD_LIBRARY_PATH: [lib, lib64]
diff --git a/recipes/prgenv-gnu/25.4/amdgpu/extra/reframe.yaml b/recipes/prgenv-gnu/25.4/amdgpu/extra/reframe.yaml
new file mode 100644
index 000000000..1c0e6611b
--- /dev/null
+++ b/recipes/prgenv-gnu/25.4/amdgpu/extra/reframe.yaml
@@ -0,0 +1,11 @@
+default:
+  features:
+    - cuda
+    - mpi
+    - osu-micro-benchmarks
+    - openmp
+    - serial
+  cc: mpicc
+  cxx: mpic++
+  ftn: mpifort
+  activation: uenv view develop