diff --git a/.gitlab/includes/common.yaml b/.gitlab/includes/common.yaml
index 620c26d66..904e30761 100644
--- a/.gitlab/includes/common.yaml
+++ b/.gitlab/includes/common.yaml
@@ -49,7 +49,7 @@ variables:
   - *uenv_activate
   - mkdir -p $BUILD_DIR $INSTALL_DIR
   - |
-      CXX=`which gcc` CC=`which gcc` cmake \
+      CXX=`which g++` CC=`which gcc` cmake \
         -S $CI_PROJECT_DIR \
         -B $BUILD_DIR \
         -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
@@ -59,7 +59,6 @@ variables:
         -DARB_WITH_PROFILING=ON \
         -DARB_VECTORIZE=ON \
         -DARB_WITH_PYTHON=ON \
-        -DARB_USE_HWLOC=ON \
         -DARB_WITH_MPI=ON \
         -DARB_GPU=${ARB_GPU} \
         -DCMAKE_CUDA_ARCHITECTURES=${CUDA_ARCH} \