diff --git a/Dockerfile.dropshell-build b/Dockerfile.dropshell-build
index 76b4cc8..c0d6bfa 100644
--- a/Dockerfile.dropshell-build
+++ b/Dockerfile.dropshell-build
@@ -16,15 +16,10 @@ ENV CCACHE_MAXSIZE=2G
 
 COPY . .
 
-# Multi-architecture OpenSSL detection handled in cmake step
-
 # Configure and build with ccache using cache mounts
 RUN --mount=type=cache,target=/ccache \
     --mount=type=cache,target=/build \
     mkdir -p /build && \
-    SSL_LIB=$(find /usr/local -name "libssl.a" | head -1) && \
-    CRYPTO_LIB=$(find /usr/local -name "libcrypto.a" | head -1) && \
-    echo "Found SSL: $SSL_LIB, Crypto: $CRYPTO_LIB" && \
     cmake -G Ninja -S /app -B /build \
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
     -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
@@ -39,11 +34,7 @@ RUN --mount=type=cache,target=/ccache \
     -DPROJECT_NAME="${PROJECT}" \
     -DCMAKE_STRIP=OFF \
     -DIGNORE_DYNAMIC_LOADING=ON \
-    -DOPENSSL_ROOT_DIR=/usr/local \
     -DOPENSSL_USE_STATIC_LIBS=TRUE \
-    -DOPENSSL_SSL_LIBRARY="$SSL_LIB" \
-    -DOPENSSL_CRYPTO_LIBRARY="$CRYPTO_LIB" \
-    -DOPENSSL_INCLUDE_DIR=/usr/local/include \
     ${CMAKE_TOOLCHAIN_FILE:+-DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE}
 
 # Build with cache mounts
diff --git a/build-base/Dockerfile.dropshell-build-base b/build-base/Dockerfile.dropshell-build-base
index 0dd5439..37337e6 100644
--- a/build-base/Dockerfile.dropshell-build-base
+++ b/build-base/Dockerfile.dropshell-build-base
@@ -85,9 +85,8 @@ RUN curl -LO https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz &&
 ENV OPENSSL_ROOT_DIR=/usr/local \
     OPENSSL_INCLUDE_DIR=/usr/local/include \
     OPENSSL_CRYPTO_LIBRARY=/usr/local/lib/libcrypto.a \
-    OPENSSL_SSL_LIBRARY=/usr/local/lib/libssl.a \
-    PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
-
+    OPENSSL_SSL_LIBRARY=/usr/local/lib/libssl.a 
+    
 # Build jsoncpp statically with musl - use stable version known to work with Drogon
 ARG JSONCPP_VERSION=1.9.5
 WORKDIR /tmp