diff --git a/.github/workflows/sub_buildMacOSCondaApple.yml b/.github/workflows/sub_buildMacOSCondaApple.yml
index 59fc1666f2..59d7c16957 100644
--- a/.github/workflows/sub_buildMacOSCondaApple.yml
+++ b/.github/workflows/sub_buildMacOSCondaApple.yml
@@ -81,6 +81,7 @@ jobs:
           channels: conda-forge
           channel-priority: true
           miniforge-version: latest
+          conda-remove-defaults: "true"
       - name: Install FreeCAD dependencies
         env:
           CONDA_VERBOSITY: 2
diff --git a/.github/workflows/sub_buildMacOSCondaIntel.yml b/.github/workflows/sub_buildMacOSCondaIntel.yml
index b4d4e80b32..5c99a47b1a 100644
--- a/.github/workflows/sub_buildMacOSCondaIntel.yml
+++ b/.github/workflows/sub_buildMacOSCondaIntel.yml
@@ -81,6 +81,7 @@ jobs:
           channels: conda-forge
           channel-priority: true
           miniforge-version: latest
+          conda-remove-defaults: "true"
       - name: Install FreeCAD dependencies
         env:
           CONDA_VERBOSITY: 2
diff --git a/.github/workflows/sub_buildUbuntu2204Conda.yml b/.github/workflows/sub_buildUbuntu2204Conda.yml
index 43d31ec714..e9009aece4 100644
--- a/.github/workflows/sub_buildUbuntu2204Conda.yml
+++ b/.github/workflows/sub_buildUbuntu2204Conda.yml
@@ -79,6 +79,7 @@ jobs:
           channels: conda-forge
           channel-priority: true
           miniforge-version: latest
+          conda-remove-defaults: "true"
       - name: Install FreeCAD dependencies
         env:
           CONDA_VERBOSITY: 2
diff --git a/.github/workflows/sub_buildUbuntu2204CondaQt6.yml b/.github/workflows/sub_buildUbuntu2204CondaQt6.yml
index 59fca06b8d..107e4da1de 100644
--- a/.github/workflows/sub_buildUbuntu2204CondaQt6.yml
+++ b/.github/workflows/sub_buildUbuntu2204CondaQt6.yml
@@ -79,6 +79,7 @@ jobs:
           channels: conda-forge
           channel-priority: true
           miniforge-version: latest
+          conda-remove-defaults: "true"
       - name: Install FreeCAD dependencies
         env:
           CONDA_VERBOSITY: 2
diff --git a/.github/workflows/sub_buildWindowsConda.yml b/.github/workflows/sub_buildWindowsConda.yml
index e51d5cc35a..0c877f5bdf 100644
--- a/.github/workflows/sub_buildWindowsConda.yml
+++ b/.github/workflows/sub_buildWindowsConda.yml
@@ -74,6 +74,7 @@ jobs:
           channels: conda-forge
           channel-priority: true
           miniforge-version: latest
+          conda-remove-defaults: "true"
       - name: Install FreeCAD dependencies
         env:
           CONDA_VERBOSITY: 2
diff --git a/conda/environment.devenv.yml b/conda/environment.devenv.yml
index a1fa339d94..151ba52dd8 100644
--- a/conda/environment.devenv.yml
+++ b/conda/environment.devenv.yml
@@ -5,29 +5,28 @@ dependencies:
 - conda-forge/noarch::conda-libmamba-solver==24.7.0
 - libspnav                             # [linux]
 - kernel-headers_linux-64              # [linux and x86_64]
-- libdrm-cos6-x86_64                   # [linux and x86_64]
-- libselinux-cos6-x86_64               # [linux and x86_64]
-- libsepol-cos6-x86_64                 # [linux and x86_64]
-- libx11-common-cos6-x86_64            # [linux and x86_64]
-- libx11-cos6-x86_64                   # [linux and x86_64]
-- libxau-cos6-x86_64                   # [linux and x86_64]
-- libxcb-cos6-x86_64                   # [linux and x86_64]
-- libxdamage-cos6-x86_64               # [linux and x86_64]
-- libxext-cos6-x86_64                  # [linux and x86_64]
-- libxfixes-cos6-x86_64                # [linux and x86_64]
-- libxi-cos6-x86_64                    # [linux and x86_64]
-- libxi-devel-cos6-x86_64              # [linux and x86_64]
-- libxxf86vm-cos6-x86_64               # [linux and x86_64]
-- mesa-dri-drivers-cos6-x86_64         # [linux and x86_64]
-- mesa-dri1-drivers-cos6-x86_64        # [linux and x86_64]
-- mesa-libegl-cos6-x86_64              # [linux and x86_64]
-- mesa-libegl-devel-cos6-x86_64        # [linux and x86_64]
-- mesa-libgl-cos6-x86_64               # [linux and x86_64]
-- mesa-libgl-devel-cos6-x86_64         # [linux and x86_64]
-- pixman-cos6-x86_64                   # [linux and x86_64]
+- libdrm-cos7-x86_64                   # [linux and x86_64]
+- libselinux-cos7-x86_64               # [linux and x86_64]
+- libsepol-cos7-x86_64                 # [linux and x86_64]
+- libx11-common-cos7-x86_64            # [linux and x86_64]
+- libx11-cos7-x86_64                   # [linux and x86_64]
+- libxau-cos7-x86_64                   # [linux and x86_64]
+- libxcb-cos7-x86_64                   # [linux and x86_64]
+- libxdamage-cos7-x86_64               # [linux and x86_64]
+- libxext-cos7-x86_64                  # [linux and x86_64]
+- libxfixes-cos7-x86_64                # [linux and x86_64]
+- libxi-cos7-x86_64                    # [linux and x86_64]
+- libxi-devel-cos7-x86_64              # [linux and x86_64]
+- libxxf86vm-cos7-x86_64               # [linux and x86_64]
+- mesa-dri-drivers-cos7-x86_64         # [linux and x86_64]
+- mesa-libegl-cos7-x86_64              # [linux and x86_64]
+- mesa-libegl-devel-cos7-x86_64        # [linux and x86_64]
+- mesa-libgl-cos7-x86_64               # [linux and x86_64]
+- mesa-libgl-devel-cos7-x86_64         # [linux and x86_64]
+- pixman-cos7-x86_64                   # [linux and x86_64]
 - sysroot_linux-64                     # [linux and x86_64]
-- xorg-x11-server-common-cos6-x86_64   # [linux and x86_64]
-- xorg-x11-server-xvfb-cos6-x86_64     # [linux and x86_64]
+- xorg-x11-server-common-cos7-x86_64   # [linux and x86_64]
+- xorg-x11-server-xvfb-cos7-x86_64     # [linux and x86_64]
 - kernel-headers_linux-aarch64         # [linux and aarch64]
 - libdrm-cos7-aarch64                  # [linux and aarch64]
 - libglvnd-cos7-aarch64                # [linux and aarch64]
@@ -97,4 +96,4 @@ dependencies:
 - xerces-c
 - yaml-cpp
 - zlib
-- zstd==1.5.6
+- zstd