diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b694794c36ea1ba4e3b36fdb1d21f69716ab59fd..01eeb0b047703a9fc2fdde032875a76db977ce71 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1293,9 +1293,11 @@ msvc-14.1_MpiOnly:
    stage: deploy
    before_script:
       - 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
    after_script:
       - anaconda logout
    dependencies: []
diff --git a/utilities/conda/openmesh/build.sh b/utilities/conda/openmesh/build.sh
index 5c3f3acfdf941b19dbb76bf0f1f812ba834fc08a..1c62ffbca41243e5d6af5d83483a6c42de3757d3 100644
--- a/utilities/conda/openmesh/build.sh
+++ b/utilities/conda/openmesh/build.sh
@@ -8,6 +8,7 @@ cmake \
   -DBUILD_APPS=OFF \
   -DOPENMESH_PYTHON_VERSION=${PY_VER} \
   -DOPENMESH_BUILD_PYTHON_UNIT_TESTS=ON \
+  -DCMAKE_CXX_FLAGS="-std=c++11"\
   ..
 
 make install -j${CPU_COUNT}
diff --git a/utilities/conda/openmesh/meta.yaml b/utilities/conda/openmesh/meta.yaml
index df6a80c45d0a46b10581e8760d25238ef9274dbc..18b90c4acd370faf6492ba75000357bdcf559a7e 100644
--- a/utilities/conda/openmesh/meta.yaml
+++ b/utilities/conda/openmesh/meta.yaml
@@ -15,9 +15,10 @@ source:
 
 requirements:
   build:
-    - toolchain [linux]
+    - {{ compiler('cxx') }}
     - python
     - cmake
+    - make
     - boost
   run:
     - python
diff --git a/utilities/conda/withLbm/build.sh b/utilities/conda/withLbm/build.sh
index 6633c7718688eb107cae6903f32ee06bca8a5f72..79111539f624ed292b704b15bccf821d2dca0dbd 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
 
-CC=mpicc CXX=mpicxx cmake .. -DWALBERLA_BUILD_WITH_PYTHON=1 -DWALBERLA_BUILD_WITH_PYTHON_MODULE=1 -DWALBERLA_BUILD_WITH_PYTHON_LBM=1
+cmake .. -DWALBERLA_BUILD_WITH_PYTHON=1 -DWALBERLA_BUILD_WITH_PYTHON_MODULE=1 -DWALBERLA_BUILD_WITH_PYTHON_LBM=1 -DWALBERLA_BUILD_WITH_OPENMESH=0
 
 make -j 8 pythonModuleInstall
diff --git a/utilities/conda/withLbm/meta.yaml b/utilities/conda/withLbm/meta.yaml
index a9fa613dcba10634e81224193b2935e74e56ca88..7bba0c1b3d92d7f3bfce5a8888f88c8864aaffaa 100644
--- a/utilities/conda/withLbm/meta.yaml
+++ b/utilities/conda/withLbm/meta.yaml
@@ -1,6 +1,8 @@
 about:
   home: www.walberla.net
   license: GPLv3
+  summary: High Performance, Multi-physics Simulation Framework
+
 package:
   name: walberla-lbm
   version: {{ GIT_DESCRIBE_TAG }}
@@ -10,17 +12,19 @@ build:
 
 requirements:
   build:
+  - {{ compiler('cxx') }}
   - python
   - git
   - boost
   - cmake
-  - gcc [linux]
+  - make
   - mpich2 [linux]
+  #- openmesh
   run:
   - python >=3.6
   - boost
   - numpy
   - mpich2 [linux]
-  
+  #- openmesh
 source:
   path: ../../..
diff --git a/utilities/conda/withoutLbm/build.sh b/utilities/conda/withoutLbm/build.sh
index 7839cb748802164a1ad2dd45ecc8bdbd13752bf2..114fa1dac0f5d86433f0de399643212a791f1eb4 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
 
-CC=mpicc CXX=mpicxx cmake .. -DWALBERLA_BUILD_WITH_PYTHON=1 -DWALBERLA_BUILD_WITH_PYTHON_MODULE=1
+cmake .. -DWALBERLA_BUILD_WITH_PYTHON=1 -DWALBERLA_BUILD_WITH_PYTHON_MODULE=1 -DWALBERLA_BUILD_WITH_OPENMESH=0
 
 make -j 8 pythonModuleInstall
diff --git a/utilities/conda/withoutLbm/meta.yaml b/utilities/conda/withoutLbm/meta.yaml
index eb37c049a454ad3585fc36d425675af9a33fa948..1931c4527499078f85eca6328e93987c13eca74d 100644
--- a/utilities/conda/withoutLbm/meta.yaml
+++ b/utilities/conda/withoutLbm/meta.yaml
@@ -1,6 +1,8 @@
 about:
   home: www.walberla.net
   license: GPLv3
+  summary: High Performance, Multi-physics Simulation Framework
+
 package:
   name: walberla
   version: {{ GIT_DESCRIBE_TAG }}
@@ -10,18 +12,22 @@ build:
 
 requirements:
   build:
+  - {{ compiler('cxx') }}
   - python
   - git
   - boost
   - cmake [linux]
   - cmake >=3.7.0 [win]
-  - gcc [linux]
+  - make
   - mpich2 [linux]
   run:
   - python
   - boost
   - numpy
   - mpich2 [linux]
-  
 source:
   path: ../../..
+
+test:
+  imports:
+    - waLBerla
\ No newline at end of file
diff --git a/utilities/conda/withoutLbm/run_test.py b/utilities/conda/withoutLbm/run_test.py
new file mode 100644
index 0000000000000000000000000000000000000000..045930c4c885440fb98f62c2b76a227a965cadf9
--- /dev/null
+++ b/utilities/conda/withoutLbm/run_test.py
@@ -0,0 +1,7 @@
+import waLBerla
+
+# Check that C++ exports are available
+assert waLBerla.cpp_available
+
+# Test calling of a function taking a string (fails if there is a ABI compatibility issue)
+waLBerla.log_devel("Test successful")