diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 439c6ce..2e5d183 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,69 +1,56 @@
 name: CI
+
 on:
-  workflow_dispatch:
   push:
     branches:
     - main
-    - master
   pull_request:
     branches:
     - main
-    - master
 
 jobs:
   unix:
-
     runs-on: ${{ matrix.os }}
 
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
-    
+
+    defaults:
+      run:
+        shell: bash -l {0}
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Get number of CPU cores
-        uses: SimenB/github-actions-cpu-cores@v1
+      - name: Checkout repository
+        uses: actions/checkout@v3
 
-      - name: install mamba
-        uses: mamba-org/provision-with-micromamba@main
+      - name: Setup conda environment
+        uses: mamba-org/setup-micromamba@v1
         with:
           environment-file: env.yml
-          environment-name: xeusqt
-
-      - name: install cxx compiler
-        shell: bash -l {0}
-        run: |
-          $HOME/micromamba-bin/micromamba install cxx-compiler libuuid  -c conda-forge -y
+          environment-name: xeus-qt-python
 
       - name: cmake configure
-        shell: bash -l {0}
         run: |
           mkdir -p build
           cd build
           cmake .. \
            -DXEUS_BUILD_TESTS=ON \
            -DCMAKE_PREFIX_PATH=$CONDA_PREFIX \
-           -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX 
+           -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX
 
-      - name: build
-        shell: bash -l {0}
+      - name: Build
         run: |
           cd build
-          make -j 2
-          # make -j ${{ steps.cpu-cores.outputs.count }}
+          make
 
-     
-      - name: install xeus-qt
-        shell: bash -l {0}
+      - name: Install
         run: |
           cd build
           make install
 
-
   win:
-
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -72,15 +59,16 @@ jobs:
         os: [ windows-2019, windows-2022 ]
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v3
 
-      - name: install mamba
-        uses: mamba-org/provision-with-micromamba@main
+      - name: Setup conda environment
+        uses: mamba-org/setup-micromamba@v1
         with:
           environment-file: env.yml
-          environment-name: xeus
+          environment-name: xeus-qt-python
 
-      - name: micromamba shell hook
+      - name: Micromamba shell hook
         shell: powershell
         run: |
           micromamba shell hook -s cmd.exe -p C:\Users\runneradmin\micromamba-root
@@ -91,7 +79,7 @@ jobs:
       - name: cmake configure
         shell: cmd
         run: |
-          call C:\Users\runneradmin\micromamba-root\condabin\micromamba.bat activate xeus
+          call C:\Users\runneradmin\micromamba-root\condabin\micromamba.bat activate xeus-qt-python
           cmake .. ^
            -G Ninja ^
            -DCMAKE_BUILD_TYPE=Release ^
@@ -101,10 +89,10 @@ jobs:
            -DCMAKE_INSTALL_PREFIX="%CONDA_PREFIX%"
         working-directory: build
 
-      - name: build
+      - name: Build and install
         shell: cmd
         run: |
-          call C:\Users\runneradmin\micromamba-root\condabin\micromamba.bat activate xeus
+          call C:\Users\runneradmin\micromamba-root\condabin\micromamba.bat activate xeus-qt-python
           set CL=/MP
           ninja install
         working-directory: build  
diff --git a/env.yml b/env.yml
index b15fb86..8e9d9df 100644
--- a/env.yml
+++ b/env.yml
@@ -1,43 +1,28 @@
-name: base
+name: xeus-qt-python
 channels:
     - conda-forge
 
 dependencies:
+    - compilers
     - cmake
-    - pkg-config
-    - zeromq
-    - cppzmq
+    - python <3.12
+    - pip
+    - qt
+    - xeus
+    - xeus-zmq
+    - xeus-python
     - xtl
-    - OpenSSL
     - nlohmann_json
-    - xeus >=3.0.0,<4
-    - xeus-qt >=0.1.2,<0.2
-    - xeus-python
+    - cppzmq
     - pybind11
     - pybind11_json
-    - xeus >= 3.0.3
-    - xeus-zmq >= 1.0.2
-    - python=3.10
-    - jupyverse-api >=0.3.0,<1
+    - pyqt
+    - qtpy
+    - pyqtwebengine
+    - pyside2
     - fps-lab >=0.3.0,<1
-    - fps-noauth >=0.3.0,<1
+    - fps-auth >=0.3.0,<1
     - fps-jupyterlab >=0.3.0,<1
     - fps-contents >=0.3.0,<1
     - fps-kernels >=0.3.0,<1
     - fps-frontend >=0.3.0,<1
-    - pyside2
-    - pyqt
-    - PyQtWebEngine
-    - qtpy
-    - hatch
-    - git
-    - make
-    - cxx-compiler
-    - mesa-libgl-cos7-aarch64
-    - mesa-libgl-cos6-x86_64
-    - mesa-dri-drivers-cos6-x86_64 
-    - libselinux-cos6-x86_64
-    - libxdamage-cos6-x86_64
-    - libxxf86vm-cos6-x86_64
-    - libxext-cos6-x86_64
-    - xorg-libxfixes