diff --git a/etc/sit.conf b/etc/sit.conf
index b2b4aa5..2437a48 100644
--- a/etc/sit.conf
+++ b/etc/sit.conf
@@ -4,7 +4,7 @@
 SRC_POOL=${SRC_POOL:="$HOME/src"}
 
 # Working directory base path
-WORKDIR_BASE=${WORKDIR_BASE:="$HOME/work"}
+WORKDIR_BASE=${WORKDIR_BASE:="/run/user/$UID"}
 
 # Build class directory holing the sitclass
 SCLASS_DIR=${SCLASS_DIR:="$SIT_PATH/packages"}
@@ -15,7 +15,7 @@ PREFIX_BASE=${PREFIX_BASE:="$HOME/bin"}
 MAKEOPTS=${MAKEOPTS:="-j$(cat /proc/cpuinfo | grep -c processor)"}
 
 # default platform for unknown platforms
-DEFAULT_PLATFORM="laki"
+DEFAULT_PLATFORM="hawk"
 
 # default compiler
 DEFAULT_COMPILER="system"
diff --git a/packages/compiler/mcxx/mcxx-from-ompss2-release-any b/packages/compiler/mcxx/mcxx-from-ompss2-release-any
new file mode 100755
index 0000000..d8148fd
--- /dev/null
+++ b/packages/compiler/mcxx/mcxx-from-ompss2-release-any
@@ -0,0 +1,48 @@
+#!/bin/sh
+# sit class file
+#
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2013
+# Jose Gracia <gracia@hlrs.de>
+
+# libs/nanos6 and compiler/mcxx **together** form the package compiler/ompss2
+#
+
+# install instructions:
+# * set user-visible package version to ompss-2 release version
+#   e.g. OMPSS2_VERSION=2022.11
+
+# * install libs/nanos6/nanos6-from-ompss2-release (see there) 
+#   and set NANOS6_HOME pointing to it
+# * install compilers/mcxx with:
+#   VERSION=$OMPSS2_VERSION
+#   COMPILER=gnu COMPILER_VERSION=xx 
+#   PREFIX_BASE=$YOUR_PREFIX_BASE NANOX_HOME=$NANOX_HOME ./sit compiler/mcxx/mcxx-from-ompss2-release
+
+: ${CATEGORY:="compiler"}
+: ${PACKAGE:="ompss2"}
+: ${TAR_PACKAGE:="ompss-2"}
+# if VERSIOn not set assume one
+: ${VERSION:="2022.11"} 
+
+URL="https://pm.bsc.es/ompss-2"
+INSTALLER="Jose Gracia <gracia@hlrs.de>"
+
+# Archive A and package name P
+A=${TAR_PACKAGE}-${VERSION}.tar.gz
+P=${TAR_PACKAGE}-${VERSION%%-*}  # remove date suffix starting from first '-'
+
+# build with debugging symbols (0|1)
+enable_debug=${enable_debug:=0}
+
+# Other interesting configure options:
+CONFIGURE_OPTS=" \
+		--enable-ompss-2 \
+		--with-nanos6=$NANOS6_HOME \
+                --disable-static  "
+
+src_unpack() {
+        unpack
+        # SRCDIR=$SRCDIR/mcxx-2.3.0
+        # echo "Redefinig SRCDIR: " $SRCDIR
+        mv $SRCDIR/mcxx-*/* $SRCDIR/
+}
diff --git a/packages/libs/nanos6/nanos6-from-ompss2-release-any b/packages/libs/nanos6/nanos6-from-ompss2-release-any
new file mode 100644
index 0000000..dc96f93
--- /dev/null
+++ b/packages/libs/nanos6/nanos6-from-ompss2-release-any
@@ -0,0 +1,69 @@
+#!/bin/sh
+# sit class file
+#
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2013
+# Jose Gracia <gracia@hlrs.de>
+#
+
+# libs/nanos6 and compiler/mcxx **together** form the package compiler/ompss2
+#
+
+# install instructions:
+# * set user-visible package version to ompss-2 release version
+#   e.g. OMPSS2_VERSION=2022.11
+# * dependencies:
+#   * module load talp
+#   * MY_DLB_HOME=$TALP_HOME
+#   * module unload talp
+# * install libs/nanos6 with: 
+#   VERSION=$OMPSS2_VERSION \
+#   DLB_HOME=$MY_DLB_HOME \
+#   COMPILER=gnu PREFIX_BASE=$YOUR_PREFIX_BASE \
+#   enable_dlb=1 enable_extrae=0 ./sit libs/nanos6/nanos6-from-ompss2-any
+# set NANOS6_HOME pointing to this install dir            
+# * install compilers/mcxx (see there)
+
+
+: ${CATEGORY:="compiler"}
+: ${PACKAGE:="ompss2"}
+: ${TAR_PACKAGE:="ompss-2"}
+# if VERSIOn not set assume 1.0
+: ${VERSION:="2022.11"}
+
+URL="https://pm.bsc.es/ompss-2"
+INSTALLER="Jose Gracia <gracia@hlrs.de>"
+
+# Archive A and package name P
+A=${TAR_PACKAGE}-${VERSION}.tar.gz
+P=${TAR_PACKAGE}-${VERSION%%-*}  # remove date suffix starting from first '-'
+
+# enable instrumentation (0|1)
+enable_extrae=${enable_extrae:=0}
+# enable dlb
+enable_dlb=${enable_dlb:=1} 
+
+
+CONFIGURE_OPTS=" \
+	--disable-static \
+        "
+
+
+if [ $enable_extrae == 1 ] ; then
+    #module load performance/extrae
+    echo "Building with EXTRAE_HOME=$EXTRAE_HOME"
+    CONFIGURE_OPTS+=" --with-extrae=$EXTRAE_HOME"
+fi
+
+if [ $enable_dlb == 1 ] ; then
+    echo "Building with DLB_HOME=$DLB_HOME"
+    CONFIGURE_OPTS+=" --with-dlb=$DLB_HOME"
+fi
+
+
+src_unpack() {
+	unpack
+	# SRCDIR=$SRCDIR/nanos6-2.8
+	# echo "Redefinig SRCDIR: " $SRCDIR
+	mv $SRCDIR/nanos6-*/* $SRCDIR/
+}
+