diff --git a/build_mace_run.sh b/build_mace_run.sh
index 0d9408a25b0cf77e48a3649cbe64ed62766fba28..ec5438f94ddf8e845cea8988bd7806b19e9df43a 100644
--- a/build_mace_run.sh
+++ b/build_mace_run.sh
@@ -65,3 +65,6 @@ if [ -f "$MODEL_OUTPUT_DIR/mace_run" ]; then
   rm -rf $MODEL_OUTPUT_DIR/mace_run
 fi
 cp bazel-bin/examples/mace_run $MODEL_OUTPUT_DIR
+if [ "$EMBED_MODEL_DATA" = 0 ]; then
+  cp codegen/models/${MODEL_TAG}/${MODEL_TAG}.data $MODEL_OUTPUT_DIR
+fi
\ No newline at end of file
diff --git a/config b/config
index 9f76f97a3c397c82175dfdfa199c055f6fc9a2f1..f47bb827ddf176dc36d2302729e96280810d6b20 100644
--- a/config
+++ b/config
@@ -14,3 +14,4 @@ TARGET_ABI=armeabi-v7a
 LIMIT_OPENCL_KERNEL_TIME=0
 DSP_MODE=0
 BENCHMARK_FLAG=0
+EMBED_MODEL_DATA=1
diff --git a/generate_model_code.sh b/generate_model_code.sh
index 2427696bd53e799ed11d90a56c236ba9226c61c2..8184b871d347067b5f8a2e58a18ce7301c54481d 100644
--- a/generate_model_code.sh
+++ b/generate_model_code.sh
@@ -26,4 +26,5 @@ bazel-bin/lib/python/tools/tf_converter --input=${TF_MODEL_FILE_PATH} \
                                         --model_tag=${MODEL_TAG} \
                                         --input_shape=${INPUT_SHAPE} \
                                         ${DSP_MODE_FLAG} \
+                                        --embed_model_data=${EMBED_MODEL_DATA} \
                                         --obfuscate=${OBFUSCATE} || exit 1
diff --git a/tuning_run.sh b/tuning_run.sh
index 222390d371c00f873587169ce42d478fbdbd3133..d7bfa4a9b8a1b02f49937748ba96fa3968a8db09 100644
--- a/tuning_run.sh
+++ b/tuning_run.sh
@@ -24,6 +24,7 @@ if [ x"$TARGET_ABI" = x"host" ]; then
       --output_shape="${OUTPUT_SHAPE}"\
       --input_file=${MODEL_OUTPUT_DIR}/${INPUT_FILE_NAME} \
       --output_file=${MODEL_OUTPUT_DIR}/${OUTPUT_FILE_NAME} \
+      --model_data_file=${MODEL_OUTPUT_DIR}/${MODEL_TAG}.data \
       --device=${DEVICE_TYPE}   \
       --round=1 || exit 1
 else
@@ -39,6 +40,9 @@ else
   fi
   adb push ${MODEL_OUTPUT_DIR}/${INPUT_FILE_NAME} ${PHONE_DATA_DIR} || exit 1
   adb push ${MODEL_OUTPUT_DIR}/mace_run ${PHONE_DATA_DIR} || exit 1
+  if [ "$EMBED_MODEL_DATA" = 0 ]; then
+    adb push ${MODEL_OUTPUT_DIR}/${MODEL_TAG}.data ${PHONE_DATA_DIR} || exit 1
+  fi
   adb push lib/hexagon/libhexagon_controller.so ${PHONE_DATA_DIR} || exit 1
   
   adb </dev/null shell \
@@ -53,6 +57,7 @@ else
     --output_shape="${OUTPUT_SHAPE}"\
     --input_file=${PHONE_DATA_DIR}/${INPUT_FILE_NAME} \
     --output_file=${PHONE_DATA_DIR}/${OUTPUT_FILE_NAME} \
+    --model_data_file=${PHONE_DATA_DIR}/${MODEL_TAG}.data \
     --device=${DEVICE_TYPE}   \
     --round=$ROUND || exit 1
 fi