diff --git a/gateway-setup.sh b/gateway-setup.sh
index 41ec6e5e27..376d499dcc 100755
--- a/gateway-setup.sh
+++ b/gateway-setup.sh
@@ -41,7 +41,7 @@ copy_lists () {
   # Make destination folder if needed
   mkdir $HOST_CONF_PATH/lists
   # Copy all files in the source folder to the destination folder
-  cp $TEMPLATE_DIR/lists/*.json $HOST_CONF_PATH/lists
+  cp -rf $TEMPLATE_DIR/ $HOST_CONF_PATH
   # Confirm that the files were copied
   if [ $? -eq 0 ]; then
     echo "Files successfully copied from $TEMPLATE_DIR/lists to $HOST_CONF_PATH"
diff --git a/package.json b/package.json
index c4c0e1ec69..09abf60788 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "license": "Apache-2.0",
   "repository": "https://github.com/hummingbot/gateway",
   "scripts": {
-    "prebuild": "rimraf dist && mkdir dist",
+    "prebuild": "rimraf dist && mkdir dist && yarn copy-files:token-list",
     "build": "tsc --skipLibCheck --project ./ && yarn copy-files",
     "clean": "rm -rf ./node_modules && rm -rf ./coverage && rm -rf ./logs && yarn run clean:config",
     "clean:config": "find ./conf -maxdepth 1 -regextype posix-extended -regex '.*.*' -delete",
@@ -16,6 +16,7 @@
     "dev:debug": "NODE_ENV=dev DEBUG=* nodemon src/index.ts",
     "start": "/bin/bash ./startup.sh",
     "copy-files": "copyfiles -a 'src/**/schema/*.json' 'src/templates/*.yml' 'src/templates/lists/*.json' 'test/services/data/**/*.*' dist",
+    "copy-files:token-list": "mkdir -p conf/lists && copyfiles -u 'src/templates/lists/*.json' conf/lists",
     "test": "jest --verbose",
     "test:debug": "node --inspect node_modules/.bin/jest --watch --runInBand",
     "test:unit": "NODE_OPTIONS=--max_old_space_size=10240 jest --runInBand --verbose ./test/",