diff --git a/README.md b/README.md
index 3bbadd95cb9b199d44c20c82e248753846ac5286..e35b8b66d5e849267b826bd32e1e3e00e0456681 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-# Getting started with ML/DL on Supercomputers
+# Getting started with Deep Learning on Supercomputers
 
 This repository is intended to serve as a tutorial for anyone interested in utilizing the supercomputers 
-available at the JSC for ML/DL related projects. It is assumed that the reader is proficient in one or 
+available at the JSC for deep learning based projects. It is assumed that the reader is proficient in one or 
 more of the following frameworks:
 
 *    [Tensorflow](https://www.tensorflow.org/)
@@ -10,11 +10,14 @@ more of the following frameworks:
 *    [Caffe](http://caffe.berkeleyvision.org/)
 *    [Horovod](https://github.com/horovod/horovod)
 
-**Note:** This tutorial is by no means intended as an introduction to ML/DL, or to any of the
+**Note:** This tutorial is by no means intended as an introduction to deep learning, or to any of the
 above mentioned frameworks. If you are interested in educational resources for beginners, please
 visit [this](https://gitlab.version.fz-juelich.de/MLDL_FZJ/MLDL_FZJ_Wiki/wikis/Education) page.
 
-**Note:** This tutorial does not support JUWELS at the moment. We hope to include the steps for JUWELS soon.
+## Announcements
+
+1. Tensorflow and Keras examples (with and without Horovod) are now fully functional on JUWELS as well.
+2. Python 2 support has been removed from the tutorial for all frameworks except Caffe.
 
 # Table of contents
 <!-- TOC -->
@@ -88,7 +91,7 @@ Otherwise please join the `PADC` and `CPADC` projects.
 
 **Note:** From here on it is assumed that you already have an account on your required supercomputer.
 
-### 4.1 JURECA
+### 4.1 JURECA and JUWELS
 
 Following are the steps required to login (more information 
 [here](http://www.fz-juelich.de/ias/jsc/EN/Expertise/Supercomputers/JURECA/UserInfo/QuickIntroduction.html?nn=1803700)).
@@ -147,20 +150,13 @@ systems. To learn more about Git LFS, click [here](http://gitlab.pages.jsc.fz-ju
 
 ### 5.1 JURECA
 
-1.  Load the required module stage:
-
-    ```
-    module use /usr/local/software/jureca/OtherStages
-    module load Stages/2018b
-    ```
-
-2.  Load the Git LFS module:
+1.  Load the Git LFS module:
 
-    `module load git-lfs/2.6.1`
-3.  Initialize Git LFS:
+    `module load git-lfs`
+2.  Initialize Git LFS:
 
     `git lfs install`
-4.  Clone the repository, including the datasets:
+3.  Clone the repository, including the datasets:
 
     `git lfs clone https://gitlab.version.fz-juelich.de/khalid1/ml_dl_on_supercomputers.git`
 
diff --git a/horovod/README.md b/horovod/README.md
index 220d40b3d033e6dd1ffe5e1d39e58d044329f599..a06e588efdf93526944189d3d9b7b9798f3c66c7 100644
--- a/horovod/README.md
+++ b/horovod/README.md
@@ -13,11 +13,6 @@ slightly modified. Our changes are limited to,
 statements that demonstrate the use of Horovod follow a comment beginning with 
 `[Horovod]` (as added by Horovod developers).
 
-**Caution:** Where job submission scripts are available for both Python 2 and Python 3, please 
-do not submit both Python 2 and Python 3 jobs simultaneously, as one of the jobs might fail. If 
-you would like to try both, please run these in tandem such that the second job is started only
-after the first is finished.
-
 ## Keras samples
 
 The following Keras samples are included:
@@ -29,6 +24,9 @@ few more advanced Horovod features are used.
 
 ## PyTorch samples
 
+**Note:** PyTorch samples currently DO NOT work on JURECA and JUWELS. These 
+do however work on JURON.
+
 The following PyTorch samples are included:
 
 1.  `mnist.py`: Demonstrates distributed training using Horovod with PyTorch. A 
@@ -36,7 +34,7 @@ simple convolutional neural network is trained on the MNIST dataset.
 2.  `synthetic_benchmark.py`: A benchmark that can be used to measure performance 
 of PyTorch with Horovod without using any external dataset.
 
-**Note:** The job scripts for JURECA are prefixed with `.` for these samples, so that 
+**Note:** The job scripts for JURECA and JUWELS are prefixed with `.` for these samples, so that 
 these scripts do not appear in the directory listing. The reason for doing this is
 that our testing revealed issues with multi-node training. As soon as the issue has 
 been resolved, we'll make the scripts available.
diff --git a/horovod/keras/mnist.py b/horovod/keras/mnist.py
index b098f2602a721c5e5f1089aca9abc352b21645f1..85dd94467ebaf1dcc44516fb13e66c596f4a4f9f 100644
--- a/horovod/keras/mnist.py
+++ b/horovod/keras/mnist.py
@@ -35,7 +35,7 @@ batch_size = 128
 num_classes = 10
 
 # Horovod: adjust number of epochs based on number of GPUs.
-epochs = int(math.ceil(12.0 / hvd.size()))
+epochs = int(math.ceil(16.0 / hvd.size()))
 
 # Input image dimensions
 img_rows, img_cols = 28, 28
diff --git a/horovod/keras/mnist_advanced.py b/horovod/keras/mnist_advanced.py
index 9337026bc92b2bd2b4b570976381f8c01f2f87b8..bf52fddb7e312d10e4a4bd7a0da7f9ab87368ff3 100644
--- a/horovod/keras/mnist_advanced.py
+++ b/horovod/keras/mnist_advanced.py
@@ -36,7 +36,7 @@ num_classes = 10
 
 # Enough epochs to demonstrate learning rate warmup and the reduction of
 # learning rate when training plateaues.
-epochs = 12
+epochs = 16
 
 # Input image dimensions
 img_rows, img_cols = 28, 28
diff --git a/horovod/keras/submit_job_jureca.sh b/horovod/keras/submit_job_jureca.sh
new file mode 100755
index 0000000000000000000000000000000000000000..0a771db66b9ef6495c17e73b09a46aa649508cae
--- /dev/null
+++ b/horovod/keras/submit_job_jureca.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Slurm job configuration
+#SBATCH --nodes=2
+#SBATCH --ntasks=8
+#SBATCH --ntasks-per-node=4
+#SBATCH --output=output_%j.out
+#SBATCH --error=error_%j.er
+#SBATCH --time=00:10:00
+#SBATCH --job-name=HOROVOD_KERAS_MNIST
+#SBATCH --gres=gpu:4 --partition=develgpus
+#SBATCH --mail-type=ALL
+
+# Load the required modules
+module load GCC/8.3.0
+module load MVAPICH2/2.3.1-GDR
+module load TensorFlow/1.13.1-GPU-Python-3.6.8
+module load Keras/2.2.4-GPU-Python-3.6.8
+module load Horovod/0.16.2-GPU-Python-3.6.8
+
+# Run the program
+srun python -u mnist.py
diff --git a/horovod/keras/submit_job_jureca_python2.sh b/horovod/keras/submit_job_jureca_python2.sh
deleted file mode 100755
index 4a6162d5e090f17dc6419eeaac61eec407054cef..0000000000000000000000000000000000000000
--- a/horovod/keras/submit_job_jureca_python2.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-# Slurm job configuration
-#SBATCH --nodes=2
-#SBATCH --ntasks=4
-#SBATCH --ntasks-per-node=2
-#SBATCH --output=output_%j.out
-#SBATCH --error=error_%j.er
-#SBATCH --time=00:10:00
-#SBATCH --job-name=HOROVOD_KERAS_MNIST
-#SBATCH --gres=gpu:2 --partition=develgpus
-#SBATCH --mail-type=ALL
-
-# Load the required modules
-module use /usr/local/software/jureca/OtherStages
-module load Stages/2018b
-module load GCC/7.3.0
-module load MVAPICH2/2.3-GDR
-module load TensorFlow/1.12.0-GPU-Python-2.7.15
-module load Keras/2.2.4-GPU-Python-2.7.15
-module load Horovod/0.15.2-GPU-Python-2.7.15
-
-# Run the program
-srun python -u mnist.py
diff --git a/horovod/keras/submit_job_jureca_python3.sh b/horovod/keras/submit_job_jureca_python3.sh
deleted file mode 100755
index 561a45df30794898960af6aa37ed927cc20db714..0000000000000000000000000000000000000000
--- a/horovod/keras/submit_job_jureca_python3.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-# Slurm job configuration
-#SBATCH --nodes=2
-#SBATCH --ntasks=4
-#SBATCH --ntasks-per-node=2
-#SBATCH --output=output_%j.out
-#SBATCH --error=error_%j.er
-#SBATCH --time=00:10:00
-#SBATCH --job-name=HOROVOD_KERAS_MNIST
-#SBATCH --gres=gpu:2 --partition=develgpus
-#SBATCH --mail-type=ALL
-
-# Load the required modules
-module use /usr/local/software/jureca/OtherStages
-module load Stages/2018b
-module load GCC/7.3.0
-module load MVAPICH2/2.3-GDR
-module load TensorFlow/1.12.0-GPU-Python-3.6.6
-module load Keras/2.2.4-GPU-Python-3.6.6
-module load Horovod/0.15.2-GPU-Python-3.6.6
-
-# Run the program
-srun python -u mnist.py
diff --git a/horovod/keras/submit_job_juron_python3.sh b/horovod/keras/submit_job_juron.sh
similarity index 100%
rename from horovod/keras/submit_job_juron_python3.sh
rename to horovod/keras/submit_job_juron.sh
diff --git a/horovod/keras/submit_job_juron_python2.sh b/horovod/keras/submit_job_juron_python2.sh
deleted file mode 100644
index cd5f8dd051c5b46502ac9b3256a7ae0e01dc3572..0000000000000000000000000000000000000000
--- a/horovod/keras/submit_job_juron_python2.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-#BSUB -q normal
-#BSUB -W 10
-#BSUB -n 4
-#BSUB -R "span[ptile=2]"
-#BSUB -gpu "num=2"
-#BSUB -e "error.%J.er"
-#BSUB -o "output_%J.out"
-#BSUB -J HOROVOD_KERAS_MNIST
-
-# Load the required modules
-module load python/2.7.14
-module load tensorflow/1.12.0-gcc_5.4.0-cuda_10.0.130
-module load horovod/0.15.2
-module load keras/2.2.4
-
-# Run the program
-mpirun -bind-to none -map-by slot -x NCCL_DEBUG=INFO -x LD_LIBRARY_PATH \
-        -x PATH -mca pml ob1 -mca btl ^openib python -u mnist.py
diff --git a/horovod/pytorch/.submit_job_jureca_python3.sh b/horovod/pytorch/.submit_job_jureca.sh
similarity index 100%
rename from horovod/pytorch/.submit_job_jureca_python3.sh
rename to horovod/pytorch/.submit_job_jureca.sh
diff --git a/horovod/pytorch/.submit_job_jureca_python2.sh b/horovod/pytorch/.submit_job_jureca_python2.sh
deleted file mode 100755
index 854a96fb9fda602a71c462d2a0ebfc6ac4d0396b..0000000000000000000000000000000000000000
--- a/horovod/pytorch/.submit_job_jureca_python2.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-# Slurm job configuration
-#SBATCH --nodes=2
-#SBATCH --ntasks=4
-#SBATCH --ntasks-per-node=2
-#SBATCH --output=output_%j.out
-#SBATCH --error=error_%j.er
-#SBATCH --time=00:10:00
-#SBATCH --job-name=HOROVOD_PYTORCH_MNIST
-#SBATCH --gres=gpu:2 --partition=develgpus
-#SBATCH --mail-type=ALL
-
-# Load the required modules
-module load GCC/7.3.0
-module load MVAPICH2/2.3-GDR
-module load PyTorch/1.0.0-GPU-Python-2.7.15
-module load torchvision/0.2.1-GPU-Python-2.7.15
-module load Horovod/0.15.2-GPU-Python-2.7.15
-
-# Run the program
-srun python -u mnist.py
diff --git a/horovod/pytorch/submit_job_juron_python3.sh b/horovod/pytorch/submit_job_juron.sh
similarity index 100%
rename from horovod/pytorch/submit_job_juron_python3.sh
rename to horovod/pytorch/submit_job_juron.sh
diff --git a/horovod/tensorflow/submit_job_jureca.sh b/horovod/tensorflow/submit_job_jureca.sh
new file mode 100755
index 0000000000000000000000000000000000000000..6be2a8962a40aeae97ac5e3aa93f06dd1621bead
--- /dev/null
+++ b/horovod/tensorflow/submit_job_jureca.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Slurm job configuration
+#SBATCH --nodes=2
+#SBATCH --ntasks=8
+#SBATCH --ntasks-per-node=4
+#SBATCH --output=output_%j.out
+#SBATCH --error=error_%j.er
+#SBATCH --time=00:10:00
+#SBATCH --job-name=HOROVOD_TFLOW_MNIST
+#SBATCH --gres=gpu:4 --partition=develgpus
+#SBATCH --mail-type=ALL
+
+# Load the required modules
+module load GCC/8.3.0
+module load MVAPICH2/2.3.1-GDR
+module load TensorFlow/1.13.1-GPU-Python-3.6.8
+module load Keras/2.2.4-GPU-Python-3.6.8
+module load Horovod/0.16.2-GPU-Python-3.6.8
+
+# Run the program
+srun python -u mnist.py
diff --git a/horovod/tensorflow/submit_job_jureca_python2.sh b/horovod/tensorflow/submit_job_jureca_python2.sh
deleted file mode 100755
index 68b28354eb1d24c248565dbf734544ea8a8bd1a4..0000000000000000000000000000000000000000
--- a/horovod/tensorflow/submit_job_jureca_python2.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-# Slurm job configuration
-#SBATCH --nodes=2
-#SBATCH --ntasks=4
-#SBATCH --ntasks-per-node=2
-#SBATCH --output=output_%j.out
-#SBATCH --error=error_%j.er
-#SBATCH --time=00:10:00
-#SBATCH --job-name=HOROVOD_TFLOW_MNIST
-#SBATCH --gres=gpu:2 --partition=develgpus
-#SBATCH --mail-type=ALL
-
-# Load the required modules
-module use /usr/local/software/jureca/OtherStages
-module load Stages/2018b
-module load GCC/7.3.0
-module load MVAPICH2/2.3-GDR
-module load TensorFlow/1.12.0-GPU-Python-2.7.15
-module load Horovod/0.15.2-GPU-Python-2.7.15
-
-# Run the program
-srun python -u mnist.py
diff --git a/horovod/tensorflow/submit_job_jureca_python3.sh b/horovod/tensorflow/submit_job_jureca_python3.sh
deleted file mode 100755
index 2a50c8b813a7c7eeb56bdfd993b8738585fb6342..0000000000000000000000000000000000000000
--- a/horovod/tensorflow/submit_job_jureca_python3.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-# Slurm job configuration
-#SBATCH --nodes=2
-#SBATCH --ntasks=4
-#SBATCH --ntasks-per-node=2
-#SBATCH --output=output_%j.out
-#SBATCH --error=error_%j.er
-#SBATCH --time=00:10:00
-#SBATCH --job-name=HOROVOD_TFLOW_MNIST
-#SBATCH --gres=gpu:2 --partition=develgpus
-#SBATCH --mail-type=ALL
-
-# Load the required modules
-module use /usr/local/software/jureca/OtherStages
-module load Stages/2018b
-module load GCC/7.3.0
-module load MVAPICH2/2.3-GDR
-module load TensorFlow/1.12.0-GPU-Python-3.6.6
-module load Horovod/0.15.2-GPU-Python-3.6.6
-
-# Run the program
-srun python -u mnist.py
diff --git a/horovod/tensorflow/submit_job_juron_python3.sh b/horovod/tensorflow/submit_job_juron.sh
similarity index 100%
rename from horovod/tensorflow/submit_job_juron_python3.sh
rename to horovod/tensorflow/submit_job_juron.sh
diff --git a/horovod/tensorflow/submit_job_juron_python2.sh b/horovod/tensorflow/submit_job_juron_python2.sh
deleted file mode 100644
index 85b2ee684ae7732ea48124530e5f3c4416eea69c..0000000000000000000000000000000000000000
--- a/horovod/tensorflow/submit_job_juron_python2.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-#BSUB -q normal
-#BSUB -W 10
-#BSUB -n 4
-#BSUB -R "span[ptile=2]"
-#BSUB -gpu "num=2"
-#BSUB -e "error.%J.er"
-#BSUB -o "output_%J.out"
-#BSUB -J HOROVOD_TFLOW_MNIST
-
-# Load the required modules
-module load python/2.7.14
-module load tensorflow/1.12.0-gcc_5.4.0-cuda_10.0.130
-module load horovod/0.15.2
-
-# Run the program
-mpirun -bind-to none -map-by slot -x NCCL_DEBUG=INFO -x LD_LIBRARY_PATH \
-        -x PATH -mca pml ob1 -mca btl ^openib python -u mnist.py
diff --git a/keras/submit_job_jureca_python3.sh b/keras/submit_job_jureca.sh
similarity index 66%
rename from keras/submit_job_jureca_python3.sh
rename to keras/submit_job_jureca.sh
index faf5b7c9d3dcd6676fffea6894d96d9418ae520f..55feebb6f5ca18e8e6707f918205905a7789613d 100755
--- a/keras/submit_job_jureca_python3.sh
+++ b/keras/submit_job_jureca.sh
@@ -12,11 +12,9 @@
 #SBATCH --mail-type=ALL
 
 # Load the required modules
-module use /usr/local/software/jureca/OtherStages
-module load Stages/2018b
-module load GCC/7.3.0
-module load TensorFlow/1.12.0-GPU-Python-3.6.6
-module load Keras/2.2.4-GPU-Python-3.6.6
+module load GCCcore/.8.3.0
+module load TensorFlow/1.13.1-GPU-Python-3.6.8
+module load Keras/2.2.4-GPU-Python-3.6.8
 
 # Run the program
 srun python -u mnist.py
diff --git a/keras/submit_job_jureca_python2.sh b/keras/submit_job_jureca_python2.sh
deleted file mode 100755
index 3af58170348f83caa3f25cbc0c5ded3587a97f75..0000000000000000000000000000000000000000
--- a/keras/submit_job_jureca_python2.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-# Slurm job configuration
-#SBATCH --nodes=1
-#SBATCH --ntasks=1
-#SBATCH --ntasks-per-node=1
-#SBATCH --output=output_%j.out
-#SBATCH --error=error_%j.er
-#SBATCH --time=00:10:00
-#SBATCH --job-name=KERAS_MNIST_CNN
-#SBATCH --gres=gpu:1 --partition=develgpus
-#SBATCH --mail-type=ALL
-
-# Load the required modules
-module use /usr/local/software/jureca/OtherStages
-module load Stages/2018b
-module load GCC/7.3.0
-module load TensorFlow/1.12.0-GPU-Python-2.7.15
-module load Keras/2.2.4-GPU-Python-2.7.15
-
-# Run the program
-srun python -u mnist.py
diff --git a/keras/submit_job_juron_python3.sh b/keras/submit_job_juron.sh
similarity index 100%
rename from keras/submit_job_juron_python3.sh
rename to keras/submit_job_juron.sh
diff --git a/keras/submit_job_juron_python2.sh b/keras/submit_job_juron_python2.sh
deleted file mode 100644
index 91ae8c778668e2dd852fd75d59f00ad14d1a78d0..0000000000000000000000000000000000000000
--- a/keras/submit_job_juron_python2.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-#BSUB -q normal
-#BSUB -W 10
-#BSUB -n 1
-#BSUB -R "span[ptile=1]"
-#BSUB -gpu "num=1"
-#BSUB -e "error.%J.er"
-#BSUB -o "output_%J.out"
-#BSUB -J KERAS_MNIST_CNN
-
-# Load the required modules
-module load python/2.7.14
-module load tensorflow/1.12.0-gcc_5.4.0-cuda_10.0.130
-module load keras/2.2.4
-
-# Run the program
-python -u mnist.py
diff --git a/pytorch/.submit_job_juwels_python3.sh b/pytorch/.submit_job_juwels.sh
similarity index 100%
rename from pytorch/.submit_job_juwels_python3.sh
rename to pytorch/.submit_job_juwels.sh
diff --git a/tensorflow/submit_job_jureca_python3.sh b/pytorch/submit_job_jureca.sh
similarity index 64%
rename from tensorflow/submit_job_jureca_python3.sh
rename to pytorch/submit_job_jureca.sh
index f66fbb0f73142f6b7b41ca5e09a39760530d770d..15f53ac1a55630cc5c628413738dacd4fab4429e 100755
--- a/tensorflow/submit_job_jureca_python3.sh
+++ b/pytorch/submit_job_jureca.sh
@@ -7,15 +7,14 @@
 #SBATCH --output=output_%j.out
 #SBATCH --error=error_%j.er
 #SBATCH --time=00:10:00
-#SBATCH --job-name=TENSORFLOW_MNIST
+#SBATCH --job-name=PYTORCH_MNIST
 #SBATCH --gres=gpu:1 --partition=develgpus
 #SBATCH --mail-type=ALL
 
 # Load the required modules
-module use /usr/local/software/jureca/OtherStages
-module load Stages/2018b
-module load GCC/7.3.0
-module load TensorFlow/1.12.0-GPU-Python-3.6.6
+module load GCC/8.3.0
+module load PyTorch/1.1.0-GPU-Python-3.6.8
+module load torchvision/0.3.0-GPU-Python-3.6.8
 
 # Run the program
 srun python -u mnist.py
diff --git a/pytorch/submit_job_jureca_python2.sh b/pytorch/submit_job_jureca_python2.sh
deleted file mode 100755
index b5dcb4ff01f9670c252cafc8e60d55687c988d8f..0000000000000000000000000000000000000000
--- a/pytorch/submit_job_jureca_python2.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-# Slurm job configuration
-#SBATCH --nodes=1
-#SBATCH --ntasks=1
-#SBATCH --ntasks-per-node=1
-#SBATCH --output=output_%j.out
-#SBATCH --error=error_%j.er
-#SBATCH --time=00:10:00
-#SBATCH --job-name=PYTORCH_MNIST
-#SBATCH --gres=gpu:1 --partition=develgpus
-#SBATCH --mail-type=ALL
-
-# Load the required modules
-module use /usr/local/software/jureca/OtherStages
-module load Stages/2018b
-module load GCC/7.3.0
-module load MVAPICH2/2.3-GDR
-module load PyTorch/1.0.0-GPU-Python-2.7.15
-module load torchvision/0.2.1-GPU-Python-2.7.15
-
-# Run the program
-srun python -u mnist.py
diff --git a/pytorch/submit_job_jureca_python3.sh b/pytorch/submit_job_jureca_python3.sh
deleted file mode 100755
index d6d0de120c5c74a4e520a2a7f2cbd807da3e8c35..0000000000000000000000000000000000000000
--- a/pytorch/submit_job_jureca_python3.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-# Slurm job configuration
-#SBATCH --nodes=1
-#SBATCH --ntasks=1
-#SBATCH --ntasks-per-node=1
-#SBATCH --output=output_%j.out
-#SBATCH --error=error_%j.er
-#SBATCH --time=00:10:00
-#SBATCH --job-name=PYTORCH_MNIST
-#SBATCH --gres=gpu:1 --partition=develgpus
-#SBATCH --mail-type=ALL
-
-# Load the required modules
-module use /usr/local/software/jureca/OtherStages
-module load Stages/2018b
-module load GCC/7.3.0
-module load MVAPICH2/2.3-GDR
-module load PyTorch/1.0.0-GPU-Python-3.6.6
-module load torchvision/0.2.1-GPU-Python-3.6.6
-
-# Run the program
-srun python -u mnist.py
diff --git a/pytorch/submit_job_juron_python3.sh b/pytorch/submit_job_juron.sh
similarity index 100%
rename from pytorch/submit_job_juron_python3.sh
rename to pytorch/submit_job_juron.sh
diff --git a/tensorflow/submit_job_jureca_python2.sh b/tensorflow/submit_job_jureca.sh
similarity index 64%
rename from tensorflow/submit_job_jureca_python2.sh
rename to tensorflow/submit_job_jureca.sh
index e1f6d0c41817f23fdf7492a22eccb002d5993de1..fa294f1cb401c9cda6a1c20ab716419a64262e07 100755
--- a/tensorflow/submit_job_jureca_python2.sh
+++ b/tensorflow/submit_job_jureca.sh
@@ -7,15 +7,13 @@
 #SBATCH --output=output_%j.out
 #SBATCH --error=error_%j.er
 #SBATCH --time=00:10:00
-#SBATCH --job-name=TENSORFLOW_MNIST
+#SBATCH --job-name=TFLOW_MNIST
 #SBATCH --gres=gpu:1 --partition=develgpus
 #SBATCH --mail-type=ALL
 
 # Load the required modules
-module use /usr/local/software/jureca/OtherStages
-module load Stages/2018b
-module load GCC/7.3.0
-module load TensorFlow/1.12.0-GPU-Python-2.7.15
+module load GCCcore/.8.3.0
+module load TensorFlow/1.13.1-GPU-Python-3.6.8
 
 # Run the program
 srun python -u mnist.py
diff --git a/tensorflow/submit_job_juron_python3.sh b/tensorflow/submit_job_juron.sh
similarity index 100%
rename from tensorflow/submit_job_juron_python3.sh
rename to tensorflow/submit_job_juron.sh
diff --git a/tensorflow/submit_job_juron_python2.sh b/tensorflow/submit_job_juron_python2.sh
deleted file mode 100644
index 6270cd2bbe665e5d405f36d96a8cf22ca62f07d6..0000000000000000000000000000000000000000
--- a/tensorflow/submit_job_juron_python2.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-#BSUB -q normal
-#BSUB -W 10
-#BSUB -n 1
-#BSUB -R "span[ptile=1]"
-#BSUB -gpu "num=1"
-#BSUB -e "error.%J.er"
-#BSUB -o "output_%J.out"
-#BSUB -J TENSORFLOW_MNIST
-
-# Load the required modules
-module load python/2.7.14
-module load tensorflow/1.12.0-gcc_5.4.0-cuda_10.0.130
-
-# Run the program
-python -u mnist.py