diff --git a/JURON.md b/JURON.md
index b0fee40b68e62d9e9d6a9d3b75447495961699af..42bae5636587b7c0a1981805e8a871ef49f883a7 100644
--- a/JURON.md
+++ b/JURON.md
@@ -16,6 +16,7 @@ For the Hackathon of special interest are:
 * GCC modules:
     - `module load gcc/5.4.0`
     - `module load gcc/6.3.0`
+    - `module load gcc/7.2.0`
     - *GCC 4.8.5 is default*
 * PGI modules:
     - `module load pgi/18.4`
@@ -23,8 +24,6 @@ For the Hackathon of special interest are:
 * OpenMPI modules:
     - `module load openmpi/3.1.3-gcc_5.4.0-cuda_10.0.130`
     - `module load openmpi/2.1.2-pgi_18.4-cuda`
-* Score-P modules:
-    - TBD
 
 ## Batch System
 
diff --git a/JUWELS.md b/JUWELS.md
index 88d2e1777a74a9037b5a60d0b1d83db767d6a4bd..7a9eb1eeb921363b303dbd1990ee17f372785be2 100644
--- a/JUWELS.md
+++ b/JUWELS.md
@@ -15,27 +15,36 @@ To search through all available modules for `NAME`, use `module spider NAME`. If
 For the Hackathon of special interest are following. Older versions are available in other stages, which can be enabled by calling:
 
 ```
-module use /usr/local/software/jureca/OtherStages
+module use /gpfs/software/juwels/otherstages
 [module load Stages/Devel]
 ```
 
+If a combination of module and stage in need is not available, please talk to Andreas.
 
 * CUDA module: `module load CUDA/9.2.88`
     - *Note:* `nvcc_pgc++` is available which calls `nvcc` with the PGI C++ compiler (by `-ccbin=pgc++`)
+    - Alternative CUDA installations are available in other stages (`module use /gpfs/software/juwels/otherstages`)
+        * Stage Devel-2018b: CUDA 10.0.130 (`module load Stages/Devel-2018b CUDA/10.0.130`)
+        * Stage 2019a: CUDA 10.1.105 (`module load Stages/2019a CUDA/10.1.105`)
 * GCC module:
     - `module load GCC/7.3.0`
+    - GCC 8.2.0 is the current default, but that is not compatible with CUDA 9
 * PGI modules:
     - `module load PGI/18.7-GCC-7.3.0`
-    - Others via `Stages/Devel`
+    - Other stages:
+        * Stage 2019a: PGI 19.3 (`module load Stages/2019a PGI/19.3-GCC-8.3.0`)
 * MPI modules:
     - `module load MVAPICH2`
         + *Note:* This should load the correct version for a given compiler automatically (GCC/CUDA: `MVAPICH2/2.3-GDR`, PGI: `MVAPICH2/2.3rc1-GDR`)
+    - There is an experimental OpenMPI with CUDA-support available in stage Devel-2018b: `module load Stages/Devel-2018b OpenMPI/4.0.0-cuda`
 * Score-P modules:
     - `module load Score-P`, only for `GCC/8.2.0` which isn't working with CUDA (TBD)
 * Scalasca module:
     - `module load Scalasca`, only for `GCC/8.2.0` which isn't working with CUDA (TBD)
 * Vampir module:
     - `module load Vampir`, only in `Stages/2018b` (TBD)
+* Nsight Systems / Nsight Compute:
+    - Experimental modules of the two applications are available with `module load nsight-systems nsight-compute` on JUWELS
 
 ## Batch System