diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 73cbd4c7..56f5be8f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -38,9 +38,8 @@ jobs:
           # - system: X10
           - system: OPENMP
           - system: SPARK
-          # - system: OMPSS
-          # - system: OMPSS2
-          #   hwloc: 1
+          - system: OMPSS
+            hwloc: 1
           - system: SWIFT
           - system: TENSORFLOW
           - system: DASK
@@ -65,4 +64,4 @@ jobs:
           # CC_FLAGS: "-Wno-unused-command-line-argument"
           # Disable features by default, specify explicit what to use in each build
           DEFAULT_FEATURES: 0
-        timeout-minutes: 90
+        timeout-minutes: 150
diff --git a/build_all.sh b/build_all.sh
index e952aed1..9e737ac4 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -194,7 +194,7 @@ if [[ $USE_STARPU -eq 1 ]]; then
             starpu_configure_flags+=(--without-hwloc)
         fi
         pushd build
-        PKG_CONFIG_PATH=$HWLOC_DIR/lib/pkgconfig "$STARPU_SRC_DIR"/configure --prefix=$STARPU_DIR "${starpu_configure_flags[@]}"
+        "$STARPU_SRC_DIR"/configure --prefix=$STARPU_DIR "${starpu_configure_flags[@]}"
         make -j$THREADS
         make install
         popd
@@ -340,58 +340,69 @@ if [[ $USE_OPENMP -eq 1 ]]; then
 fi
 
 if [[ $USE_OMPSS -eq 1 ]]; then
-    pushd "$NANOS_SRC_DIR"
+    pushd "$OMPSS_NOSV_SRC_DIR"
     if [[ ! -d build ]]; then
         mkdir build
-        cd build
-        ../configure --prefix=$NANOS_PREFIX --disable-instrumentation --disable-debug
+        pushd build
+        ../configure --prefix=$OMPSS_TARGET
         make -j$THREADS
         make install
+        popd
+        # Hack: remove the build directory and remake it to track whether we've built or not
+        rm -rf build
+        mkdir build
     fi
     popd
 
-    pushd "$MERCURIUM_SRC_DIR"
+    pushd "$OMPSS_NANOS6_SRC_DIR"
     if [[ ! -d build ]]; then
         mkdir build
-        cd build
-        ../configure --prefix=$MERCURIUM_PREFIX --enable-ompss --with-nanox=$NANOS_PREFIX
+        pushd build
+        ../configure --prefix=$OMPSS_TARGET --with-boost=/usr --with-hwloc=pkgconfig
+        make all -j$THREADS
+        make install -j$THREADS
+        popd
+        # Hack: remove the build directory and remake it to track whether we've built or not
+        rm -rf build
+        mkdir build
+    fi
+    popd
+
+    pushd "$OMPSS_NODES_SRC_DIR"
+    if [[ ! -d build ]]; then
+        mkdir build
+        pushd build
+        ../configure --prefix=$OMPSS_TARGET --with-nosv=$OMPSS_TARGET --with-boost=/usr
         make -j$THREADS
         make install
+        popd
+        # Hack: remove the build directory and remake it to track whether we've built or not
+        rm -rf build
+        mkdir build
     fi
     popd
 
-    export PATH=$NANOS_PREFIX/bin:$MERCURIUM_PREFIX/bin:$PATH
-    export LD_LIBRARY_PATH=$NANOS_PREFIX/lib:$MERCURIUM_PREFIX/lib:$LD_LIBRARY_PATH
-    make -C ompss clean
-    make -C ompss -j$THREADS
-fi
-
-if [[ $USE_OMPSS2 -eq 1 ]]; then
-    # pushd "$BOOST_SRC_DIR"
-    # ./bootstrap.sh --prefix=$OMPSS2_TARGET
-    # ./b2 install
-    # popd
-
-    pushd "$OMPSS2_NANOS6_SRC_DIR"
-    autoreconf -fiv
-    mkdir -p build
-    cd build
-    PKG_CONFIG_PATH=$HWLOC_DIR/lib/pkgconfig ../configure --prefix=$OMPSS2_TARGET --with-boost=/usr
-    make all -j$THREADS
-    make install -j$THREADS
-    popd
-    
-    pushd "$OMPSS2_MCXX_SRC_DIR"
-    autoreconf -fiv
-    mkdir -p build
-    cd build
-    ../configure --prefix=$OMPSS2_TARGET --enable-ompss-2 --with-nanos6=$OMPSS2_TARGET
-    make -j$THREADS
-    make install
+    pushd "$OMPSS_LLVM_SRC_DIR"
+    if [[ ! -d build ]]; then
+        cmake -S llvm -B build \
+              -DCMAKE_BUILD_TYPE=Release \
+              -DCMAKE_INSTALL_PREFIX=$OMPSS_TARGET \
+              -DLLVM_ENABLE_PROJECTS=clang \
+              -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON \
+              -DCLANG_DEFAULT_OMPSS2_RUNTIME=libnanos6 \
+              -DCLANG_DEFAULT_NANOS6_HOME=$OMPSS_TARGET \
+              -DCLANG_DEFAULT_NODES_HOME=$OMPSS_TARGET \
+              -DCLANG_DEFAULT_NOSV_HOME=$OMPSS_TARGET
+        make -C build -j$THREADS
+        make -C build install
+        # Hack: remove the build directory and remake it to track whether we've built or not
+        rm -rf build
+        mkdir build
+    fi
     popd
 
-    make -C ompss2 clean
-    make -C ompss2 -j$THREADS
+    make -C ompss clean
+    make -C ompss -j$THREADS
 fi
 
 (if [[ $USE_SPARK -eq 1 ]]; then
diff --git a/ci.sh b/ci.sh
index be5958fb..abb317a4 100755
--- a/ci.sh
+++ b/ci.sh
@@ -19,10 +19,10 @@ if [[ "$(uname)" = "Linux" ]]; then
     sudo apt-get install -qq clang-18 libclang-18-dev libclang-cpp18-dev llvm-18-dev libedit-dev libncurses5-dev zlib1g-dev
     export CMAKE_PREFIX_PATH=/usr/lib/llvm-18:/usr/share/llvm-18
   fi
-  if [[ $USE_OMPSS2 -eq 1 ]]; then
+  if [[ $USE_OMPSS -eq 1 ]]; then
     sudo apt-get install -qq libnuma-dev gperf libboost1.74-dev
   fi
-  if [[ $USE_OMPSS2 -eq 1 || $USE_HPX -eq 1 ]]; then
+  if [[ $USE_HPX -eq 1 ]]; then
     sudo apt-get install -qq libboost1.74-dev
   fi
 fi
diff --git a/get_deps.sh b/get_deps.sh
index 2cf19d34..f12c7d7c 100755
--- a/get_deps.sh
+++ b/get_deps.sh
@@ -73,7 +73,6 @@ export USE_CHAPEL=${USE_CHAPEL:-$DEFAULT_FEATURES}
 export USE_X10=${USE_X10:-$DEFAULT_FEATURES}
 export USE_OPENMP=${USE_OPENMP:-$DEFAULT_FEATURES}
 export USE_OMPSS=${USE_OMPSS:-$DEFAULT_FEATURES}
-export USE_OMPSS2=${USE_OMPSS2:-$DEFAULT_FEATURES}
 export USE_SPARK=${USE_SPARK:-$DEFAULT_FEATURES}
 export USE_SWIFT=${USE_SWIFT:-$DEFAULT_FEATURES}
 export USE_TENSORFLOW=${USE_TENSORFLOW:-$DEFAULT_FEATURES}
@@ -108,14 +107,15 @@ if [[ $TASKBENCH_USE_HWLOC -eq 1 && -z $CI ]]; then
     export HWLOC_DL_DIR="$TASKBENCH_DEPS_DIR"/hwloc
     cat >>deps/env.sh <<EOF
 export HWLOC_DL_DIR="\$TASKBENCH_DEPS_DIR"/hwloc
-export HWLOC_SRC_DIR=$HWLOC_DL_DIR/hwloc-1.11.13
-export HWLOC_DIR=$HWLOC_DL_DIR/install
+export HWLOC_SRC_DIR="\$HWLOC_DL_DIR"/hwloc-1.11.13
+export HWLOC_DIR="\$HWLOC_DL_DIR"/install
+export PKG_CONFIG_PATH="\$PKG_CONFIG_PATH:\$HWLOC_DIR"/lib/pkgconfig
 
 EOF
-    wget -nv https://download.open-mpi.org/release/hwloc/v1.11/hwloc-1.11.13.tar.gz
+    wget -nv https://download.open-mpi.org/release/hwloc/v2.12/hwloc-2.12.2.tar.gz
     mkdir -p "$HWLOC_DL_DIR"
-    tar -zxf hwloc-1.11.13.tar.gz -C "$HWLOC_DL_DIR"
-    rm hwloc-1.11.13.tar.gz
+    tar -zxf hwloc-2.12.2.tar.gz -C "$HWLOC_DL_DIR"
+    rm hwloc-2.12.2.tar.gz
 fi
 
 if [[ $USE_LEGION -eq 1 || $USE_PYGION -eq 1 || $USE_REGENT -eq 1 ]]; then
@@ -333,39 +333,19 @@ if [[ $USE_OMPSS -eq 1 ]]; then
     export OMPSS_DL_DIR="$TASKBENCH_DEPS_DIR"/ompss
     cat >>deps/env.sh <<EOF
 export OMPSS_DL_DIR="\$TASKBENCH_DEPS_DIR"/ompss
-export NANOS_SRC_DIR="\$OMPSS_DL_DIR"/nanox-0.15
-export NANOS_PREFIX="\$OMPSS_DL_DIR"/nanox-0.15/install
-export MERCURIUM_SRC_DIR="\$OMPSS_DL_DIR"/mcxx-2.3.0
-export MERCURIUM_PREFIX="\$OMPSS_DL_DIR"/mcxx-2.3.0/install
+export OMPSS_TARGET="\$OMPSS_DL_DIR"
+export OMPSS_NANOS6_SRC_DIR="\$OMPSS_DL_DIR"/nanos6-4.3
+export OMPSS_NOSV_SRC_DIR="\$OMPSS_DL_DIR"/nos-v-4.0.0
+export OMPSS_NODES_SRC_DIR="\$OMPSS_DL_DIR"/nodes-1.4.0
+export OMPSS_LLVM_SRC_DIR="\$OMPSS_DL_DIR"/llvm-22.0.0git
+export PATH="\$OMPSS_TARGET/bin:\$PATH"
+export LD_LIBRARY_PATH="\$OMPSS_TARGET/lib:\$LD_LIBRARY_PATH"
 
 EOF
     mkdir -p "$OMPSS_DL_DIR"
-    wget -nv https://pm.bsc.es/ftp/ompss/releases/ompss-19.06.tar.gz
-    tar -zxf ompss-19.06.tar.gz -C "$OMPSS_DL_DIR" --strip-components 1
-    rm -rf ompss-19.06.tar.gz
-fi
-
-if [[ $USE_OMPSS2 -eq 1 ]]; then
-    export OMPSS2_DL_DIR="$TASKBENCH_DEPS_DIR"/ompss2
-    cat >>deps/env.sh <<EOF
-export OMPSS2_DL_DIR="\$TASKBENCH_DEPS_DIR"/ompss2
-export OMPSS2_TARGET="\$OMPSS2_DL_DIR"
-export OMPSS2_NANOS6_SRC_DIR="\$OMPSS2_DL_DIR"/ompss2-release/nanos6
-export OMPSS2_MCXX_SRC_DIR="\$OMPSS2_DL_DIR"/ompss2-release/mcxx
-export BOOST_SRC_DIR="\$OMPSS2_DL_DIR"/boost_1_68_0
-
-EOF
-    mkdir -p "$OMPSS2_DL_DIR"
-    git clone -b 2021.11.1 --depth 1 https://github.com/bsc-pm/ompss-2-releases.git "$OMPSS2_DL_DIR/ompss2-release"
-    # Note: don't initialize llvm submodule, it's large and not needed
-    for m in nanos6 mcxx; do
-        git -C "$OMPSS2_DL_DIR/ompss2-release" submodule update --init --recursive --depth 1 $m
-    done
-    
-    # wget -nv https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.tar.gz
-    # tar -zxf boost_1_68_0.tar.gz -C "$OMPSS2_DL_DIR"
-    # rm -rf boost_1_68_0.tar.gz
-    cat /usr/include/boost/version.hpp | grep "BOOST_LIB_VERSION"
+    wget -nv https://pm.bsc.es/ftp/ompss-2/releases/ompss-2-2025.11.tar.gz
+    tar -zxf ompss-2-2025.11.tar.gz -C "$OMPSS_DL_DIR" --strip-components 1
+    rm ompss-2-2025.11.tar.gz
 fi
 
 if [[ $USE_SPARK -eq 1 ]]; then
diff --git a/ompss/Makefile b/ompss/Makefile
index db6fdf4e..ff98bfe2 100644
--- a/ompss/Makefile
+++ b/ompss/Makefile
@@ -1,9 +1,11 @@
 DEBUG ?= 0
 
-MCXX = mcxx
+MCXX = $(OMPSS_TARGET)/bin/clang++
 
-CXXFLAGS = -DOMPSS --ompss -std=c++11 -Wall -Wno-unused -mcmodel=large --no-copy-deps
-LDFLAGS  = --ompss -std=c++11 -Wall -Wno-unused -mcmodel=large --no-copy-deps
+GCC_INSTALL_DIR := $(patsubst %/,%,$(dir $(shell g++ -print-libgcc-file-name)))
+
+CXXFLAGS = -fompss-2 -std=c++11 -Wall -Wno-unused --gcc-install-dir=$(GCC_INSTALL_DIR)
+LDFLAGS  = -fompss-2 -std=c++11 -Wall -Wno-unused --gcc-install-dir=$(GCC_INSTALL_DIR)
 
 ifeq ($(strip $(DEBUG)),1)
 CXXFLAGS += -g -O0 -mavx
diff --git a/ompss/main.cc b/ompss/main.cc
index ba8eaabb..c8717036 100644
--- a/ompss/main.cc
+++ b/ompss/main.cc
@@ -1,5 +1,4 @@
 #include <assert.h>
-#include <omp.h>
 #include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
@@ -13,24 +12,9 @@
 
 #define USE_CORE_VERIFICATION
 
-#if defined(OMPSS)
-#include <omp.h>
-#define OMPSS_TASKWAIT #pragma omp taskwait
-#define OMPSS_TASK_DEPEND #pragma omp task depend
-inline int ompss_get_thread_num() { return omp_get_thread_num(); }
-
-inline void ompss_set_num_threads(int nb_threads)
-{
-  omp_set_num_threads(nb_threads);
-}
-#elif defined(OMPSS2)
 #include <nanos6/debug.h>
-#define OMPSS_TASKWAIT #pragma oss taskwait
-#define OMPSS_TASK_DEPEND #pragma oss task depend
-inline int ompss_get_thread_num() { return nanos6_get_current_virtual_cpu(); }
 
-inline void ompss_set_num_threads(int nb_threads) {}
-#endif
+inline int ompss_get_thread_num() { return nanos6_get_current_virtual_cpu(); }
 
 typedef struct tile_s {
   float dep;
@@ -459,7 +443,6 @@ OmpSsApp::OmpSsApp(int argc, char **argv) : App(argc, argv)
   }
 
   // omp_set_dynamic(1);
-  ompss_set_num_threads(nb_workers);
 }
 
 OmpSsApp::~OmpSsApp()
@@ -506,7 +489,7 @@ void OmpSsApp::execute_main_loop()
     //}
   }
 
-  OMPSS_TASKWAIT
+#pragma oss taskwait
 
   double elapsed = Timer::time_end();
   report_timing(elapsed);
@@ -584,7 +567,7 @@ void OmpSsApp::insert_task(std::vector<task_args_t> args, payload_t payload,
   switch (num_args) {
   case 1:
     {
-      OMPSS_TASK_DEPEND(inout : mat[y0 * matrix[graph_id].N + x0])
+#pragma oss task depend(inout : mat[y0 * matrix[graph_id].N + x0])
       task1(&mat[y0 * matrix[graph_id].N + x0], payload);
       break;
     }
@@ -593,10 +576,10 @@ void OmpSsApp::insert_task(std::vector<task_args_t> args, payload_t payload,
     {
       int x1 = args[1].x;
       int y1 = args[1].y;
-      OMPSS_TASK_DEPEND(in : mat[y1 * matrix[graph_id].N + x1])
-      depend(inout : mat[y0 * matrix[graph_id].N + x0])
-          task2(&mat[y0 * matrix[graph_id].N + x0],
-                &mat[y1 * matrix[graph_id].N + x1], payload);
+#pragma oss task depend(in : mat[y1 * matrix[graph_id].N + x1]) \
+    depend(inout : mat[y0 * matrix[graph_id].N + x0])
+      task2(&mat[y0 * matrix[graph_id].N + x0],
+            &mat[y1 * matrix[graph_id].N + x1], payload);
       break;
     }
 
@@ -606,12 +589,12 @@ void OmpSsApp::insert_task(std::vector<task_args_t> args, payload_t payload,
       int y1 = args[1].y;
       int x2 = args[2].x;
       int y2 = args[2].y;
-      OMPSS_TASK_DEPEND(in : mat[y1 * matrix[graph_id].N + x1])
-      depend(in : mat[y2 * matrix[graph_id].N + x2])
-          depend(inout : mat[y0 * matrix[graph_id].N + x0])
-              task3(&mat[y0 * matrix[graph_id].N + x0],
-                    &mat[y1 * matrix[graph_id].N + x1],
-                    &mat[y2 * matrix[graph_id].N + x2], payload);
+#pragma oss task depend(in : mat[y1 * matrix[graph_id].N + x1]) \
+    depend(in : mat[y2 * matrix[graph_id].N + x2])              \
+        depend(inout : mat[y0 * matrix[graph_id].N + x0])
+      task3(&mat[y0 * matrix[graph_id].N + x0],
+            &mat[y1 * matrix[graph_id].N + x1],
+            &mat[y2 * matrix[graph_id].N + x2], payload);
       break;
     }
 
@@ -623,14 +606,14 @@ void OmpSsApp::insert_task(std::vector<task_args_t> args, payload_t payload,
       int y2 = args[2].y;
       int x3 = args[3].x;
       int y3 = args[3].y;
-      OMPSS_TASK_DEPEND(in : mat[y1 * matrix[graph_id].N + x1])
-      depend(in : mat[y2 * matrix[graph_id].N + x2])
-          depend(in : mat[y3 * matrix[graph_id].N + x3])
-              depend(inout : mat[y0 * matrix[graph_id].N + x0])
-                  task4(&mat[y0 * matrix[graph_id].N + x0],
-                        &mat[y1 * matrix[graph_id].N + x1],
-                        &mat[y2 * matrix[graph_id].N + x2],
-                        &mat[y3 * matrix[graph_id].N + x3], payload);
+#pragma oss task depend(in : mat[y1 * matrix[graph_id].N + x1]) \
+    depend(in : mat[y2 * matrix[graph_id].N + x2])              \
+        depend(in : mat[y3 * matrix[graph_id].N + x3])          \
+            depend(inout : mat[y0 * matrix[graph_id].N + x0])
+      task4(&mat[y0 * matrix[graph_id].N + x0],
+            &mat[y1 * matrix[graph_id].N + x1],
+            &mat[y2 * matrix[graph_id].N + x2],
+            &mat[y3 * matrix[graph_id].N + x3], payload);
       break;
     }
 
@@ -644,16 +627,16 @@ void OmpSsApp::insert_task(std::vector<task_args_t> args, payload_t payload,
       int y3 = args[3].y;
       int x4 = args[4].x;
       int y4 = args[4].y;
-      OMPSS_TASK_DEPEND(in : mat[y1 * matrix[graph_id].N + x1])
-      depend(in : mat[y2 * matrix[graph_id].N + x2])
-          depend(in : mat[y3 * matrix[graph_id].N + x3])
-              depend(in : mat[y4 * matrix[graph_id].N + x4])
-                  depend(inout : mat[y0 * matrix[graph_id].N + x0])
-                      task5(&mat[y0 * matrix[graph_id].N + x0],
-                            &mat[y1 * matrix[graph_id].N + x1],
-                            &mat[y2 * matrix[graph_id].N + x2],
-                            &mat[y3 * matrix[graph_id].N + x3],
-                            &mat[y4 * matrix[graph_id].N + x4], payload);
+#pragma oss task depend(in : mat[y1 * matrix[graph_id].N + x1]) \
+    depend(in : mat[y2 * matrix[graph_id].N + x2])              \
+        depend(in : mat[y3 * matrix[graph_id].N + x3])          \
+            depend(in : mat[y4 * matrix[graph_id].N + x4])      \
+                depend(inout : mat[y0 * matrix[graph_id].N + x0])
+      task5(&mat[y0 * matrix[graph_id].N + x0],
+            &mat[y1 * matrix[graph_id].N + x1],
+            &mat[y2 * matrix[graph_id].N + x2],
+            &mat[y3 * matrix[graph_id].N + x3],
+            &mat[y4 * matrix[graph_id].N + x4], payload);
       break;
     }
 
@@ -669,18 +652,18 @@ void OmpSsApp::insert_task(std::vector<task_args_t> args, payload_t payload,
       int y4 = args[4].y;
       int x5 = args[5].x;
       int y5 = args[5].y;
-      OMPSS_TASK_DEPEND(in : mat[y1 * matrix[graph_id].N + x1])
-      depend(in : mat[y2 * matrix[graph_id].N + x2])
-          depend(in : mat[y3 * matrix[graph_id].N + x3])
-              depend(in : mat[y4 * matrix[graph_id].N + x4])
-                  depend(in : mat[y5 * matrix[graph_id].N + x5])
-                      depend(inout : mat[y0 * matrix[graph_id].N + x0])
-                          task6(&mat[y0 * matrix[graph_id].N + x0],
-                                &mat[y1 * matrix[graph_id].N + x1],
-                                &mat[y2 * matrix[graph_id].N + x2],
-                                &mat[y3 * matrix[graph_id].N + x3],
-                                &mat[y4 * matrix[graph_id].N + x4],
-                                &mat[y5 * matrix[graph_id].N + x5], payload);
+#pragma oss task depend(in : mat[y1 * matrix[graph_id].N + x1]) \
+    depend(in : mat[y2 * matrix[graph_id].N + x2])              \
+        depend(in : mat[y3 * matrix[graph_id].N + x3])          \
+            depend(in : mat[y4 * matrix[graph_id].N + x4])      \
+                depend(in : mat[y5 * matrix[graph_id].N + x5])  \
+                    depend(inout : mat[y0 * matrix[graph_id].N + x0])
+      task6(&mat[y0 * matrix[graph_id].N + x0],
+            &mat[y1 * matrix[graph_id].N + x1],
+            &mat[y2 * matrix[graph_id].N + x2],
+            &mat[y3 * matrix[graph_id].N + x3],
+            &mat[y4 * matrix[graph_id].N + x4],
+            &mat[y5 * matrix[graph_id].N + x5], payload);
       break;
     }
 
@@ -698,21 +681,21 @@ void OmpSsApp::insert_task(std::vector<task_args_t> args, payload_t payload,
       int y5 = args[5].y;
       int x6 = args[6].x;
       int y6 = args[6].y;
-      OMPSS_TASK_DEPEND(in : mat[y1 * matrix[graph_id].N + x1])
-      depend(in : mat[y2 * matrix[graph_id].N + x2])
-          depend(in : mat[y3 * matrix[graph_id].N + x3])
-              depend(in : mat[y4 * matrix[graph_id].N + x4])
-                  depend(in : mat[y5 * matrix[graph_id].N + x5])
-                      depend(in : mat[y6 * matrix[graph_id].N + x6])
-                          depend(inout : mat[y0 * matrix[graph_id].N + x0])
-                              untied mergeable task7(
-                                  &mat[y0 * matrix[graph_id].N + x0],
-                                  &mat[y1 * matrix[graph_id].N + x1],
-                                  &mat[y2 * matrix[graph_id].N + x2],
-                                  &mat[y3 * matrix[graph_id].N + x3],
-                                  &mat[y4 * matrix[graph_id].N + x4],
-                                  &mat[y5 * matrix[graph_id].N + x5],
-                                  &mat[y6 * matrix[graph_id].N + x6], payload);
+#pragma oss task depend(in : mat[y1 * matrix[graph_id].N + x1])           \
+    depend(in : mat[y2 * matrix[graph_id].N + x2])                        \
+        depend(in : mat[y3 * matrix[graph_id].N + x3])                    \
+            depend(in : mat[y4 * matrix[graph_id].N + x4])                \
+                depend(in : mat[y5 * matrix[graph_id].N + x5])            \
+                    depend(in : mat[y6 * matrix[graph_id].N + x6])        \
+                        depend(inout : mat[y0 * matrix[graph_id].N + x0]) \
+                            untied mergeable
+      task7(&mat[y0 * matrix[graph_id].N + x0],
+            &mat[y1 * matrix[graph_id].N + x1],
+            &mat[y2 * matrix[graph_id].N + x2],
+            &mat[y3 * matrix[graph_id].N + x3],
+            &mat[y4 * matrix[graph_id].N + x4],
+            &mat[y5 * matrix[graph_id].N + x5],
+            &mat[y6 * matrix[graph_id].N + x6], payload);
       break;
     }
 
@@ -732,24 +715,23 @@ void OmpSsApp::insert_task(std::vector<task_args_t> args, payload_t payload,
       int y6 = args[6].y;
       int x7 = args[7].x;
       int y7 = args[7].y;
-      OMPSS_TASK_DEPEND(in : mat[y1 * matrix[graph_id].N + x1])
-      depend(in : mat[y2 * matrix[graph_id].N + x2])
-          depend(in : mat[y3 * matrix[graph_id].N + x3])
-              depend(in : mat[y4 * matrix[graph_id].N + x4])
-                  depend(in : mat[y5 * matrix[graph_id].N + x5])
-                      depend(in : mat[y6 * matrix[graph_id].N + x6])
-                          depend(in : mat[y7 * matrix[graph_id].N + x7])
-                              depend(inout : mat[y0 * matrix[graph_id].N + x0])
-                                  untied mergeable task8(
-                                      &mat[y0 * matrix[graph_id].N + x0],
-                                      &mat[y1 * matrix[graph_id].N + x1],
-                                      &mat[y2 * matrix[graph_id].N + x2],
-                                      &mat[y3 * matrix[graph_id].N + x3],
-                                      &mat[y4 * matrix[graph_id].N + x4],
-                                      &mat[y5 * matrix[graph_id].N + x5],
-                                      &mat[y6 * matrix[graph_id].N + x6],
-                                      &mat[y7 * matrix[graph_id].N + x7],
-                                      payload);
+#pragma oss task depend(in : mat[y1 * matrix[graph_id].N + x1])               \
+    depend(in : mat[y2 * matrix[graph_id].N + x2])                            \
+        depend(in : mat[y3 * matrix[graph_id].N + x3])                        \
+            depend(in : mat[y4 * matrix[graph_id].N + x4])                    \
+                depend(in : mat[y5 * matrix[graph_id].N + x5])                \
+                    depend(in : mat[y6 * matrix[graph_id].N + x6])            \
+                        depend(in : mat[y7 * matrix[graph_id].N + x7])        \
+                            depend(inout : mat[y0 * matrix[graph_id].N + x0]) \
+                                untied mergeable
+      task8(&mat[y0 * matrix[graph_id].N + x0],
+            &mat[y1 * matrix[graph_id].N + x1],
+            &mat[y2 * matrix[graph_id].N + x2],
+            &mat[y3 * matrix[graph_id].N + x3],
+            &mat[y4 * matrix[graph_id].N + x4],
+            &mat[y5 * matrix[graph_id].N + x5],
+            &mat[y6 * matrix[graph_id].N + x6],
+            &mat[y7 * matrix[graph_id].N + x7], payload);
       break;
     }
 
@@ -771,26 +753,25 @@ void OmpSsApp::insert_task(std::vector<task_args_t> args, payload_t payload,
       int y7 = args[7].y;
       int x8 = args[8].x;
       int y8 = args[8].y;
-      OMPSS_TASK_DEPEND(in : mat[y1 * matrix[graph_id].N + x1])
-      depend(in : mat[y2 * matrix[graph_id].N + x2])
-          depend(in : mat[y3 * matrix[graph_id].N + x3])
-              depend(in : mat[y4 * matrix[graph_id].N + x4])
-                  depend(in : mat[y5 * matrix[graph_id].N + x5])
-                      depend(in : mat[y6 * matrix[graph_id].N + x6])
-                          depend(in : mat[y7 * matrix[graph_id].N + x7]) depend(
-                              in : mat[y8 * matrix[graph_id].N + x8])
-                              depend(inout : mat[y0 * matrix[graph_id].N + x0])
-                                  untied mergeable task9(
-                                      &mat[y0 * matrix[graph_id].N + x0],
-                                      &mat[y1 * matrix[graph_id].N + x1],
-                                      &mat[y2 * matrix[graph_id].N + x2],
-                                      &mat[y3 * matrix[graph_id].N + x3],
-                                      &mat[y4 * matrix[graph_id].N + x4],
-                                      &mat[y5 * matrix[graph_id].N + x5],
-                                      &mat[y6 * matrix[graph_id].N + x6],
-                                      &mat[y7 * matrix[graph_id].N + x7],
-                                      &mat[y8 * matrix[graph_id].N + x8],
-                                      payload);
+#pragma oss task depend(in : mat[y1 * matrix[graph_id].N + x1])                \
+    depend(in : mat[y2 * matrix[graph_id].N + x2])                             \
+        depend(in : mat[y3 * matrix[graph_id].N + x3])                         \
+            depend(in : mat[y4 * matrix[graph_id].N + x4])                     \
+                depend(in : mat[y5 * matrix[graph_id].N + x5])                 \
+                    depend(in : mat[y6 * matrix[graph_id].N + x6])             \
+                        depend(in : mat[y7 * matrix[graph_id].N + x7]) depend( \
+                            in : mat[y8 * matrix[graph_id].N + x8])            \
+                            depend(inout : mat[y0 * matrix[graph_id].N + x0])  \
+                                untied mergeable
+      task9(&mat[y0 * matrix[graph_id].N + x0],
+            &mat[y1 * matrix[graph_id].N + x1],
+            &mat[y2 * matrix[graph_id].N + x2],
+            &mat[y3 * matrix[graph_id].N + x3],
+            &mat[y4 * matrix[graph_id].N + x4],
+            &mat[y5 * matrix[graph_id].N + x5],
+            &mat[y6 * matrix[graph_id].N + x6],
+            &mat[y7 * matrix[graph_id].N + x7],
+            &mat[y8 * matrix[graph_id].N + x8], payload);
       break;
     }
 
@@ -814,28 +795,27 @@ void OmpSsApp::insert_task(std::vector<task_args_t> args, payload_t payload,
       int y8 = args[8].y;
       int x9 = args[9].x;
       int y9 = args[9].y;
-      OMPSS_TASK_DEPEND(in : mat[y1 * matrix[graph_id].N + x1])
-      depend(in : mat[y2 * matrix[graph_id].N + x2])
-          depend(in : mat[y3 * matrix[graph_id].N + x3])
-              depend(in : mat[y4 * matrix[graph_id].N + x4])
-                  depend(in : mat[y5 * matrix[graph_id].N + x5])
-                      depend(in : mat[y6 * matrix[graph_id].N + x6]) depend(
-                          in : mat[y7 * matrix[graph_id].N + x7])
-                          depend(in : mat[y8 * matrix[graph_id].N + x8]) depend(
-                              in : mat[y9 * matrix[graph_id].N + x9])
-                              depend(inout : mat[y0 * matrix[graph_id].N + x0])
-                                  untied mergeable task10(
-                                      &mat[y0 * matrix[graph_id].N + x0],
-                                      &mat[y1 * matrix[graph_id].N + x1],
-                                      &mat[y2 * matrix[graph_id].N + x2],
-                                      &mat[y3 * matrix[graph_id].N + x3],
-                                      &mat[y4 * matrix[graph_id].N + x4],
-                                      &mat[y5 * matrix[graph_id].N + x5],
-                                      &mat[y6 * matrix[graph_id].N + x6],
-                                      &mat[y7 * matrix[graph_id].N + x7],
-                                      &mat[y8 * matrix[graph_id].N + x8],
-                                      &mat[y9 * matrix[graph_id].N + x9],
-                                      payload);
+#pragma oss task depend(in : mat[y1 * matrix[graph_id].N + x1])                \
+    depend(in : mat[y2 * matrix[graph_id].N + x2])                             \
+        depend(in : mat[y3 * matrix[graph_id].N + x3])                         \
+            depend(in : mat[y4 * matrix[graph_id].N + x4])                     \
+                depend(in : mat[y5 * matrix[graph_id].N + x5])                 \
+                    depend(in : mat[y6 * matrix[graph_id].N + x6]) depend(     \
+                        in : mat[y7 * matrix[graph_id].N + x7])                \
+                        depend(in : mat[y8 * matrix[graph_id].N + x8]) depend( \
+                            in : mat[y9 * matrix[graph_id].N + x9])            \
+                            depend(inout : mat[y0 * matrix[graph_id].N + x0])  \
+                                untied mergeable
+      task10(&mat[y0 * matrix[graph_id].N + x0],
+             &mat[y1 * matrix[graph_id].N + x1],
+             &mat[y2 * matrix[graph_id].N + x2],
+             &mat[y3 * matrix[graph_id].N + x3],
+             &mat[y4 * matrix[graph_id].N + x4],
+             &mat[y5 * matrix[graph_id].N + x5],
+             &mat[y6 * matrix[graph_id].N + x6],
+             &mat[y7 * matrix[graph_id].N + x7],
+             &mat[y8 * matrix[graph_id].N + x8],
+             &mat[y9 * matrix[graph_id].N + x9], payload);
       break;
     }
 
diff --git a/ompss2/Makefile b/ompss2/Makefile
deleted file mode 100644
index 27a319de..00000000
--- a/ompss2/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-DEBUG ?= 0
-
-MCXX = $(OMPSS2_TARGET)/bin/mcxx
-
-CXXFLAGS = -DOMPSS2 --ompss-2 -std=c++11 -Wall -Wno-unused -mcmodel=large --no-copy-deps
-LDFLAGS  = --ompss-2 -std=c++11 -Wall -Wno-unused -mcmodel=large --no-copy-deps
-
-ifeq ($(strip $(DEBUG)),1)
-CXXFLAGS += -g -O0 -mavx
-LDFLAGS  += -g -O0
-else
-CXXFLAGS += -O3 -march=native -mavx
-LDFLAGS  += -O3 -march=native
-endif
-
-# Include directories
-INC        = -I../core
-INC_EXT    =  
-
-# Location of the libraries.
-LIB        = 
-LIB_EXT    = 
-
-INC := $(INC) $(INC_EXT)
-LIB := $(LIB) $(LIB_EXT)
-
-CXXFLAGS += $(INC)
-
-TARGET = main
-all: $(TARGET)
-
-.PRECIOUS: %.cc %.o
-
-main.o: ../ompss/main.cc ../core/timer.h
-	$(MCXX) $(CXXFLAGS) -c $<
-
-main: main.o ../core/libcore.a
-	$(MCXX) $^ $(LIB) $(LDFLAGS) -o $@ 
-
-
-clean:
-	rm -f *.o
-	rm -f $(TARGET)
-
-.PHONY: all clean
diff --git a/test_all.sh b/test_all.sh
index 2166088a..44df6c3e 100755
--- a/test_all.sh
+++ b/test_all.sh
@@ -240,17 +240,8 @@ fi
 if [[ $USE_OMPSS -eq 1 ]]; then
     for t in "${basic_types[@]}"; do
         for k in "${kernels[@]}"; do
-            ./ompss/main -steps $steps -type $t $k
-            ./ompss/main -steps $steps -type $t $k -and -steps $steps -type $t $k
-        done
-    done
-fi
-
-if [[ $USE_OMPSS2 -eq 1 ]]; then
-    for t in "${basic_types[@]}"; do
-        for k in "${kernels[@]}"; do
-            taskset -c 0-1 ./ompss2/main -steps $steps -type $t $k
-            taskset -c 0-1 ./ompss2/main -steps $steps -type $t $k -and -steps $steps -type $t $k
+            taskset -c 0-1 ./ompss/main -steps $steps -type $t $k
+            taskset -c 0-1 ./ompss/main -steps $steps -type $t $k -and -steps $steps -type $t $k
         done
     done
 fi