diff --git a/Makefile b/Makefile
index 38ddc5e..feb8a08 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,6 @@
 import-lorawan-devices:
-	rm -rf lorawan-devices
-	git clone https://github.com/TheThingsNetwork/lorawan-devices
-	docker-compose run --rm chirpstack -c /etc/chirpstack import-ttn-lorawan-devices -d /opt/lorawan-devices
+	docker-compose run --rm --entrypoint bash --user root chirpstack -c '\
+		apt-get update && \
+		apt-get install -y make git && \
+		git clone https://github.com/TheThingsNetwork/lorawan-devices /tmp/lorawan-devices && \
+		chirpstack -c /etc/chirpstack import-ttn-lorawan-devices -d /tmp/lorawan-devices'
diff --git a/README.md b/README.md
index 3061970..1d5edb6 100644
--- a/README.md
+++ b/README.md
@@ -48,8 +48,7 @@ make import-lorawan-devices
 ```
 
 This will clone the `lorawan-devices` repository and execute the `import-ttn-lorawan-devices`
-command of ChirpStack. Please note that for this step, you need to have the `git` and `make`
-commands installed.
+command of ChirpStack. Please note that for this step you need to have the `make` command installed.
 
 ## Usage