diff --git a/contrib/kernel-tutorial-mips32/first/config.mk b/contrib/kernel-tutorial-mips32/first/config.mk
index 570ad4d..72782ae 100644
--- a/contrib/kernel-tutorial-mips32/first/config.mk
+++ b/contrib/kernel-tutorial-mips32/first/config.mk
@@ -4,8 +4,8 @@
 # Guess where the toolchain is installed.
 # Override the last branch if you are not in Rotunda
 # or you have not used our cross-compiler build script.
-ifneq ("$(wildcard /opt/mffd3s/bin/mipsel-linux-gnu-gcc)", "")
-	TOOLCHAIN_DIR = /opt/mffd3s
+ifneq ("$(wildcard /opt/mffd3s/mips32/bin/mipsel-linux-gnu-gcc)", "")
+	TOOLCHAIN_DIR = /opt/mffd3s/mips32
 	TARGET = mipsel-linux-gnu
 else
 	ifneq ("$(wildcard /usr/bin/mipsel-unknown-linux-gnu-gcc)", "")
diff --git a/contrib/kernel-tutorial-mips32/string/config.mk b/contrib/kernel-tutorial-mips32/string/config.mk
index 570ad4d..72782ae 100644
--- a/contrib/kernel-tutorial-mips32/string/config.mk
+++ b/contrib/kernel-tutorial-mips32/string/config.mk
@@ -4,8 +4,8 @@
 # Guess where the toolchain is installed.
 # Override the last branch if you are not in Rotunda
 # or you have not used our cross-compiler build script.
-ifneq ("$(wildcard /opt/mffd3s/bin/mipsel-linux-gnu-gcc)", "")
-	TOOLCHAIN_DIR = /opt/mffd3s
+ifneq ("$(wildcard /opt/mffd3s/mips32/bin/mipsel-linux-gnu-gcc)", "")
+	TOOLCHAIN_DIR = /opt/mffd3s/mips32
 	TARGET = mipsel-linux-gnu
 else
 	ifneq ("$(wildcard /usr/bin/mipsel-unknown-linux-gnu-gcc)", "")
diff --git a/contrib/kernel-tutorial-mips32/unaligned/config.mk b/contrib/kernel-tutorial-mips32/unaligned/config.mk
index 570ad4d..72782ae 100644
--- a/contrib/kernel-tutorial-mips32/unaligned/config.mk
+++ b/contrib/kernel-tutorial-mips32/unaligned/config.mk
@@ -4,8 +4,8 @@
 # Guess where the toolchain is installed.
 # Override the last branch if you are not in Rotunda
 # or you have not used our cross-compiler build script.
-ifneq ("$(wildcard /opt/mffd3s/bin/mipsel-linux-gnu-gcc)", "")
-	TOOLCHAIN_DIR = /opt/mffd3s
+ifneq ("$(wildcard /opt/mffd3s/mips32/bin/mipsel-linux-gnu-gcc)", "")
+	TOOLCHAIN_DIR = /opt/mffd3s/mips32
 	TARGET = mipsel-linux-gnu
 else
 	ifneq ("$(wildcard /usr/bin/mipsel-unknown-linux-gnu-gcc)", "")
diff --git a/contrib/kernel-tutorial-mips32/volatile/config.mk b/contrib/kernel-tutorial-mips32/volatile/config.mk
index 570ad4d..72782ae 100644
--- a/contrib/kernel-tutorial-mips32/volatile/config.mk
+++ b/contrib/kernel-tutorial-mips32/volatile/config.mk
@@ -4,8 +4,8 @@
 # Guess where the toolchain is installed.
 # Override the last branch if you are not in Rotunda
 # or you have not used our cross-compiler build script.
-ifneq ("$(wildcard /opt/mffd3s/bin/mipsel-linux-gnu-gcc)", "")
-	TOOLCHAIN_DIR = /opt/mffd3s
+ifneq ("$(wildcard /opt/mffd3s/mips32/bin/mipsel-linux-gnu-gcc)", "")
+	TOOLCHAIN_DIR = /opt/mffd3s/mips32
 	TARGET = mipsel-linux-gnu
 else
 	ifneq ("$(wildcard /usr/bin/mipsel-unknown-linux-gnu-gcc)", "")
diff --git a/contrib/kernel-tutorial-riscv32/first/config.mk b/contrib/kernel-tutorial-riscv32/first/config.mk
index 3bb8bcd..6e4030b 100644
--- a/contrib/kernel-tutorial-riscv32/first/config.mk
+++ b/contrib/kernel-tutorial-riscv32/first/config.mk
@@ -4,8 +4,8 @@
 # Guess where the toolchain is installed.
 # Override the last branch if you are not in Rotunda
 # or you have not used our cross-compiler build script.
-ifneq ("$(wildcard /opt/mffd3s/bin/riscv32-unknown-elf-gcc)", "")
-	TOOLCHAIN_DIR = /opt/mffd3s
+ifneq ("$(wildcard /opt/mffd3s/riscv32/bin/riscv32-unknown-elf-gcc)", "")
+	TOOLCHAIN_DIR = /opt/mffd3s/riscv32
 	TARGET = riscv32-unknown-elf
 else
 	ifneq ("$(wildcard /usr/bin/riscv32-unknown-elf-gcc)", "")
diff --git a/contrib/kernel-tutorial-riscv32/string/config.mk b/contrib/kernel-tutorial-riscv32/string/config.mk
index 3bb8bcd..6e4030b 100644
--- a/contrib/kernel-tutorial-riscv32/string/config.mk
+++ b/contrib/kernel-tutorial-riscv32/string/config.mk
@@ -4,8 +4,8 @@
 # Guess where the toolchain is installed.
 # Override the last branch if you are not in Rotunda
 # or you have not used our cross-compiler build script.
-ifneq ("$(wildcard /opt/mffd3s/bin/riscv32-unknown-elf-gcc)", "")
-	TOOLCHAIN_DIR = /opt/mffd3s
+ifneq ("$(wildcard /opt/mffd3s/riscv32/bin/riscv32-unknown-elf-gcc)", "")
+	TOOLCHAIN_DIR = /opt/mffd3s/riscv32
 	TARGET = riscv32-unknown-elf
 else
 	ifneq ("$(wildcard /usr/bin/riscv32-unknown-elf-gcc)", "")
diff --git a/contrib/kernel-tutorial-riscv32/unaligned/config.mk b/contrib/kernel-tutorial-riscv32/unaligned/config.mk
index 3bb8bcd..6e4030b 100644
--- a/contrib/kernel-tutorial-riscv32/unaligned/config.mk
+++ b/contrib/kernel-tutorial-riscv32/unaligned/config.mk
@@ -4,8 +4,8 @@
 # Guess where the toolchain is installed.
 # Override the last branch if you are not in Rotunda
 # or you have not used our cross-compiler build script.
-ifneq ("$(wildcard /opt/mffd3s/bin/riscv32-unknown-elf-gcc)", "")
-	TOOLCHAIN_DIR = /opt/mffd3s
+ifneq ("$(wildcard /opt/mffd3s/riscv32/bin/riscv32-unknown-elf-gcc)", "")
+	TOOLCHAIN_DIR = /opt/mffd3s/riscv32
 	TARGET = riscv32-unknown-elf
 else
 	ifneq ("$(wildcard /usr/bin/riscv32-unknown-elf-gcc)", "")
diff --git a/contrib/kernel-tutorial-riscv32/volatile/config.mk b/contrib/kernel-tutorial-riscv32/volatile/config.mk
index 3bb8bcd..6e4030b 100644
--- a/contrib/kernel-tutorial-riscv32/volatile/config.mk
+++ b/contrib/kernel-tutorial-riscv32/volatile/config.mk
@@ -4,8 +4,8 @@
 # Guess where the toolchain is installed.
 # Override the last branch if you are not in Rotunda
 # or you have not used our cross-compiler build script.
-ifneq ("$(wildcard /opt/mffd3s/bin/riscv32-unknown-elf-gcc)", "")
-	TOOLCHAIN_DIR = /opt/mffd3s
+ifneq ("$(wildcard /opt/mffd3s/riscv32/bin/riscv32-unknown-elf-gcc)", "")
+	TOOLCHAIN_DIR = /opt/mffd3s/riscv32
 	TARGET = riscv32-unknown-elf
 else
 	ifneq ("$(wildcard /usr/bin/riscv32-unknown-elf-gcc)", "")
diff --git a/contrib/virtmem-tutorial-riscv32/config.mk b/contrib/virtmem-tutorial-riscv32/config.mk
index 3bb8bcd..6e4030b 100644
--- a/contrib/virtmem-tutorial-riscv32/config.mk
+++ b/contrib/virtmem-tutorial-riscv32/config.mk
@@ -4,8 +4,8 @@
 # Guess where the toolchain is installed.
 # Override the last branch if you are not in Rotunda
 # or you have not used our cross-compiler build script.
-ifneq ("$(wildcard /opt/mffd3s/bin/riscv32-unknown-elf-gcc)", "")
-	TOOLCHAIN_DIR = /opt/mffd3s
+ifneq ("$(wildcard /opt/mffd3s/riscv32/bin/riscv32-unknown-elf-gcc)", "")
+	TOOLCHAIN_DIR = /opt/mffd3s/riscv32
 	TARGET = riscv32-unknown-elf
 else
 	ifneq ("$(wildcard /usr/bin/riscv32-unknown-elf-gcc)", "")