diff --git a/amd64.dockerfile b/amd64.dockerfile
index 5b0a992c83c2330f53d779874952f38e3e295d79..12c66f86b5a5de43adf95ca62068f855d83a2b2d 100644
--- a/amd64.dockerfile
+++ b/amd64.dockerfile
@@ -1,9 +1,9 @@
-FROM debian:buster
+FROM alpine:latest
 
 # linux/amd64
 
 RUN mkdir /app
-COPY ./NDI SDK for Linux/bin/x86_64-linux-gnu/ndi-directory-service /app/
+COPY "./NDI SDK for Linux/bin/x86_64-linux-gnu/ndi-directory-service" /app/
 RUN chmod +x /app/ndi-directory-service
 
 WORKDIR /app
diff --git a/i686.dockerfile b/i686.dockerfile
index 8ddc96ba7036dc798b40cce47e4621a00b249dbe..37f161ac1ceecae6be4f1306ad490efe0a8a0715 100644
--- a/i686.dockerfile
+++ b/i686.dockerfile
@@ -1,9 +1,9 @@
-FROM debian:buster
+FROM alpine:latest
 
 # linux/386
 
 RUN mkdir /app
-COPY ./NDI SDK for Linux/bin/i686-linux-gnu/ndi-directory-service /app/
+COPY "./NDI SDK for Linux/bin/i686-linux-gnu/ndi-directory-service" /app/
 RUN chmod +x /app/ndi-directory-service
 
 WORKDIR /app
diff --git a/rpi1.dockerfile b/rpi1.dockerfile
index 90760490b49fce8eaca9490257298290aaf4af91..df339720bb16b4501d8010dc914847308f43a1d5 100644
--- a/rpi1.dockerfile
+++ b/rpi1.dockerfile
@@ -1,9 +1,9 @@
-FROM debian:buster
+FROM alpine:latest
 
 # linux/arm/v6
 
 RUN mkdir /app
-COPY ./NDI SDK for Linux/bin/arm-rpi1-linux-gnueabihf/ndi-directory-service /app/
+COPY "./NDI SDK for Linux/bin/arm-rpi1-linux-gnueabihf/ndi-directory-service" /app/
 RUN chmod +x /app/ndi-directory-service
 
 WORKDIR /app
diff --git a/rpi2.dockerfile b/rpi2.dockerfile
index 4a9ca865f1c7b6a2a7f35346e30b629a39b3539a..1cc93b871e403091af1f2e7e038cef716573a093 100644
--- a/rpi2.dockerfile
+++ b/rpi2.dockerfile
@@ -1,9 +1,9 @@
-FROM debian:buster
+FROM alpine:latest
 
 # linux/arm/v7
 
 RUN mkdir /app
-COPY ./NDI SDK for Linux/bin/arm-rpi2-linux-gnueabihf/ndi-directory-service /app/
+COPY "./NDI SDK for Linux/bin/arm-rpi2-linux-gnueabihf/ndi-directory-service" /app/
 RUN chmod +x /app/ndi-directory-service
 
 WORKDIR /app
diff --git a/rpi3.dockerfile b/rpi3.dockerfile
index 2b17e4856a759f119f1a9e0c6e8e2193579bd66d..26e07cbb94f8f061e68b36e7484c17c548cae0e6 100644
--- a/rpi3.dockerfile
+++ b/rpi3.dockerfile
@@ -1,9 +1,9 @@
-FROM debian:buster
+FROM alpine:latest
 
 # linux/arm/v7
 
 RUN mkdir /app
-COPY ./NDI SDK for Linux/bin/arm-rpi3-linux-gnueabihf/ndi-directory-service /app/
+COPY "./NDI SDK for Linux/bin/arm-rpi3-linux-gnueabihf/ndi-directory-service" /app/
 RUN chmod +x /app/ndi-directory-service
 
 WORKDIR /app
diff --git a/rpi4-arm32.dockerfile b/rpi4-arm32.dockerfile
index dbb65c8b24a10c04adfdfb19dbcb91fe6460d049..9921f00b6fc87ec4c26aeacb3f0eb3c839d7cb7f 100644
--- a/rpi4-arm32.dockerfile
+++ b/rpi4-arm32.dockerfile
@@ -1,9 +1,9 @@
-FROM debian:buster
+FROM alpine:latest
 
 # linux/arm/v8
 
 RUN mkdir /app
-COPY ./NDI SDK for Linux/bin/arm-rpi4-linux-gnueabihf/ndi-directory-service /app/
+COPY "./NDI SDK for Linux/bin/arm-rpi4-linux-gnueabihf/ndi-directory-service" /app/
 RUN chmod +x /app/ndi-directory-service
 
 WORKDIR /app
diff --git a/rpi4-arm64.dockerfile b/rpi4-arm64.dockerfile
index aa0cceac8eb63fd9fd5ec38565af6376d6795699..24e76eff9acbfa4065f3f926dee5f872c7a3d43b 100644
--- a/rpi4-arm64.dockerfile
+++ b/rpi4-arm64.dockerfile
@@ -1,9 +1,9 @@
-FROM debian:buster
+FROM alpine:latest
 
 # linux/arm64/v8
 
 RUN mkdir /app
-COPY ./NDI SDK for Linux/bin/arm-rpi4-linux-gnueabihf/ndi-directory-service /app/
+COPY "./NDI SDK for Linux/bin/arm-rpi4-linux-gnueabihf/ndi-directory-service" /app/
 RUN chmod +x /app/ndi-directory-service
 
 WORKDIR /app