diff --git a/bin/build-arch b/bin/build-arch
index b6dba1b..4e971a6 100755
--- a/bin/build-arch
+++ b/bin/build-arch
@@ -22,3 +22,9 @@ chmod +x "$BIN"
 zip -r "${BIN}.zip" "$BIN"
 zip -r "libcrypteia-${BUILD_ARCH}.zip" "$LIB"
 cd ..
+
+rm -rf ./package/opt
+mkdir -p ./package/opt/extensions
+mkdir -p ./package/opt/lib
+cp "./build/crypteia-${BUILD_ARCH}" ./package/opt/extensions/crypteia
+cp "./build/libcrypteia-${BUILD_ARCH}.so" ./package/opt/lib/libcrypteia.so
diff --git a/package/Dockerfile-amzn b/package/Dockerfile-amzn
index b50024d..0744ad6 100644
--- a/package/Dockerfile-amzn
+++ b/package/Dockerfile-amzn
@@ -1,8 +1,4 @@
 FROM alpine
 LABEL org.opencontainers.image.source "https://github.com/customink/crypteia"
 LABEL org.opencontainers.image.description "Rust Lambda Extension for any Runtime to preload SSM Parameters as Secure Environment Variables!"
-
-RUN mkdir -p /opt/lib
-RUN mkdir -p /opt/extensions
-COPY ./build/crypteia-amzn /opt/extensions/crypteia
-COPY ./build/libcrypteia-amzn.so /opt/lib/libcrypteia.so
+COPY ./package/opt /opt
diff --git a/package/Dockerfile-debian b/package/Dockerfile-debian
index c83676f..0744ad6 100644
--- a/package/Dockerfile-debian
+++ b/package/Dockerfile-debian
@@ -1,8 +1,4 @@
 FROM alpine
 LABEL org.opencontainers.image.source "https://github.com/customink/crypteia"
 LABEL org.opencontainers.image.description "Rust Lambda Extension for any Runtime to preload SSM Parameters as Secure Environment Variables!"
-
-RUN mkdir -p /opt/lib
-RUN mkdir -p /opt/extensions
-COPY ./build/crypteia-debian /opt/extensions/crypteia
-COPY ./build/libcrypteia-debian.so /opt/lib/libcrypteia.so
+COPY ./package/opt /opt
diff --git a/package/deploy b/package/deploy
index 8d8f2e2..e7ca927 100755
--- a/package/deploy
+++ b/package/deploy
@@ -6,12 +6,6 @@ if [ -z "${S3_BUCKET_NAME}" ]; then
   exit 1
 fi
 
-mkdir -p ./package/opt/extensions
-mkdir -p ./package/opt/lib
-
-cp ./build/crypteia-amzn ./package/opt/extensions/crypteia
-cp ./build/libcrypteia-amzn.so ./package/opt/lib/libcrypteia.so
-
 cd ./package/opt
 zip -r package.zip .
 mv package.zip ..