diff --git a/bb64/CMakeLists.txt b/bb64/CMakeLists.txt
index 0491504..3c8b28b 100644
--- a/bb64/CMakeLists.txt
+++ b/bb64/CMakeLists.txt
@@ -5,6 +5,8 @@ if(NOT DEFINED PROJECT_NAME)
     message(FATAL_ERROR "PROJECT_NAME is not defined. Pass it via -DPROJECT_NAME=<name>")
 endif()
 
+project(${PROJECT_NAME})
+
 # Build configuration
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/bb64/Dockerfile.dropshell-build b/bb64/Dockerfile.dropshell-build
index b5416cc..e30743e 100644
--- a/bb64/Dockerfile.dropshell-build
+++ b/bb64/Dockerfile.dropshell-build
@@ -51,8 +51,13 @@ RUN --mount=type=cache,target=/ccache \
 # Copy the built executable to a regular directory for the final stage
 RUN --mount=type=cache,target=/build \
     mkdir -p /output && \
-    find /build -type f -executable -name "*${PROJECT}*" -exec cp {} /output/${PROJECT} \; || \
-    find /build -type f -executable -exec cp {} /output/${PROJECT} \;
+    if [ -f "/build/${PROJECT}" ]; then \
+        cp "/build/${PROJECT}" "/output/${PROJECT}"; \
+    else \
+        find /build -type f -executable -name "*${PROJECT}*" -exec cp {} /output/${PROJECT} \; || \
+        find /build -type f -executable -exec cp {} /output/${PROJECT} \; || \
+        (echo "Error: Could not find executable for ${PROJECT}" && ls -la /build && exit 1); \
+    fi
 
 # if we're a release build, then run upx on the binary.
 RUN if [ "${CMAKE_BUILD_TYPE}" = "Release" ]; then \