diff --git a/pkg/firmware-all/Dockerfile b/pkg/firmware-all/Dockerfile
index 8c27ac6af..dd60092a7 100644
--- a/pkg/firmware-all/Dockerfile
+++ b/pkg/firmware-all/Dockerfile
@@ -5,12 +5,13 @@ RUN apk add --no-cache git
 ENV FW_URL=git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
 ENV FW_COMMIT=edf390c23a4e185ff36daded36575f669f5059f7
 
-RUN mkdir -p /out/lib && \
-    cd /out/lib && \
-    git clone ${FW_URL} firmware && \
-    cd firmware && \
-    git checkout ${FW_COMMIT} && \
-    rm -rf .git 
+RUN git clone ${FW_URL} && \
+    cd /linux-firmware && \
+    git checkout ${FW_COMMIT}
+
+RUN mkdir -p /out/lib/firmware && \
+    cd /linux-firmware && \
+    ./copy-firmware.sh /out/lib/firmware
 
 FROM scratch
 WORKDIR /
diff --git a/pkg/firmware/Dockerfile b/pkg/firmware/Dockerfile
index 34fdc0d0e..c22732ad6 100644
--- a/pkg/firmware/Dockerfile
+++ b/pkg/firmware/Dockerfile
@@ -25,6 +25,10 @@ RUN set -e && \
         ;; \
     esac
 
+# Create copy of files with symlinks based on WHENCE
+RUN cd /linux-firmware && \
+    ./copy-firmware.sh /linux-firmware-whence
+
 # Extract kernel modules for
 WORKDIR /
 COPY --from=kernel /kernel.tar /kernel.tar
@@ -34,7 +38,7 @@ RUN tar xf /kernel.tar
 RUN set -e && \
     for fw in $(find /lib/modules -name \*.ko -exec modinfo --field=firmware {} \;); do \
         mkdir -p "/out/lib/firmware/$(dirname $fw)" && \
-        cp "/linux-firmware/$fw" "/out/lib/firmware/$fw"; \
+        cp "/linux-firmware-whence/$fw" "/out/lib/firmware/$fw"; \
     done
 
 FROM scratch