diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
index 49f8ef6d..747f34f6 100644
--- a/.github/workflows/website.yml
+++ b/.github/workflows/website.yml
@@ -17,12 +17,11 @@ jobs:
     - name: Initialisation
       uses: actions/checkout@v4
 
-    - name: Setup conda
-      uses: conda-incubator/setup-miniconda@v2
+    - name: Set up conda
+      uses: conda-incubator/setup-miniconda@v3
       with:
         environment-file: environment.yml
-        auto-activate-base: false
-        miniforge-version: latest
+        auto-update-conda: true
 
     - name: Prepare sources
       run: make prepare
diff --git a/source/changelog.rst b/source/changelog.rst
index faa6b679..3c2c7b1d 100644
--- a/source/changelog.rst
+++ b/source/changelog.rst
@@ -2,6 +2,55 @@
 Changelog
 =========
 
+Format follows `keep a changelog <https://keepachangelog.com/en/>`__.
+
+2025.06 (Jun 04, 2025)
+======================
+
+All packages now require ``python >= 3.9``.
+
+Added
+-----
+
+``mag2exp``
+  - New submodule for ferromagnetic resonance (FMR) to compute FMR power and
+    phase using the ringown method. For more details refer to the new
+    :doc:`FMR notebook </documentation/notebooks/mag2exp/FMR>`.
+    (`#70 <https://github.com/ubermag/mag2exp/pull/70>`__)
+  - Additional parameter to control astigmatism in LTEM.
+    (`#73 <https://github.com/ubermag/mag2exp/pull/73>`__)
+
+``micromagneticdata``
+  - Allow setting ``Drive.dirname`` with ``pathlib.Path``.
+    (`#85 <https://github.com/ubermag/micromagneticdata/pull/85>`__)
+  - Option to initialise Data with path instead of name and dirname.
+    (`#75 <https://github.com/ubermag/micromagneticdata/pull/75>`__)
+
+``micromagneticmodel``
+  - Additional data in info.json: start and end time, duration, version of the
+    adapter package, indication of simulation result (success or failure).
+    (`#92 <https://github.com/ubermag/micromagneticmodel/pull/92>`__,
+    `#93 <https://github.com/ubermag/mumax3c/pull/93>`__,
+    `#161 <https://github.com/ubermag/oommfc/pull/161>`__)
+
+Changed
+-------
+
+``ubermagutil``
+  - Change timestamp format printed to stdout when starting a simulation to isoformat.
+    (`#55 <https://github.com/ubermag/ubermagutil/pull/55>`__)
+
+Fixed
+-----
+
+``discretisedfield``
+  - Fix a bug in holoviews plotting when only a single cell is available in a slider directon.
+    (`#537 <https://github.com/ubermag/discretisedfield/pull/537>`__)
+
+``micromagneticdata``
+  - ``Data.info`` does no longer fail when ``drive-<number>/info.json`` files are missing/corrupt.
+    (`#84 <https://github.com/ubermag/micromagneticdata/pull/84>`__)
+
 2024.08 (Sep 03, 2024)
 ======================
 
diff --git a/source/documentation/mag2exp.rst b/source/documentation/mag2exp.rst
index 36136c8e..eeead4c4 100644
--- a/source/documentation/mag2exp.rst
+++ b/source/documentation/mag2exp.rst
@@ -14,3 +14,4 @@ mag2exp
     notebooks/mag2exp/X_ray_Holography
     notebooks/mag2exp/SAXS
     notebooks/mag2exp/SANS
+    notebooks/mag2exp/FMR