diff --git a/Dockerfile b/Dockerfile
index 979aa7a..6a5e516 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,24 @@
 FROM eclipse-temurin:21 AS builder
 
+#^3
 ARG IS_PROD
 ARG FLAVOR
 ARG BUILD_ON_HOST
 ARG BUILD_ON_DOCKER
+#!3
+
+#3
 
 WORKDIR /app
 
 COPY . .
 
+#2
+
 RUN find scripts/ -type f -name "*.sh" -exec sed -i 's/\r$//' {} + && \
     sed -i 's/\r$//' gradlew
 
-ENV IS_HOST=false
+ENV IS_LOCAL_HOST=false
 ENV IS_DOCKER=true
 
 RUN --mount=type=cache,target=/root/.gradle \
@@ -25,8 +31,8 @@ RUN mkdir /app
 WORKDIR /app
 COPY --from=builder /app/server/build/libs/*-all.jar ./ktor-server.jar
 COPY --from=builder /app/cli/build/distributions/cli.tar ./cli.tar
-COPY --from=builder /app/deploy/preset_data ./preset_data
-COPY scripts/tool_scripts/flush-database-singleton.sh .
+COPY --from=builder /app/deploy/preset_data ./deploy/preset_data
+COPY scripts/tool_scripts/flush-database-singleton.sh ./scripts/tool_scripts/flush-database-singleton.sh
 RUN tar -xf ./cli.tar
 
 ENTRYPOINT ["java","-jar","./ktor-server.jar"]
diff --git a/Dockerfile.patched b/Dockerfile.patched
new file mode 100644
index 0000000..5ce9529
--- /dev/null
+++ b/Dockerfile.patched
@@ -0,0 +1,130 @@
+FROM eclipse-temurin:21 AS builder
+
+#^3
+#patched
+#!3
+
+ARG IS_PROD
+ARG FLAVOR
+ARG BUILD_ON_LOCAL_HOST
+ARG BUILD_ON_DOCKER
+ARG BUILD_ON_REMOTE_HOST
+ARG COMPOSE_PROFILES
+ARG COMPOSE_PROJECT_NAME
+ARG SEARCH_SERVICE
+ARG LUCENE_BASE_PATH
+ARG STACK_VERSION
+ARG CLUSTER_NAME
+ARG LICENSE
+ARG KIBANA_PORT
+ARG KIBANA_PASSWORD
+ARG ENCRYPTION_KEY
+ARG ELASTIC_URL
+ARG ES_PORT
+ARG CERTS_DIR
+ARG CERT_FILE
+ARG ELASTIC_NAME
+ARG ELASTIC_PASSWORD
+ARG MEDIA_SERVICE
+ARG MINIO_URL
+ARG MINIO_PORT
+ARG MINIO_PORT_CONSOLE
+ARG MINIO_NAME
+ARG MINIO_PASS
+ARG DATABASE_URI
+ARG DATABASE_PORT
+ARG DATABASE_DB
+ARG DATABASE_DRIVER
+ARG DATABASE_USER
+ARG DATABASE_PASS
+ARG DATABASE_FRONT_PORT
+ARG HMAC_KEY
+ARG BUNKER_VERSION
+ARG BUNKER_PORT
+ARG BUNKER_PORT_SECRET
+ARG SERVER_PORT
+ARG SERVER_URL
+ARG WS_SERVER_URL
+ARG PRESET_ENABLE
+ARG PRESET_WORKING_DIR
+ARG PRESET_SCRIPT
+ARG PRESET_ENCRYPTED_URI
+ARG PRESET_ENCRYPTED_PASSWORD
+#override
+ENV FLAVOR=generated-${FLAVOR}
+
+WORKDIR /app
+
+COPY . .
+
+COPY <<EOF ./${FLAVOR}.env
+IS_PROD=${IS_PROD}
+FLAVOR=${FLAVOR}
+BUILD_ON_LOCAL_HOST=${BUILD_ON_LOCAL_HOST}
+BUILD_ON_DOCKER=${BUILD_ON_DOCKER}
+BUILD_ON_REMOTE_HOST=${BUILD_ON_REMOTE_HOST}
+COMPOSE_PROFILES=${COMPOSE_PROFILES}
+COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}
+SEARCH_SERVICE=${SEARCH_SERVICE}
+LUCENE_BASE_PATH=${LUCENE_BASE_PATH}
+STACK_VERSION=${STACK_VERSION}
+CLUSTER_NAME=${CLUSTER_NAME}
+LICENSE=${LICENSE}
+KIBANA_PORT=${KIBANA_PORT}
+KIBANA_PASSWORD=${KIBANA_PASSWORD}
+ENCRYPTION_KEY=${ENCRYPTION_KEY}
+ELASTIC_URL=${ELASTIC_URL}
+ES_PORT=${ES_PORT}
+CERTS_DIR=${CERTS_DIR}
+CERT_FILE=${CERT_FILE}
+ELASTIC_NAME=${ELASTIC_NAME}
+ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
+MEDIA_SERVICE=${MEDIA_SERVICE}
+MINIO_URL=${MINIO_URL}
+MINIO_PORT=${MINIO_PORT}
+MINIO_PORT_CONSOLE=${MINIO_PORT_CONSOLE}
+MINIO_NAME=${MINIO_NAME}
+MINIO_PASS=${MINIO_PASS}
+DATABASE_URI=${DATABASE_URI}
+DATABASE_PORT=${DATABASE_PORT}
+DATABASE_DB=${DATABASE_DB}
+DATABASE_DRIVER=${DATABASE_DRIVER}
+DATABASE_USER=${DATABASE_USER}
+DATABASE_PASS=${DATABASE_PASS}
+DATABASE_FRONT_PORT=${DATABASE_FRONT_PORT}
+HMAC_KEY=${HMAC_KEY}
+BUNKER_VERSION=${BUNKER_VERSION}
+BUNKER_PORT=${BUNKER_PORT}
+BUNKER_PORT_SECRET=${BUNKER_PORT_SECRET}
+SERVER_PORT=${SERVER_PORT}
+SERVER_URL=${SERVER_URL}
+WS_SERVER_URL=${WS_SERVER_URL}
+PRESET_ENABLE=${PRESET_ENABLE}
+PRESET_WORKING_DIR=${PRESET_WORKING_DIR}
+PRESET_SCRIPT=${PRESET_SCRIPT}
+PRESET_ENCRYPTED_URI=${PRESET_ENCRYPTED_URI}
+PRESET_ENCRYPTED_PASSWORD=${PRESET_ENCRYPTED_PASSWORD}
+EOF
+
+
+RUN find scripts/ -type f -name "*.sh" -exec sed -i 's/\r$//' {} + && \
+    sed -i 's/\r$//' gradlew
+
+ENV IS_LOCAL_HOST=false
+ENV IS_DOCKER=true
+
+RUN --mount=type=cache,target=/root/.gradle \
+    sh scripts/build_scripts/build-all-in-flavor.sh ${FLAVOR} ${IS_PROD}
+
+FROM eclipse-temurin:21
+
+RUN mkdir /app
+
+WORKDIR /app
+COPY --from=builder /app/server/build/libs/*-all.jar ./ktor-server.jar
+COPY --from=builder /app/cli/build/distributions/cli.tar ./cli.tar
+COPY --from=builder /app/deploy/preset_data ./deploy/preset_data
+COPY scripts/tool_scripts/flush-database-singleton.sh ./scripts/tool_scripts/flush-database-singleton.sh
+RUN tar -xf ./cli.tar
+
+ENTRYPOINT ["java","-jar","./ktor-server.jar"]
diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
index 76b28b4..8aca04b 100644
--- a/backend/build.gradle.kts
+++ b/backend/build.gradle.kts
@@ -19,6 +19,7 @@ dependencies {
     api(libs.exposed.core)
     api(libs.exposed.dao)
     implementation(libs.pgjdbc.ng)
+    implementation(libs.postgresql)
     implementation(libs.napier)
     api(libs.exposed.crypt)
     api(libs.exposed.jdbc)
@@ -54,7 +55,7 @@ sourceSets {
 
 val flavor = project.findProperty("buildkonfig.flavor")
 
-val copyTask = tasks.register("CopyNewEnv", Copy::class) {
+val copyTask = tasks.register("CopyEnv", Copy::class) {
     group = "copy"
     from("../${flavor}.env")
     into(layout.buildDirectory.dir("copied/resources"))
diff --git a/deploy/Dockerfile.koyeb b/deploy/Dockerfile.koyeb
index e979754..9a00cd6 100644
--- a/deploy/Dockerfile.koyeb
+++ b/deploy/Dockerfile.koyeb
@@ -7,108 +7,13 @@ RUN apt-get install -y --no-install-recommends \
     unzip \
     jq
 
-ARG IS_PROD
-ARG FLAVOR
-ARG BUILD_ON_HOST
-ARG BUILD_ON_DOCKER
-ARG COMPOSE_PROFILES
-ARG COMPOSE_PROJECT_NAME
-ARG SEARCH_SERVICE
-ARG LUCENE_BASE_PATH
-ARG STACK_VERSION
-ARG CLUSTER_NAME
-ARG LICENSE
-ARG KIBANA_PORT
-ARG KIBANA_PASSWORD
-ARG ENCRYPTION_KEY
-ARG ELASTIC_URL
-ARG ES_PORT
-ARG CERTS_DIR
-ARG CERT_FILE
-ARG ELASTIC_NAME
-ARG ELASTIC_PASSWORD
-ARG MEDIA_SERVICE
-ARG MINIO_URL
-ARG MINIO_PORT
-ARG MINIO_PORT_CONSOLE
-ARG MINIO_NAME
-ARG MINIO_PASS
-ARG DATABASE_URI
-ARG DATABASE_PORT
-ARG DATABASE_DB
-ARG DATABASE_DRIVER
-ARG DATABASE_USER
-ARG DATABASE_PASS
-ARG DATABASE_FRONT_PORT
-ARG HMAC_KEY
-ARG BUNKER_VERSION
-ARG BUNKER_PORT
-ARG BUNKER_PORT_SECRET
-ARG SERVER_PORT
-ARG SERVER_URL
-ARG WS_SERVER_URL
-ARG PRESET_ENABLE
-ARG PRESET_WORKING_DIR
-ARG PRESET_SCRIPT
-ARG PRESET_ENCRYPTED_URI
-ARG PRESET_ENCRYPTED_PASSWORD
-
-
-#override
-ENV FLAVOR=generated-${FLAVOR}
+#3
 
 WORKDIR /app
 
 COPY . .
 
-COPY <<EOF ./${FLAVOR}.env
-IS_PROD=${IS_PROD}
-FLAVOR=${FLAVOR}
-BUILD_ON_HOST=${BUILD_ON_HOST}
-BUILD_ON_DOCKER=${BUILD_ON_DOCKER}
-COMPOSE_PROFILES=${COMPOSE_PROFILES}
-COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}
-SEARCH_SERVICE=${SEARCH_SERVICE}
-LUCENE_BASE_PATH=${LUCENE_BASE_PATH}
-STACK_VERSION=${STACK_VERSION}
-CLUSTER_NAME=${CLUSTER_NAME}
-LICENSE=${LICENSE}
-KIBANA_PORT=${KIBANA_PORT}
-KIBANA_PASSWORD=${KIBANA_PASSWORD}
-ENCRYPTION_KEY=${ENCRYPTION_KEY}
-ELASTIC_URL=${ELASTIC_URL}
-ES_PORT=${ES_PORT}
-CERTS_DIR=${CERTS_DIR}
-CERT_FILE=${CERT_FILE}
-ELASTIC_NAME=${ELASTIC_NAME}
-ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
-MEDIA_SERVICE=${MEDIA_SERVICE}
-MINIO_URL=${MINIO_URL}
-MINIO_PORT=${MINIO_PORT}
-MINIO_PORT_CONSOLE=${MINIO_PORT_CONSOLE}
-MINIO_NAME=${MINIO_NAME}
-MINIO_PASS=${MINIO_PASS}
-DATABASE_URI=${DATABASE_URI}
-DATABASE_PORT=${DATABASE_PORT}
-DATABASE_DB=${DATABASE_DB}
-DATABASE_DRIVER=${DATABASE_DRIVER}
-DATABASE_USER=${DATABASE_USER}
-DATABASE_PASS=${DATABASE_PASS}
-DATABASE_FRONT_PORT=${DATABASE_FRONT_PORT}
-HMAC_KEY=${HMAC_KEY}
-BUNKER_VERSION=${BUNKER_VERSION}
-BUNKER_PORT=${BUNKER_PORT}
-BUNKER_PORT_SECRET=${BUNKER_PORT_SECRET}
-SERVER_PORT=${SERVER_PORT}
-SERVER_URL=${SERVER_URL}
-WS_SERVER_URL=${WS_SERVER_URL}
-PRESET_ENABLE=${PRESET_ENABLE}
-PRESET_WORKING_DIR=${PRESET_WORKING_DIR}
-PRESET_SCRIPT=${PRESET_SCRIPT}
-PRESET_ENCRYPTED_URI=${PRESET_ENCRYPTED_URI}
-PRESET_ENCRYPTED_PASSWORD=${PRESET_ENCRYPTED_PASSWORD}
-EOF
-
+#2
 
 RUN find scripts/ -type f -name "*.sh" -exec sed -i 's/\r$//' {} + && \
     sed -i 's/\r$//' gradlew
@@ -128,103 +33,10 @@ FROM koyeb/docker-compose
 
 RUN apk add --no-cache git
 
-ARG IS_PROD
-ENV IS_PROD=$IS_PROD
-ARG FLAVOR
-ENV FLAVOR=$FLAVOR
-ARG BUILD_ON_HOST
-ENV BUILD_ON_HOST=$BUILD_ON_HOST
-ARG BUILD_ON_DOCKER
-ENV BUILD_ON_DOCKER=$BUILD_ON_DOCKER
-ARG COMPOSE_PROFILES
-ENV COMPOSE_PROFILES=$COMPOSE_PROFILES
-ARG COMPOSE_PROJECT_NAME
-ENV COMPOSE_PROJECT_NAME=$COMPOSE_PROJECT_NAME
-ARG SEARCH_SERVICE
-ENV SEARCH_SERVICE=$SEARCH_SERVICE
-ARG LUCENE_BASE_PATH
-ENV LUCENE_BASE_PATH=$LUCENE_BASE_PATH
-ARG STACK_VERSION
-ENV STACK_VERSION=$STACK_VERSION
-ARG CLUSTER_NAME
-ENV CLUSTER_NAME=$CLUSTER_NAME
-ARG LICENSE
-ENV LICENSE=$LICENSE
-ARG KIBANA_PORT
-ENV KIBANA_PORT=$KIBANA_PORT
-ARG KIBANA_PASSWORD
-ENV KIBANA_PASSWORD=$KIBANA_PASSWORD
-ARG ENCRYPTION_KEY
-ENV ENCRYPTION_KEY=$ENCRYPTION_KEY
-ARG ELASTIC_URL
-ENV ELASTIC_URL=$ELASTIC_URL
-ARG ES_PORT
-ENV ES_PORT=$ES_PORT
-ARG CERTS_DIR
-ENV CERTS_DIR=$CERTS_DIR
-ARG CERT_FILE
-ENV CERT_FILE=$CERT_FILE
-ARG ELASTIC_NAME
-ENV ELASTIC_NAME=$ELASTIC_NAME
-ARG ELASTIC_PASSWORD
-ENV ELASTIC_PASSWORD=$ELASTIC_PASSWORD
-ARG MEDIA_SERVICE
-ENV MEDIA_SERVICE=$MEDIA_SERVICE
-ARG MINIO_URL
-ENV MINIO_URL=$MINIO_URL
-ARG MINIO_PORT
-ENV MINIO_PORT=$MINIO_PORT
-ARG MINIO_PORT_CONSOLE
-ENV MINIO_PORT_CONSOLE=$MINIO_PORT_CONSOLE
-ARG MINIO_NAME
-ENV MINIO_NAME=$MINIO_NAME
-ARG MINIO_PASS
-ENV MINIO_PASS=$MINIO_PASS
-ARG DATABASE_URI
-ENV DATABASE_URI=$DATABASE_URI
-ARG DATABASE_PORT
-ENV DATABASE_PORT=$DATABASE_PORT
-ARG DATABASE_DB
-ENV DATABASE_DB=$DATABASE_DB
-ARG DATABASE_DRIVER
-ENV DATABASE_DRIVER=$DATABASE_DRIVER
-ARG DATABASE_USER
-ENV DATABASE_USER=$DATABASE_USER
-ARG DATABASE_PASS
-ENV DATABASE_PASS=$DATABASE_PASS
-ARG DATABASE_FRONT_PORT
-ENV DATABASE_FRONT_PORT=$DATABASE_FRONT_PORT
-ARG HMAC_KEY
-ENV HMAC_KEY=$HMAC_KEY
-ARG BUNKER_VERSION
-ENV BUNKER_VERSION=$BUNKER_VERSION
-ARG BUNKER_PORT
-ENV BUNKER_PORT=$BUNKER_PORT
-ARG BUNKER_PORT_SECRET
-ENV BUNKER_PORT_SECRET=$BUNKER_PORT_SECRET
-ARG SERVER_PORT
-ENV SERVER_PORT=$SERVER_PORT
-ARG SERVER_URL
-ENV SERVER_URL=$SERVER_URL
-ARG WS_SERVER_URL
-ENV WS_SERVER_URL=$WS_SERVER_URL
-ARG PRESET_ENABLE
-ENV PRESET_ENABLE=$PRESET_ENABLE
-ARG PRESET_WORKING_DIR
-ENV PRESET_WORKING_DIR=$PRESET_WORKING_DIR
-ARG PRESET_SCRIPT
-ENV PRESET_SCRIPT=$PRESET_SCRIPT
-ARG PRESET_ENCRYPTED_URI
-ENV PRESET_ENCRYPTED_URI=$PRESET_ENCRYPTED_URI
-ARG PRESET_ENCRYPTED_PASSWORD
-ENV PRESET_ENCRYPTED_PASSWORD=$PRESET_ENCRYPTED_PASSWORD
-
-
-#override
-ENV FLAVOR=generated-${FLAVOR}
+#3
 
 WORKDIR /app
 
 COPY --from=builder /app .
 
-CMD sh ./scripts/service_scripts/start-compose-in-koyeb.sh
+CMD sh ./scripts/service_scripts/start-compose-in-koyeb.sh ${FLAVOR}
diff --git a/deploy/Dockerfile.koyeb.patched b/deploy/Dockerfile.koyeb.patched
new file mode 100644
index 0000000..52c04a1
--- /dev/null
+++ b/deploy/Dockerfile.koyeb.patched
@@ -0,0 +1,184 @@
+FROM ubuntu AS builder
+
+RUN apt-get update
+RUN apt-get install -y --no-install-recommends \
+    openjdk-21-jdk \
+    curl \
+    unzip \
+    jq
+
+ARG IS_PROD
+ARG FLAVOR
+ARG BUILD_ON_LOCAL_HOST
+ARG BUILD_ON_DOCKER
+ARG BUILD_ON_REMOTE_HOST
+ARG COMPOSE_PROFILES
+ARG COMPOSE_PROJECT_NAME
+ARG SEARCH_SERVICE
+ARG LUCENE_BASE_PATH
+ARG STACK_VERSION
+ARG CLUSTER_NAME
+ARG LICENSE
+ARG KIBANA_PORT
+ARG KIBANA_PASSWORD
+ARG ENCRYPTION_KEY
+ARG ELASTIC_URL
+ARG ES_PORT
+ARG CERTS_DIR
+ARG CERT_FILE
+ARG ELASTIC_NAME
+ARG ELASTIC_PASSWORD
+ARG MEDIA_SERVICE
+ARG MINIO_URL
+ARG MINIO_PORT
+ARG MINIO_PORT_CONSOLE
+ARG MINIO_NAME
+ARG MINIO_PASS
+ARG DATABASE_URI
+ARG DATABASE_PORT
+ARG DATABASE_DB
+ARG DATABASE_DRIVER
+ARG DATABASE_USER
+ARG DATABASE_PASS
+ARG DATABASE_FRONT_PORT
+ARG HMAC_KEY
+ARG BUNKER_VERSION
+ARG BUNKER_PORT
+ARG BUNKER_PORT_SECRET
+ARG SERVER_PORT
+ARG SERVER_URL
+ARG WS_SERVER_URL
+ARG PRESET_ENABLE
+ARG PRESET_WORKING_DIR
+ARG PRESET_SCRIPT
+ARG PRESET_ENCRYPTED_URI
+ARG PRESET_ENCRYPTED_PASSWORD
+#override
+ENV FLAVOR=generated-${FLAVOR}
+
+WORKDIR /app
+
+COPY . .
+
+COPY <<EOF ./${FLAVOR}.env
+IS_PROD=${IS_PROD}
+FLAVOR=${FLAVOR}
+BUILD_ON_LOCAL_HOST=${BUILD_ON_LOCAL_HOST}
+BUILD_ON_DOCKER=${BUILD_ON_DOCKER}
+BUILD_ON_REMOTE_HOST=${BUILD_ON_REMOTE_HOST}
+COMPOSE_PROFILES=${COMPOSE_PROFILES}
+COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}
+SEARCH_SERVICE=${SEARCH_SERVICE}
+LUCENE_BASE_PATH=${LUCENE_BASE_PATH}
+STACK_VERSION=${STACK_VERSION}
+CLUSTER_NAME=${CLUSTER_NAME}
+LICENSE=${LICENSE}
+KIBANA_PORT=${KIBANA_PORT}
+KIBANA_PASSWORD=${KIBANA_PASSWORD}
+ENCRYPTION_KEY=${ENCRYPTION_KEY}
+ELASTIC_URL=${ELASTIC_URL}
+ES_PORT=${ES_PORT}
+CERTS_DIR=${CERTS_DIR}
+CERT_FILE=${CERT_FILE}
+ELASTIC_NAME=${ELASTIC_NAME}
+ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
+MEDIA_SERVICE=${MEDIA_SERVICE}
+MINIO_URL=${MINIO_URL}
+MINIO_PORT=${MINIO_PORT}
+MINIO_PORT_CONSOLE=${MINIO_PORT_CONSOLE}
+MINIO_NAME=${MINIO_NAME}
+MINIO_PASS=${MINIO_PASS}
+DATABASE_URI=${DATABASE_URI}
+DATABASE_PORT=${DATABASE_PORT}
+DATABASE_DB=${DATABASE_DB}
+DATABASE_DRIVER=${DATABASE_DRIVER}
+DATABASE_USER=${DATABASE_USER}
+DATABASE_PASS=${DATABASE_PASS}
+DATABASE_FRONT_PORT=${DATABASE_FRONT_PORT}
+HMAC_KEY=${HMAC_KEY}
+BUNKER_VERSION=${BUNKER_VERSION}
+BUNKER_PORT=${BUNKER_PORT}
+BUNKER_PORT_SECRET=${BUNKER_PORT_SECRET}
+SERVER_PORT=${SERVER_PORT}
+SERVER_URL=${SERVER_URL}
+WS_SERVER_URL=${WS_SERVER_URL}
+PRESET_ENABLE=${PRESET_ENABLE}
+PRESET_WORKING_DIR=${PRESET_WORKING_DIR}
+PRESET_SCRIPT=${PRESET_SCRIPT}
+PRESET_ENCRYPTED_URI=${PRESET_ENCRYPTED_URI}
+PRESET_ENCRYPTED_PASSWORD=${PRESET_ENCRYPTED_PASSWORD}
+EOF
+
+
+RUN find scripts/ -type f -name "*.sh" -exec sed -i 's/\r$//' {} + && \
+    sed -i 's/\r$//' gradlew
+
+RUN bash scripts/download_scripts/download_data.sh $PRESET_ENCRYPTED_URI $PRESET_ENCRYPTED_PASSWORD
+
+RUN bash scripts/download_scripts/manual-download-docker-image.sh
+
+#mock host environment
+ENV IS_HOST=true
+ENV IS_DOCKER=false
+
+RUN --mount=type=cache,target=/root/.gradle \
+    sh scripts/build_scripts/build-all-in-flavor.sh ${FLAVOR} ${IS_PROD}
+
+FROM koyeb/docker-compose
+
+RUN apk add --no-cache git
+
+ARG IS_PROD
+ARG FLAVOR
+ARG BUILD_ON_LOCAL_HOST
+ARG BUILD_ON_DOCKER
+ARG BUILD_ON_REMOTE_HOST
+ARG COMPOSE_PROFILES
+ARG COMPOSE_PROJECT_NAME
+ARG SEARCH_SERVICE
+ARG LUCENE_BASE_PATH
+ARG STACK_VERSION
+ARG CLUSTER_NAME
+ARG LICENSE
+ARG KIBANA_PORT
+ARG KIBANA_PASSWORD
+ARG ENCRYPTION_KEY
+ARG ELASTIC_URL
+ARG ES_PORT
+ARG CERTS_DIR
+ARG CERT_FILE
+ARG ELASTIC_NAME
+ARG ELASTIC_PASSWORD
+ARG MEDIA_SERVICE
+ARG MINIO_URL
+ARG MINIO_PORT
+ARG MINIO_PORT_CONSOLE
+ARG MINIO_NAME
+ARG MINIO_PASS
+ARG DATABASE_URI
+ARG DATABASE_PORT
+ARG DATABASE_DB
+ARG DATABASE_DRIVER
+ARG DATABASE_USER
+ARG DATABASE_PASS
+ARG DATABASE_FRONT_PORT
+ARG HMAC_KEY
+ARG BUNKER_VERSION
+ARG BUNKER_PORT
+ARG BUNKER_PORT_SECRET
+ARG SERVER_PORT
+ARG SERVER_URL
+ARG WS_SERVER_URL
+ARG PRESET_ENABLE
+ARG PRESET_WORKING_DIR
+ARG PRESET_SCRIPT
+ARG PRESET_ENCRYPTED_URI
+ARG PRESET_ENCRYPTED_PASSWORD
+#override
+ENV FLAVOR=generated-${FLAVOR}
+
+WORKDIR /app
+
+COPY --from=builder /app .
+
+CMD sh ./scripts/service_scripts/start-compose-in-koyeb.sh ${FLAVOR}
diff --git a/deploy/Dockerfile.koyeb_template b/deploy/Dockerfile.koyeb_template
deleted file mode 100644
index 9544885..0000000
--- a/deploy/Dockerfile.koyeb_template
+++ /dev/null
@@ -1,48 +0,0 @@
-FROM ubuntu AS builder
-
-RUN apt-get update
-RUN apt-get install -y --no-install-recommends \
-    openjdk-21-jdk \
-    curl \
-    unzip \
-    jq
-
-#3
-
-#override
-ENV FLAVOR=generated-${FLAVOR}
-
-WORKDIR /app
-
-COPY . .
-
-#2
-
-RUN find scripts/ -type f -name "*.sh" -exec sed -i 's/\r$//' {} + && \
-    sed -i 's/\r$//' gradlew
-
-RUN bash scripts/download_scripts/download_data.sh $PRESET_ENCRYPTED_URI $PRESET_ENCRYPTED_PASSWORD
-
-RUN bash scripts/download_scripts/manual-download-docker-image.sh
-
-#mock host environment
-ENV IS_HOST=true
-ENV IS_DOCKER=false
-
-RUN --mount=type=cache,target=/root/.gradle \
-    sh scripts/build_scripts/build-all-in-flavor.sh ${FLAVOR} ${IS_PROD}
-
-FROM koyeb/docker-compose
-
-RUN apk add --no-cache git
-
-#1
-
-#override
-ENV FLAVOR=generated-${FLAVOR}
-
-WORKDIR /app
-
-COPY --from=builder /app .
-
-CMD sh ./scripts/service_scripts/start-compose-in-koyeb.sh
diff --git a/dev.env b/dev.env
index 8c46715..ef81e0b 100644
--- a/dev.env
+++ b/dev.env
@@ -1,6 +1,8 @@
 IS_PROD=false
 FLAVOR=dev
-BUILD_ON_HOST=false
+BUILD_ON_LOCAL_HOST=false
+BUILD_ON_DOCKER=false
+BUILD_ON_REMOTE_HOST=false
 COMPOSE_PROFILES=db,es,media
 COMPOSE_PROJECT_NAME=a-dev
 
diff --git a/dev.win.env b/dev.win.env
index df09e61..0b0ad0d 100644
--- a/dev.win.env
+++ b/dev.win.env
@@ -1,6 +1,8 @@
 IS_PROD=false
 FLAVOR=dev
-BUILD_ON_HOST=false
+BUILD_ON_LOCAL_HOST=false
+BUILD_ON_DOCKER=false
+BUILD_ON_REMOTE_HOST=false
 COMPOSE_PROFILES=db,es,media
 COMPOSE_PROJECT_NAME=a-dev
 
diff --git a/gradle.properties b/gradle.properties
index 398ff46..64e9069 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlin.mpp.enableCInteropCommonization=true
 kotlin.native.ignoreDisabledTargets=true
 
 server.prod=false
-buildkonfig.flavor=dev
+buildkonfig.flavor=koyeb
 
 # If set to true, enables Gradle Worker API for Detekt tasks. `false` by default.
 # See the doc for the Worker API at https://docs.gradle.org/8.1/userguide/worker_api.html
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 00d0b84..e628889 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -37,6 +37,7 @@ minio = "8.5.11"
 multiplatformSettingsNoArg = "1.2.0"
 pagingCommon = "3.3.0-alpha02-0.5.1"
 pgjdbcNg = "0.8.9"
+postgresql = "42.7.2"
 precomposeViewmodel = "1.6.2"
 precompose = "1.6.2"
 slf4jSimple = "2.0.13"
@@ -123,6 +124,7 @@ multiplatform-settings-serialization = { module = "com.russhwolf:multiplatform-s
 paging-common = { module = "app.cash.paging:paging-common", version.ref = "pagingCommon" }
 paging-compose-common = { module = "app.cash.paging:paging-compose-common", version.ref = "pagingCommon" }
 pgjdbc-ng = { module = "com.impossibl.pgjdbc-ng:pgjdbc-ng", version.ref = "pgjdbcNg" }
+postgresql = { module = "org.postgresql:postgresql", version.ref = "postgresql" }
 precompose-viewmodel = { module = "moe.tlaster:precompose-viewmodel", version.ref = "precomposeViewmodel" }
 precompose = { module = "moe.tlaster:precompose", version.ref = "precompose" }
 slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4jSimple" }
diff --git a/scripts/build_scripts/build-cli.sh b/scripts/build_scripts/build-cli.sh
index 487f38d..e430198 100644
--- a/scripts/build_scripts/build-cli.sh
+++ b/scripts/build_scripts/build-cli.sh
@@ -1,4 +1,4 @@
 set -e
-sh scripts/tool_scripts/check-all-env.sh
+bash scripts/tool_scripts/check-all-env.sh
 sh gradlew cli:distZip cli:distTar --no-daemon
 cp ./cli/build/distributions/cli.zip ./deploy/build
diff --git a/scripts/build_scripts/build-server-on-condition.sh b/scripts/build_scripts/build-server-on-condition.sh
index b171306..6ac1671 100644
--- a/scripts/build_scripts/build-server-on-condition.sh
+++ b/scripts/build_scripts/build-server-on-condition.sh
@@ -1,16 +1,15 @@
 set -e
 
-# 判断 IS_HOST/IS_DOCKER 和 BUILD_ON_HOST/BUILD_ON_DOCKER 是否设置
-if [ -z "$IS_HOST" ] || [ -z "$IS_DOCKER" ] || [ -z "$BUILD_ON_HOST" ] || [ -z "$BUILD_ON_DOCKER" ]; then
-  echo "Error: IS_HOST/IS_DOCKER and BUILD_ON_HOST/BUILD_ON_DOCKER must be set."
+if [ -z "$IS_LOCAL_HOST" ] || [ -z "$IS_DOCKER" ] || [ -z "$BUILD_ON_LOCAL_HOST" ] || [ -z "$BUILD_ON_DOCKER" ]; then
+  echo "Error: IS_LOCAL_HOST/IS_DOCKER and BUILD_ON_LOCAL_HOST/BUILD_ON_DOCKER must be set."
   exit 1
 fi
 
-if [ "$BUILD_ON_HOST" = "true" ]; then
-  if [ "$IS_HOST" = "true" ]; then
-    echo "Both BUILD_ON_HOST and IS_HOST are true, proceeding with build..."
+if [ "$BUILD_ON_LOCAL_HOST" = "true" ]; then
+  if [ "$IS_LOCAL_HOST" = "true" ]; then
+    echo "Both BUILD_ON_LOCAL_HOST and IS_LOCAL_HOST are true, proceeding with build..."
   else
-    echo "Error: BUILD_ON_HOST is true but IS_HOST is not true. Cannot proceed with build."
+    echo "Error: BUILD_ON_LOCAL_HOST is true but IS_LOCAL_HOST is not true. Cannot proceed with build."
     exit 0
   fi
 elif [ "$BUILD_ON_DOCKER" = "true" ]; then
diff --git a/scripts/build_scripts/build-server.sh b/scripts/build_scripts/build-server.sh
index 38e338e..dbab2c6 100644
--- a/scripts/build_scripts/build-server.sh
+++ b/scripts/build_scripts/build-server.sh
@@ -1,4 +1,4 @@
 set -e
-sh scripts/tool_scripts/check-all-env.sh
+bash scripts/tool_scripts/check-all-env.sh
 sh gradlew server:buildFatJar --no-daemon
 cp ./server/build/libs/*-all.jar ./deploy/build
diff --git a/scripts/service_scripts/build-dev-service.sh b/scripts/service_scripts/build-dev-service.sh
index a4563c1..55393d9 100644
--- a/scripts/service_scripts/build-dev-service.sh
+++ b/scripts/service_scripts/build-dev-service.sh
@@ -1,5 +1,5 @@
 set -e
-sh scripts/tool_scripts/check-all-env.sh
+bash scripts/tool_scripts/check-all-env.sh
 
 cd deploy
 mkdir -p es_ca
diff --git a/scripts/service_scripts/build-prod-service.sh b/scripts/service_scripts/build-prod-service.sh
index 88fb3b8..364ca25 100644
--- a/scripts/service_scripts/build-prod-service.sh
+++ b/scripts/service_scripts/build-prod-service.sh
@@ -1,5 +1,5 @@
 set -e
-sh scripts/tool_scripts/check-all-env.sh
+bash scripts/tool_scripts/check-all-env.sh
 
 sh scripts/build_scripts/build-server-for-docker.sh
 cd deploy
diff --git a/scripts/service_scripts/mock-koyeb-single-build.sh b/scripts/service_scripts/mock-koyeb-single-build.sh
new file mode 100644
index 0000000..9283289
--- /dev/null
+++ b/scripts/service_scripts/mock-koyeb-single-build.sh
@@ -0,0 +1,13 @@
+set -e
+sh scripts/tool_scripts/patch-koyeb-env.sh ./Dockerfile
+args=$(grep -v '^#' ./koyeb.env | grep -v '^$' | awk -F '=' '{print "--build-arg " $1 "=\"" $2 "\""}' ORS=' ')
+eval docker build "$args" \
+  -f ./Dockerfile.patched \
+  -t local-koyeb .
+docker run \
+  --privileged \
+  -d \
+  -p 8811:8811 \
+  -p 5432:5432 \
+  -p 8812:8812 \
+  local-koyeb
diff --git a/scripts/service_scripts/start-compose-in-koyeb.sh b/scripts/service_scripts/start-compose-in-koyeb.sh
index 40e30c8..b925ab4 100644
--- a/scripts/service_scripts/start-compose-in-koyeb.sh
+++ b/scripts/service_scripts/start-compose-in-koyeb.sh
@@ -1,7 +1,8 @@
 set -e
+FLAVOR=$1
 sh scripts/docker_images_scripts/load-docker-images.sh
 cd deploy
-docker compose \
+docker compose --env-file ../$FLAVOR.env \ \
   -f docker-compose.yml \
   -f docker-compose.d.yml \
   up --build
\ No newline at end of file
diff --git a/scripts/tool_scripts/check-all-env.sh b/scripts/tool_scripts/check-all-env.sh
index 2b967e3..d01b59c 100644
--- a/scripts/tool_scripts/check-all-env.sh
+++ b/scripts/tool_scripts/check-all-env.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 # 指定包含 .env 文件的目录
 env_dir='.'
 
@@ -7,11 +8,11 @@ for file in "$env_dir"/*.env; do
   if [[ -f "$file" ]]; then
     echo "Processing $file..."
     # 执行脚本
-    sh scripts/tool_scripts/check-env-filter.sh env-filter "$file"
+    bash scripts/tool_scripts/check-env-filter.sh env-filter "$file"
   else
     echo "No .env files found in the directory."
   fi
 done
 
 echo "Processing .env"
-sh scripts/tool_scripts/check-env-filter.sh env-filter ./server/src/test/resources/.env
\ No newline at end of file
+bash scripts/tool_scripts/check-env-filter.sh env-filter ./server/src/test/resources/.env
\ No newline at end of file
diff --git a/scripts/tool_scripts/flush-database-singleton.sh b/scripts/tool_scripts/flush-database-singleton.sh
index 2369324..ef401b5 100644
--- a/scripts/tool_scripts/flush-database-singleton.sh
+++ b/scripts/tool_scripts/flush-database-singleton.sh
@@ -1,8 +1,16 @@
 set -e
 cli_path=$1
 base=$2
+
+if [ -z "$base" ] || [ -z "$cli_path" ]; then
+  echo "Error: base and cli_path parameter is not specified."
+  exit 1
+fi
+
 sh $cli_path clean
 
+echo "clean result is $?"
+
 index=0
 
 for json_file in "$base"/*.json; do
@@ -12,7 +20,9 @@ for json_file in "$base"/*.json; do
     file_index=$(echo "$filename" | grep -o '^[0-9]\+')
 
     if [ "$file_index" -eq "$index" ]; then
+      echo "Process $json_file"
       sh "$cli_path" add "$json_file"
+      echo "result is $?"
     fi
 
     index=$((index + 1))
diff --git a/scripts/tool_scripts/patch-koyeb-env.sh b/scripts/tool_scripts/patch-koyeb-env.sh
index 79fddc8..ba6f633 100644
--- a/scripts/tool_scripts/patch-koyeb-env.sh
+++ b/scripts/tool_scripts/patch-koyeb-env.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+set -e
 # 自动根据系统环境设置换行符格式
 use_windows_newline=false
 
@@ -15,8 +17,12 @@ fi
 
 # 文件路径
 env_filter_file="env-filter"
-dockerfile_template="deploy/Dockerfile.koyeb_template"
-dockerfile_output="deploy/Dockerfile.koyeb"
+dockerfile_template=$1
+if [ -z "$dockerfile_template" ]; then
+  echo "Error: dockerfile_template is not specified."
+  exit 1
+fi
+dockerfile_output="${dockerfile_template}.patched"
 
 # 初始化两个空字符串来存储结果
 replace_string_1=""
@@ -42,7 +48,18 @@ done < "$env_filter_file"
 # 完成 COPY 块的 EOF 部分
 replace_string_2+="EOF\n"
 
+replace_string_3+="#override${newline}"
+replace_string_3+="ENV FLAVOR=generated-\${FLAVOR}"
+
 # 使用 sed 替换 dockerfile 模板中的 #1 和 #2
 sed -e "s|#1|$replace_string_1|" -e "s|#2|$replace_string_2|" -e "s|#3|$replace_string_3|" "$dockerfile_template" > "$dockerfile_output"
 
+ed -s "./$dockerfile_output" <<EOF
+/#^3/+,/#!3/-d
+/#^3/a
+#patched
+.
+wq
+EOF
+
 echo "Dockerfile 已生成: $dockerfile_output"
diff --git a/server/src/main/kotlin/com/storyteller_f/a/server/Application.kt b/server/src/main/kotlin/com/storyteller_f/a/server/Application.kt
index 1f7ed22..97309f0 100644
--- a/server/src/main/kotlin/com/storyteller_f/a/server/Application.kt
+++ b/server/src/main/kotlin/com/storyteller_f/a/server/Application.kt
@@ -62,7 +62,7 @@ private fun processPreSetData(map: Map<out Any, Any>) {
                 val input = start.inputStream.bufferedReader().readText()
                 if (code != 0) {
                     val error = start.errorStream.bufferedReader().readText()
-                    println("pre set failed. code: $code")
+                    println("preset failed. code: $code")
                     println("input: $input")
                     println("error: $error")
                 } else {
@@ -75,7 +75,7 @@ private fun processPreSetData(map: Map<out Any, Any>) {
                 start.destroy()
             }
         } else {
-            println("pre set config failure")
+            println("preset config failure")
             exitProcess(1)
         }
     }
diff --git a/server/src/test/resources/.env b/server/src/test/resources/.env
index bf4162b..c5868e0 100644
--- a/server/src/test/resources/.env
+++ b/server/src/test/resources/.env
@@ -1,6 +1,8 @@
 IS_PROD=false
 FLAVOR=dev
-BUILD_ON_HOST=false
+BUILD_ON_LOCAL_HOST=false
+BUILD_ON_DOCKER=false
+BUILD_ON_REMOTE_HOST=false
 COMPOSE_PROFILES=
 COMPOSE_PROJECT_NAME=a-test