diff --git a/lib/env/mahti.mk b/lib/env/mahti.mk
index d4476c2b..44bfd957 100644
--- a/lib/env/mahti.mk
+++ b/lib/env/mahti.mk
@@ -3,6 +3,7 @@
 # environment on mathi@CSC
 #
 
+
 CSCPROJECT    = project_2002688
 #  CSCPROJECT   = project_2003093
 #  CSCPROJECT   = project_2002982
@@ -13,14 +14,10 @@ OPUSHOME      = /projappl/nlpl/data/OPUS
 MOSESHOME     = ${APPLHOME}/install/mosesdecoder
 MOSESSCRIPTS  = ${MOSESHOME}/scripts
 EFLOMAL_HOME  = ${APPLHOME}/install/eflomal/
-# MARIAN_HOME   = ${APPLHOME}/install/marian/build/
 MARIAN_HOME   = ${APPLHOME}/install/marian-dev/build/
 MARIAN        = ${MARIAN_HOME}
 SPM_HOME      = ${MARIAN_HOME}
-CPU_MODULES   = gcc/10.3.0 openblas/0.3.14-omp openmpi python-env
-GPU_MODULES   = gcc/10.3.0 cuda/11.4.2 cudnn/8.0.4.30-11.0-linux-x64 openblas/0.3.14-omp openmpi/4.0.5-cuda python-env
 HPC_QUEUE     = medium
-LOADCPU       = module load ${CPU_MODULES}
 SUBMIT_PREFIX = submitcpu
 GPU           = a100
 HPC_GPUQUEUE  = gpusmall
@@ -29,11 +26,17 @@ WALLTIME      = 36
 export PATH := ${APPLHOME}/bin:${PATH}
 
 
+CPU_MODULES   = gcc/10.3.0 openblas/0.3.14-omp openmpi python-env
+GPU_MODULES   = gcc/10.3.0 cuda/11.4.2 cudnn/8.0.4.30-11.0-linux-x64 openblas/0.3.14-omp openmpi/4.0.5-cuda python-env
+LOADCPU       = module load ${CPU_MODULES}
+LOADGPU       = module load ${GPU_MODULES}
+
+
 ## setup for compiling marian-nmt
 
-MARIAN_BUILD_MODULES = gcc/10.3.0 cuda/11.4.2 cudnn/8.0.4.30-11.0-linux-x64 cmake/3.18.4 openblas/0.3.14-omp openmpi/4.0.5-cuda python-env
+MARIAN_BUILD_MODULES  = gcc/10.3.0 cuda/11.4.2 cudnn/8.0.4.30-11.0-linux-x64 cmake/3.18.4 openblas/0.3.14-omp openmpi/4.0.5-cuda python-env
 LOAD_MARIAN_BUILD_ENV = module purge && module load ${MARIAN_BUILD_MODULES}
-MARIAN_BUILD_OPTIONS = 	-DTcmalloc_INCLUDE_DIR=/appl/spack/v016/install-tree/gcc-10.3.0/gperftools-2.7-ibnifm/include \
+MARIAN_BUILD_OPTIONS  = -DTcmalloc_INCLUDE_DIR=/appl/spack/v016/install-tree/gcc-10.3.0/gperftools-2.7-ibnifm/include \
 			-DTcmalloc_LIBRARY=/appl/spack/v016/install-tree/gcc-10.3.0/gperftools-2.7-ibnifm/lib/libtcmalloc.so \
 			-DTCMALLOC_LIB=/appl/spack/v016/install-tree/gcc-10.3.0/gperftools-2.7-ibnifm/lib/libtcmalloc.so \
 			-DCUDNN=ON \
diff --git a/lib/env/puhti.mk b/lib/env/puhti.mk
index fa85a1e8..4bfefb8a 100644
--- a/lib/env/puhti.mk
+++ b/lib/env/puhti.mk
@@ -3,10 +3,6 @@
 # environment on puhti@CSC
 #
 
-CPU_MODULES = gcc/6.2.0 mkl
-GPU_MODULES = cuda-env/8 mkl
-
-
 
 
 #   CSCPROJECT   = project_2003288
@@ -19,24 +15,26 @@ OPUSHOME     = /projappl/nlpl/data/OPUS
 MOSESHOME    = ${APPLHOME}/mosesdecoder
 MOSESSCRIPTS = ${MOSESHOME}/scripts
 EFLOMAL_HOME = ${APPLHOME}/eflomal/
-MARIAN_HOME  = ${APPLHOME}/marian/build/
-MARIAN       = ${APPLHOME}/marian/build
+MARIAN_HOME  = ${APPLHOME}/marian-dev/build/
+MARIAN       = ${APPLHOME}/marian-dev/build
 SPM_HOME     = ${MARIAN_HOME}
 GPU          = v100
-GPU_MODULES  = python-env 
-CPU_MODULES  = python-env
 HPC_QUEUE    = small
-LOADCPU      = module load ${CPU_MODULES}
-LOADGPU      = module load ${GPU_MODULES}
 export PATH := ${APPLHOME}/bin:${PATH}
 
 
-BUILD_MODULES = cmake perl/5.30.0
+CPU_MODULES = gcc/8.3.0 intel-mkl/2019.0.4 python-env 
+GPU_MODULES = gcc/8.3.0 cuda/10.1.168 cudnn/7.6.1.34-10.1 intel-mkl/2019.0.4 python-env 
+LOADCPU     = module load ${CPU_MODULES}
+LOADGPU     = module load ${GPU_MODULES}
+
+
+BUILD_MODULES  = cmake perl/5.30.0
 LOAD_BUILD_ENV = module load ${BUILD_MODULES}
 
-MARIAN_BUILD_MODULES = gcc/8.3.0 cuda/10.1.168 cudnn/7.6.1.34-10.1 intel-mkl/2019.0.4 cmake/3.18.2
+MARIAN_BUILD_MODULES  = gcc/8.3.0 cuda/10.1.168 cudnn/7.6.1.34-10.1 intel-mkl/2019.0.4 cmake/3.18.2
 LOAD_MARIAN_BUILD_ENV = module purge && module load ${MARIAN_BUILD_MODULES}
-MARIAN_BUILD_OPTIONS =	-DTcmalloc_INCLUDE_DIR=/appl/spack/install-tree/gcc-8.3.0/gperftools-2.7-5w7w2c/include \
+MARIAN_BUILD_OPTIONS  =	-DTcmalloc_INCLUDE_DIR=/appl/spack/install-tree/gcc-8.3.0/gperftools-2.7-5w7w2c/include \
 			-DTcmalloc_LIBRARY=/appl/spack/install-tree/gcc-8.3.0/gperftools-2.7-5w7w2c/lib/libtcmalloc.so \
 			-DTCMALLOC_LIB=/appl/spack/install-tree/gcc-8.3.0/gperftools-2.7-5w7w2c/lib/libtcmalloc.so \
 			-DCUDNN=ON \