diff --git a/.github/workflows/native-binary-build-dlight.nativeexecution.yml b/.github/workflows/native-binary-build-dlight.nativeexecution.yml
index 65dc8a334ad3..d75171411c40 100644
--- a/.github/workflows/native-binary-build-dlight.nativeexecution.yml
+++ b/.github/workflows/native-binary-build-dlight.nativeexecution.yml
@@ -240,6 +240,8 @@ jobs:
 
     - name: Tidy up and display artifacts
       run: |
+        cp myfiles/nativeexecution-external-sources/LICENSE myfiles/LICENSE
+        cp myfiles/nativeexecution-external-sources/NOTICE myfiles/NOTICE
         rm -rf myfiles/*sources*
         ls -l -R
 
diff --git a/.github/workflows/native-binary-build-lib.profiler.yml b/.github/workflows/native-binary-build-lib.profiler.yml
index 2a6b58f86058..0b22805ae9de 100644
--- a/.github/workflows/native-binary-build-lib.profiler.yml
+++ b/.github/workflows/native-binary-build-lib.profiler.yml
@@ -110,7 +110,6 @@ jobs:
           SOURCES="profiler/lib.profiler/build/sources"
           mkdir -p ${SOURCES}/profiler/lib.profiler
           cp -r profiler/lib.profiler/native/ ${SOURCES}/profiler/lib.profiler/
-          find profiler/lib.profiler/release/lib/deployed -type d -exec mkdir -p "${SOURCES}/{}" \; -exec touch "${SOURCES}/{}/PLACEHOLDER" \;
           cp LICENSE ${SOURCES}/LICENSE
           cp NOTICE ${SOURCES}/NOTICE
           ls -l -R ${SOURCES}
@@ -316,6 +315,8 @@ jobs:
         
     - name: Tidy up and display artifacts
       run: |
+        cp myfiles/lib/deployed/jdk16/profiler-external-sources-ASF/LICENSE myfiles/LICENSE
+        cp myfiles/lib/deployed/jdk16/profiler-external-sources-ASF/NOTICE myfiles/NOTICE
         rm -rf myfiles/lib/deployed/jdk16/*sources*
         ls -l -R
 
diff --git a/profiler/lib.profiler/native/scripts/buildnative-linux.sh b/profiler/lib.profiler/native/scripts/buildnative-linux.sh
index 45f357db636f..e08128d4135a 100755
--- a/profiler/lib.profiler/native/scripts/buildnative-linux.sh
+++ b/profiler/lib.profiler/native/scripts/buildnative-linux.sh
@@ -30,6 +30,9 @@ SOURCES="../src-jdk15/class_file_cache.c \
 	../src-jdk15/Stacks.c \
 	../src-jdk15/common_functions.c"
 DEST="../../release/lib/deployed/jdk16/linux/"
+
+mkdir -p $DEST
+
 cc $CPPFLAGS -m32 -o ../build/config ../src-jdk15/config.c && ../build/config > ../build/config.h
 
 echo "Content of config.h :"
diff --git a/profiler/lib.profiler/native/scripts/buildnative-linux64.sh b/profiler/lib.profiler/native/scripts/buildnative-linux64.sh
index afbdf226db3c..941bbd463b6f 100755
--- a/profiler/lib.profiler/native/scripts/buildnative-linux64.sh
+++ b/profiler/lib.profiler/native/scripts/buildnative-linux64.sh
@@ -30,6 +30,9 @@ SOURCES="../src-jdk15/class_file_cache.c \
 	../src-jdk15/Stacks.c \
 	../src-jdk15/common_functions.c"
 DEST="../../release/lib/deployed/jdk16/linux-amd64/"
+
+mkdir -p $DEST
+
 cc $CPPFLAGS -m64 -o ../build/config ../src-jdk15/config.c && ../build/config > ../build/config.h
 
 echo "Content of config.h :"
diff --git a/profiler/lib.profiler/native/scripts/buildnative-mac.sh b/profiler/lib.profiler/native/scripts/buildnative-mac.sh
index 93bd6bb6e545..1d6f9cb8cff0 100755
--- a/profiler/lib.profiler/native/scripts/buildnative-mac.sh
+++ b/profiler/lib.profiler/native/scripts/buildnative-mac.sh
@@ -43,6 +43,8 @@ SOURCES="../src-jdk15/class_file_cache.c \
 
 DEST="../../release/lib/deployed/jdk16/mac"
 
+mkdir -p $DEST
+
 UNILIB="$DEST/libprofilerinterface.jnilib"
 
 cc $CPPFLAGS ../src-jdk15/config.c -o ../build/config && ../build/config > ../build/config.h