diff --git a/scripts/build_bundle.sh b/scripts/build_bundle.sh
index 0dade53..f98fedc 100755
--- a/scripts/build_bundle.sh
+++ b/scripts/build_bundle.sh
@@ -37,11 +37,26 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 podman load --input images/$SERVICE_NAME/$SERVICE_NAME.tar
 podman create "$SERVICE_PACKAGE:$SERVICE_NAME" > images/$SERVICE_NAME/container_id.txt
 CONTAINER_ID=$(cat images/$SERVICE_NAME/container_id.txt)
+
 podman cp "$CONTAINER_ID:/service_manifest.binarypb" images/$SERVICE_NAME/service_manifest.binarypb
-podman cp "$CONTAINER_ID:/default_config.binarypb" images/$SERVICE_NAME/default_config.binarypb
-podman cp "$CONTAINER_ID:/parameter-descriptor-set.proto.bin" images/$SERVICE_NAME/parameter-descriptor-set.proto.bin
+
+
+for FILE in default_config.binarypb parameter-descriptor-set.proto.bin
+do
+  podman cp "$CONTAINER_ID:/$FILE" images/$SERVICE_NAME/$FILE 2>/dev/null || true
+done
+
 podman rm $CONTAINER_ID
 chmod 644 images/$SERVICE_NAME/$SERVICE_NAME.tar
+
+TAR_FILES="$SERVICE_NAME.tar service_manifest.binarypb"
+for FILE in default_config.binarypb parameter-descriptor-set.proto.bin
+do
+  if [ -f $FILE ]; then
+    TAR_FILES="$TAR_FILES $FILE"
+  fi
+done
+
 tar -cvf images/$SERVICE_NAME.bundle.tar \
   --owner=0 \
   --group=0 \
@@ -49,7 +64,4 @@ tar -cvf images/$SERVICE_NAME.bundle.tar \
   --no-same-permissions \
   -C \
   images/$SERVICE_NAME/ \
-  service_manifest.binarypb \
-  default_config.binarypb \
-  parameter-descriptor-set.proto.bin \
-  $SERVICE_NAME.tar
+  $TAR_FILES