diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a8240570639564873b359a38dba63b6bd503fc22..3927d881288d90034c0fd9fc0d548cf677d6f260 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1348,12 +1348,14 @@ msvc-14.1_MpiOnly:
 .conda-deploy: &conda_deploy_definition
    stage: deploy
    before_script:
+      - conda update -y conda
+      - conda update -y python
       - conda install -y conda-build anaconda-client
-      - conda install conda-build==3.0.27  # building with conda-build version 3.2.1 leads to empty package
       - anaconda login --username $CONDA_DEPLOY_USER --password $CONDA_DEPLOY_PASSWORD --hostname $CI_JOB_ID
       - conda config --set anaconda_upload yes
       - conda config --add channels lssfau
-      - conda
+      - conda -V
+      - conda build -V
    after_script:
       - anaconda logout
    dependencies: []
diff --git a/utilities/conda/openmesh/build.sh b/utilities/conda/openmesh/build.sh
index 1c62ffbca41243e5d6af5d83483a6c42de3757d3..4db2de35d704bc893d20a3c297abb8727c4360d9 100644
--- a/utilities/conda/openmesh/build.sh
+++ b/utilities/conda/openmesh/build.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+sed -i '93a#include <sys/time.h>' src/OpenMesh/Tools/Utils/conio.cc
+
 mkdir -p build && cd build
 
 cmake \
@@ -11,6 +13,8 @@ cmake \
   -DCMAKE_CXX_FLAGS="-std=c++11"\
   ..
 
+#cat src/Python/PythonLog.txt
+
 make install -j${CPU_COUNT}
 mv ${PREFIX}/lib/python/* ${SP_DIR}
 
diff --git a/utilities/conda/openmesh/meta.yaml b/utilities/conda/openmesh/meta.yaml
index 18b90c4acd370faf6492ba75000357bdcf559a7e..c47c97fa43b8a964c00d2bd994deba25d5b31c1e 100644
--- a/utilities/conda/openmesh/meta.yaml
+++ b/utilities/conda/openmesh/meta.yaml
@@ -16,9 +16,10 @@ source:
 requirements:
   build:
     - {{ compiler('cxx') }}
-    - python
     - cmake
     - make
+  host:
+    - python
     - boost
   run:
     - python
diff --git a/utilities/conda/withLbm/build.sh b/utilities/conda/withLbm/build.sh
index 79111539f624ed292b704b15bccf821d2dca0dbd..4a5e9048c00d099245ed57fb8984120acffe5f55 100644
--- a/utilities/conda/withLbm/build.sh
+++ b/utilities/conda/withLbm/build.sh
@@ -2,6 +2,6 @@ mkdir build
 cd build
 export BOOST_ROOT=$PREFIX
 
-cmake .. -DWALBERLA_BUILD_WITH_PYTHON=1 -DWALBERLA_BUILD_WITH_PYTHON_MODULE=1 -DWALBERLA_BUILD_WITH_PYTHON_LBM=1 -DWALBERLA_BUILD_WITH_OPENMESH=0
+cmake .. -DWALBERLA_BUILD_WITH_PYTHON=ON -DWALBERLA_BUILD_WITH_PYTHON_MODULE=ON -DWALBERLA_BUILD_WITH_PYTHON_LBM=ON
 
-make -j 8 pythonModuleInstall
+make -j ${CPU_COUNT} pythonModuleInstall
diff --git a/utilities/conda/withLbm/meta.yaml b/utilities/conda/withLbm/meta.yaml
index 7bba0c1b3d92d7f3bfce5a8888f88c8864aaffaa..b4b263edfd5204288ddeb390b3ca7d8f3bddccbe 100644
--- a/utilities/conda/withLbm/meta.yaml
+++ b/utilities/conda/withLbm/meta.yaml
@@ -13,18 +13,19 @@ build:
 requirements:
   build:
   - {{ compiler('cxx') }}
-  - python
   - git
-  - boost
   - cmake
   - make
+  host:
+  - python
+  - boost
   - mpich2 [linux]
-  #- openmesh
+  - openmesh
   run:
   - python >=3.6
   - boost
   - numpy
   - mpich2 [linux]
-  #- openmesh
+  - openmesh
 source:
   path: ../../..
diff --git a/utilities/conda/withoutLbm/build.sh b/utilities/conda/withoutLbm/build.sh
index 114fa1dac0f5d86433f0de399643212a791f1eb4..7fc4cc7c04b0ecf3a3c9d8203267e6b4bc7e56a3 100644
--- a/utilities/conda/withoutLbm/build.sh
+++ b/utilities/conda/withoutLbm/build.sh
@@ -2,6 +2,6 @@ mkdir build
 cd build
 export BOOST_ROOT=$PREFIX
 
-cmake .. -DWALBERLA_BUILD_WITH_PYTHON=1 -DWALBERLA_BUILD_WITH_PYTHON_MODULE=1 -DWALBERLA_BUILD_WITH_OPENMESH=0
+cmake .. -DWALBERLA_BUILD_WITH_PYTHON=ON -DWALBERLA_BUILD_WITH_PYTHON_MODULE=ON -DWALBERLA_BUILD_WITH_OPENMESH=ON
 
-make -j 8 pythonModuleInstall
+make -j ${CPU_COUNT} pythonModuleInstall
diff --git a/utilities/conda/withoutLbm/meta.yaml b/utilities/conda/withoutLbm/meta.yaml
index 1931c4527499078f85eca6328e93987c13eca74d..06276f733d3f618384d6367cded9086ca3d86a24 100644
--- a/utilities/conda/withoutLbm/meta.yaml
+++ b/utilities/conda/withoutLbm/meta.yaml
@@ -13,21 +13,24 @@ build:
 requirements:
   build:
   - {{ compiler('cxx') }}
-  - python
   - git
-  - boost
   - cmake [linux]
   - cmake >=3.7.0 [win]
   - make
+  host:
+  - python
+  - boost
   - mpich2 [linux]
+  - openmesh
   run:
   - python
   - boost
   - numpy
   - mpich2 [linux]
+  - openmesh
 source:
   path: ../../..
 
 test:
   imports:
-    - waLBerla
\ No newline at end of file
+    - waLBerla