diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
deleted file mode 100644
index 8315c0b5..00000000
--- a/.github/workflows/deploy.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-# This workflow is used to upload and deploy a new release to PyPi
-# Based on https://github.com/pypa/gh-action-pypi-publish
-
-name: PyPi Release
-
-on:
-    push:
-    pull_request:
-    workflow_dispatch:
-
-jobs:
-  build:
-    if: startsWith(github.event.ref, 'refs/tags') || github.event_name == 'release'
-    runs-on: ubuntu-latest
-    environment:
-      name: pypi
-      url: https://pypi.org/p/${{ github.event.repository.name }}
-    permissions:
-      id-token: write
-    steps:
-    - uses: actions/checkout@v2
-    - uses: conda-incubator/setup-miniconda@v2.2.0
-      with:
-        python-version: 3.11
-        mamba-version: "*"
-        channels: conda-forge
-        miniforge-variant: Mambaforge
-        channel-priority: strict
-        auto-update-conda: true
-        environment-file: .ci_support/environment-openmpi.yml
-    - name: Convert dependencies
-      run: |
-        cp .ci_support/environment-old.yml environment.yml
-        python .ci_support/release.py; cat pyproject.toml
-    - name: Build
-      shell: bash -l {0}
-      run: |
-        pip install versioneer[toml]==0.29
-        python setup.py sdist bdist_wheel
-    - name: Publish distribution 📦 to PyPI
-      uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/.github/workflows/unittest-flux.yml b/.github/workflows/unittest-flux.yml
deleted file mode 100644
index 14fca90c..00000000
--- a/.github/workflows/unittest-flux.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-# This workflow is used to run the unittest of pyiron
-
-name: Unittests-flux
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      matrix:
-        include:
-        - operating-system: ubuntu-latest
-          python-version: '3.11'
-          label: linux-64-py-3-11-openmpi
-          prefix: /Users/runner/miniconda3/envs/my-env
-          environment-file: .ci_support/environment-openmpi.yml
-
-        - operating-system: ubuntu-latest
-          python-version: '3.11'
-          label: linux-64-py-3-11-mich
-          prefix: /usr/share/miniconda3/envs/my-env
-          environment-file: .ci_support/environment-mpich.yml
-
-    steps:
-    - uses: actions/checkout@v2
-    - uses: conda-incubator/setup-miniconda@v2.2.0
-      with:
-        python-version: ${{ matrix.python-version }}
-        mamba-version: "*"
-        channels: conda-forge
-        miniforge-variant: Mambaforge
-        channel-priority: strict
-        auto-update-conda: true
-        environment-file: ${{ matrix.environment-file }}
-    - name: Test
-      shell: bash -l {0}
-      timeout-minutes: 5
-      run: |
-        mamba install -y flux-core coverage
-        pip install versioneer[toml]==0.29
-        pip install . --no-deps --no-build-isolation
-        cd tests
-        coverage run --omit pympipool/_version.py -m unittest discover .
-      env:
-        OMPI_MCA_plm: 'isolated'
-        OMPI_MCA_rmaps_base_oversubscribe: 'yes'
-        OMPI_MCA_btl_vader_single_copy_mechanism: 'none'
-    - name: Test Flux
-      shell: bash -l {0}
-      timeout-minutes: 5
-      run: >
-        flux start
-        coverage run --omit pympipool/_version.py -m unittest tests/test_flux.py;
-        coverage combine
-      env:
-        OMPI_MCA_plm: 'isolated'
-        OMPI_MCA_rmaps_base_oversubscribe: 'yes'
-        OMPI_MCA_btl_vader_single_copy_mechanism: 'none'
-    - name: Coveralls
-      if:  matrix.label == 'linux-64-py-3-11-openmpi'
-      uses: coverallsapp/github-action@v2
diff --git a/.github/workflows/unittest-win.yml b/.github/workflows/unittest-openmpi-11.yml
similarity index 64%
rename from .github/workflows/unittest-win.yml
rename to .github/workflows/unittest-openmpi-11.yml
index 89320cb6..af040057 100644
--- a/.github/workflows/unittest-win.yml
+++ b/.github/workflows/unittest-openmpi-11.yml
@@ -1,6 +1,6 @@
 # This workflow is used to run the unittest of pyiron
 
-name: Unittests-msmpi
+name: Unittests-openmpi
 
 on:
   push:
@@ -14,8 +14,11 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
-        operating-system: [windows-latest]
-        python-version: ['3.11']
+        include:
+        - operating-system: macos-11
+          python-version: '3.11'
+          label: osx-11-64-py-3-11-openmpi
+          prefix: /Users/runner/miniconda3/envs/my-env
 
     steps:
     - uses: actions/checkout@v2
@@ -27,7 +30,7 @@ jobs:
         miniforge-variant: Mambaforge
         channel-priority: strict
         auto-update-conda: true
-        environment-file: .ci_support/environment-win.yml
+        environment-file: .ci_support/environment-openmpi.yml
     - name: Test
       shell: bash -l {0}
       timeout-minutes: 5
@@ -36,3 +39,7 @@ jobs:
         pip install . --no-deps --no-build-isolation
         cd tests
         python -m unittest discover .
+      env:
+        OMPI_MCA_plm: 'isolated'
+        OMPI_MCA_rmaps_base_oversubscribe: 'yes'
+        OMPI_MCA_btl_vader_single_copy_mechanism: 'none'
diff --git a/.github/workflows/unittests-old.yml b/.github/workflows/unittest-openmpi-12.yml
similarity index 66%
rename from .github/workflows/unittests-old.yml
rename to .github/workflows/unittest-openmpi-12.yml
index dc49dafd..33feb222 100644
--- a/.github/workflows/unittests-old.yml
+++ b/.github/workflows/unittest-openmpi-12.yml
@@ -1,6 +1,6 @@
 # This workflow is used to run the unittest of pyiron
 
-name: Unittest Lower Bound
+name: Unittests-openmpi
 
 on:
   push:
@@ -11,18 +11,25 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      matrix:
+        include:
+        - operating-system: macos-12
+          python-version: '3.11'
+          label: osx-12-64-py-3-11-openmpi
+          prefix: /Users/runner/miniconda3/envs/my-env
     steps:
     - uses: actions/checkout@v2
     - uses: conda-incubator/setup-miniconda@v2.2.0
       with:
-        python-version: '3.9'
+        python-version: ${{ matrix.python-version }}
         mamba-version: "*"
         channels: conda-forge
         miniforge-variant: Mambaforge
         channel-priority: strict
         auto-update-conda: true
-        environment-file: .ci_support/environment-old.yml
+        environment-file: .ci_support/environment-openmpi.yml
     - name: Test
       shell: bash -l {0}
       timeout-minutes: 5
diff --git a/.github/workflows/unittest-mpich.yml b/.github/workflows/unittest-openmpi-13.yml
similarity index 51%
rename from .github/workflows/unittest-mpich.yml
rename to .github/workflows/unittest-openmpi-13.yml
index d3731c4d..00d675c6 100644
--- a/.github/workflows/unittest-mpich.yml
+++ b/.github/workflows/unittest-openmpi-13.yml
@@ -1,6 +1,6 @@
 # This workflow is used to run the unittest of pyiron
 
-name: Unittests-mpich
+name: Unittests-openmpi
 
 on:
   push:
@@ -15,31 +15,11 @@ jobs:
     strategy:
       matrix:
         include:
-        - operating-system: macos-latest
+        - operating-system: macos-13
           python-version: '3.11'
-          label: osx-64-py-3-11-mpich
+          label: osx-13-64-py-3-11-openmpi
           prefix: /Users/runner/miniconda3/envs/my-env
 
-        - operating-system: ubuntu-latest
-          python-version: '3.11'
-          label: linux-64-py-3-11-mpich
-          prefix: /usr/share/miniconda3/envs/my-env
-
-        - operating-system: ubuntu-latest
-          python-version: '3.10'
-          label: linux-64-py-3-10-mpich
-          prefix: /usr/share/miniconda3/envs/my-env
-
-        - operating-system: ubuntu-latest
-          python-version: 3.9
-          label: linux-64-py-3-9-mpich
-          prefix: /usr/share/miniconda3/envs/my-env
-
-        - operating-system: ubuntu-latest
-          python-version: 3.8
-          label: linux-64-py-3-8-mpich
-          prefix: /usr/share/miniconda3/envs/my-env
-
     steps:
     - uses: actions/checkout@v2
     - uses: conda-incubator/setup-miniconda@v2.2.0
@@ -50,7 +30,7 @@ jobs:
         miniforge-variant: Mambaforge
         channel-priority: strict
         auto-update-conda: true
-        environment-file: .ci_support/environment-mpich.yml
+        environment-file: .ci_support/environment-openmpi.yml
     - name: Test
       shell: bash -l {0}
       timeout-minutes: 5
@@ -59,3 +39,7 @@ jobs:
         pip install . --no-deps --no-build-isolation
         cd tests
         python -m unittest discover .
+      env:
+        OMPI_MCA_plm: 'isolated'
+        OMPI_MCA_rmaps_base_oversubscribe: 'yes'
+        OMPI_MCA_btl_vader_single_copy_mechanism: 'none'
diff --git a/.github/workflows/unittest-openmpi.yml b/.github/workflows/unittest-openmpi-latest.yml
similarity index 61%
rename from .github/workflows/unittest-openmpi.yml
rename to .github/workflows/unittest-openmpi-latest.yml
index d375e9ca..a9d81c58 100644
--- a/.github/workflows/unittest-openmpi.yml
+++ b/.github/workflows/unittest-openmpi-latest.yml
@@ -17,28 +17,8 @@ jobs:
         include:
         - operating-system: macos-latest
           python-version: '3.11'
-          label: osx-64-py-3-11-openmpi
+          label: osx-latest-64-py-3-11-openmpi
           prefix: /Users/runner/miniconda3/envs/my-env
-          
-        - operating-system: ubuntu-latest
-          python-version: '3.11'
-          label: linux-64-py-3-11-openmpi
-          prefix: /usr/share/miniconda3/envs/my-env
-
-        - operating-system: ubuntu-latest
-          python-version: '3.10'
-          label: linux-64-py-3-10-openmpi
-          prefix: /usr/share/miniconda3/envs/my-env
-
-        - operating-system: ubuntu-latest
-          python-version: 3.9
-          label: linux-64-py-3-9-openmpi
-          prefix: /usr/share/miniconda3/envs/my-env
-
-        - operating-system: ubuntu-latest
-          python-version: 3.8
-          label: linux-64-py-3-8-openmpi
-          prefix: /usr/share/miniconda3/envs/my-env
 
     steps:
     - uses: actions/checkout@v2