diff --git a/01_bareminimum/Makefile b/01_bareminimum/Makefile
index 23da69bd..f41f3f07 100644
--- a/01_bareminimum/Makefile
+++ b/01_bareminimum/Makefile
@@ -25,7 +25,7 @@
 TARGET = aarch64-raspi3-none-elf
 
 CROSS_CONTAINER = ./dockcross-linux-aarch64
-CROSS_CONTAINER_OBJCOPY = /opt/x-tools/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy
+CROSS_CONTAINER_OBJCOPY = /usr/bin/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy
 
 UTILS_CONTAINER = andrerichter/raspi3-utils
 DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work -w /work
diff --git a/02_multicore_rust/Makefile b/02_multicore_rust/Makefile
index 25a9ff60..dfe15d5b 100644
--- a/02_multicore_rust/Makefile
+++ b/02_multicore_rust/Makefile
@@ -25,7 +25,7 @@
 TARGET = aarch64-raspi3-none-elf
 
 CROSS_CONTAINER = ./dockcross-linux-aarch64
-CROSS_CONTAINER_OBJCOPY = /opt/x-tools/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy
+CROSS_CONTAINER_OBJCOPY = /usr/bin/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy
 
 UTILS_CONTAINER = andrerichter/raspi3-utils
 DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work -w /work
diff --git a/03_uart1/Makefile b/03_uart1/Makefile
index 9b1afad3..ed1730c6 100644
--- a/03_uart1/Makefile
+++ b/03_uart1/Makefile
@@ -25,7 +25,7 @@
 TARGET = aarch64-raspi3-none-elf
 
 CROSS_CONTAINER = ./dockcross-linux-aarch64
-CROSS_CONTAINER_OBJCOPY = /opt/x-tools/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy
+CROSS_CONTAINER_OBJCOPY = /usr/bin/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy
 
 UTILS_CONTAINER = andrerichter/raspi3-utils
 DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work -w /work
diff --git a/04_mailboxes/Makefile b/04_mailboxes/Makefile
index 9b1afad3..ed1730c6 100644
--- a/04_mailboxes/Makefile
+++ b/04_mailboxes/Makefile
@@ -25,7 +25,7 @@
 TARGET = aarch64-raspi3-none-elf
 
 CROSS_CONTAINER = ./dockcross-linux-aarch64
-CROSS_CONTAINER_OBJCOPY = /opt/x-tools/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy
+CROSS_CONTAINER_OBJCOPY = /usr/bin/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy
 
 UTILS_CONTAINER = andrerichter/raspi3-utils
 DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work -w /work
diff --git a/05_uart0/Makefile b/05_uart0/Makefile
index 9b1afad3..ed1730c6 100644
--- a/05_uart0/Makefile
+++ b/05_uart0/Makefile
@@ -25,7 +25,7 @@
 TARGET = aarch64-raspi3-none-elf
 
 CROSS_CONTAINER = ./dockcross-linux-aarch64
-CROSS_CONTAINER_OBJCOPY = /opt/x-tools/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy
+CROSS_CONTAINER_OBJCOPY = /usr/bin/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy
 
 UTILS_CONTAINER = andrerichter/raspi3-utils
 DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work -w /work
diff --git a/06_raspbootin64/Makefile b/06_raspbootin64/Makefile
index 9b1afad3..ed1730c6 100644
--- a/06_raspbootin64/Makefile
+++ b/06_raspbootin64/Makefile
@@ -25,7 +25,7 @@
 TARGET = aarch64-raspi3-none-elf
 
 CROSS_CONTAINER = ./dockcross-linux-aarch64
-CROSS_CONTAINER_OBJCOPY = /opt/x-tools/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy
+CROSS_CONTAINER_OBJCOPY = /usr/bin/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy
 
 UTILS_CONTAINER = andrerichter/raspi3-utils
 DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work -w /work
diff --git a/07_abstraction/Makefile b/07_abstraction/Makefile
index 31c59417..5c95cb2a 100644
--- a/07_abstraction/Makefile
+++ b/07_abstraction/Makefile
@@ -25,7 +25,7 @@
 TARGET = aarch64-raspi3-none-elf
 
 CROSS_CONTAINER = ./dockcross-linux-aarch64
-CROSS_CONTAINER_OBJCOPY = /opt/x-tools/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy
+CROSS_CONTAINER_OBJCOPY = /usr/bin/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy
 
 UTILS_CONTAINER = andrerichter/raspi3-utils
 DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work -w /work
diff --git a/08_random/Makefile b/08_random/Makefile
index 31c59417..5c95cb2a 100644
--- a/08_random/Makefile
+++ b/08_random/Makefile
@@ -25,7 +25,7 @@
 TARGET = aarch64-raspi3-none-elf
 
 CROSS_CONTAINER = ./dockcross-linux-aarch64
-CROSS_CONTAINER_OBJCOPY = /opt/x-tools/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy
+CROSS_CONTAINER_OBJCOPY = /usr/bin/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy
 
 UTILS_CONTAINER = andrerichter/raspi3-utils
 DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work -w /work
diff --git a/09_delays/Makefile b/09_delays/Makefile
index 31c59417..5c95cb2a 100644
--- a/09_delays/Makefile
+++ b/09_delays/Makefile
@@ -25,7 +25,7 @@
 TARGET = aarch64-raspi3-none-elf
 
 CROSS_CONTAINER = ./dockcross-linux-aarch64
-CROSS_CONTAINER_OBJCOPY = /opt/x-tools/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy
+CROSS_CONTAINER_OBJCOPY = /usr/bin/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy
 
 UTILS_CONTAINER = andrerichter/raspi3-utils
 DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work -w /work
diff --git a/0A_power/Makefile b/0A_power/Makefile
index 31c59417..5c95cb2a 100644
--- a/0A_power/Makefile
+++ b/0A_power/Makefile
@@ -25,7 +25,7 @@
 TARGET = aarch64-raspi3-none-elf
 
 CROSS_CONTAINER = ./dockcross-linux-aarch64
-CROSS_CONTAINER_OBJCOPY = /opt/x-tools/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy
+CROSS_CONTAINER_OBJCOPY = /usr/bin/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy
 
 UTILS_CONTAINER = andrerichter/raspi3-utils
 DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work -w /work