diff --git a/.github/workflows/deploy-civo-demo.yml b/.github/workflows/deploy-civo-demo.yml
index d13e5bc1b57..99eb92bf129 100644
--- a/.github/workflows/deploy-civo-demo.yml
+++ b/.github/workflows/deploy-civo-demo.yml
@@ -37,7 +37,7 @@ jobs:
           envsubst < $GITHUB_WORKSPACE/.deploy/k8s/k8s-manifest.civo.demo.yaml | kubectl --context ever apply -f -
         env:
           # below we are using GitHub secrets for both frontend and backend
-          DB_NAME: 'gauzy_demo'
+          DB_NAME: '${{ secrets.DB_NAME }}'
           CLOUD_PROVIDER: 'CIVO'
           SENTRY_DSN: '${{ secrets.SENTRY_DSN }}'
           SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'
diff --git a/.github/workflows/deploy-civo-prod.yml b/.github/workflows/deploy-civo-prod.yml
index 73a2f586005..47efa2d3389 100644
--- a/.github/workflows/deploy-civo-prod.yml
+++ b/.github/workflows/deploy-civo-prod.yml
@@ -49,7 +49,7 @@ jobs:
           DB_HOST: '${{ secrets.DB_HOST_CIVO }}'
           DB_USER: '${{ secrets.DB_USER }}'
           DB_PASS: '${{ secrets.DB_PASS }}'
-          DB_NAME: 'gauzy-pool'
+          DB_NAME: '${{ secrets.DB_NAME }}'
           DB_PORT: '${{ secrets.DB_PORT }}'
           DB_CA_CERT: '${{ secrets.DB_CA_CERT }}'
           DB_SSL_MODE: '${{ secrets.DB_SSL_MODE }}'
diff --git a/.github/workflows/deploy-civo-stage.yml b/.github/workflows/deploy-civo-stage.yml
index b935c9de2d3..aece8a62952 100644
--- a/.github/workflows/deploy-civo-stage.yml
+++ b/.github/workflows/deploy-civo-stage.yml
@@ -50,7 +50,7 @@ jobs:
           DB_USER: '${{ secrets.DB_USER }}'
           DB_PASS: '${{ secrets.DB_PASS }}'
           # Note that for staging we are using for now same server, just different DB name
-          DB_NAME: 'gauzy-stage-pool'
+          DB_NAME: '${{ secrets.DB_NAME }}'
           DB_PORT: '${{ secrets.DB_PORT }}'
           DB_CA_CERT: '${{ secrets.DB_CA_CERT }}'
           DB_SSL_MODE: '${{ secrets.DB_SSL_MODE }}'
diff --git a/.github/workflows/deploy-cw-demo.yml b/.github/workflows/deploy-cw-demo.yml
index b16fab254a9..e7207a13b74 100644
--- a/.github/workflows/deploy-cw-demo.yml
+++ b/.github/workflows/deploy-cw-demo.yml
@@ -38,7 +38,7 @@ jobs:
         env:
           # below we are using GitHub secrets for both frontend and backend
           CLOUD_PROVIDER: 'CW'
-          DB_NAME: 'gauzy_demo'
+          DB_NAME: '${{ secrets.DB_NAME }}'
           SENTRY_DSN: '${{ secrets.SENTRY_DSN }}'
           SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'
           SENTRY_HTTP_TRACING_ENABLED: '${{ secrets.SENTRY_HTTP_TRACING_ENABLED }}'
diff --git a/.github/workflows/deploy-cw-prod.yml b/.github/workflows/deploy-cw-prod.yml
index b8912d757b0..d2326d48ccb 100644
--- a/.github/workflows/deploy-cw-prod.yml
+++ b/.github/workflows/deploy-cw-prod.yml
@@ -49,7 +49,7 @@ jobs:
           DB_HOST: '${{ secrets.DB_HOST_CW }}'
           DB_USER: '${{ secrets.DB_USER }}'
           DB_PASS: '${{ secrets.DB_PASS }}'
-          DB_NAME: 'gauzy-pool'
+          DB_NAME: '${{ secrets.DB_NAME }}'
           DB_PORT: '${{ secrets.DB_PORT }}'
           DB_CA_CERT: '${{ secrets.DB_CA_CERT }}'
           DB_SSL_MODE: '${{ secrets.DB_SSL_MODE }}'
diff --git a/.github/workflows/deploy-cw-stage.yml b/.github/workflows/deploy-cw-stage.yml
index 331c702c160..9e70067266f 100644
--- a/.github/workflows/deploy-cw-stage.yml
+++ b/.github/workflows/deploy-cw-stage.yml
@@ -50,7 +50,7 @@ jobs:
           DB_USER: '${{ secrets.DB_USER }}'
           DB_PASS: '${{ secrets.DB_PASS }}'
           # Note that for staging we are using for now same server, just different DB name
-          DB_NAME: 'gauzy-stage-pool'
+          DB_NAME: '${{ secrets.DB_NAME }}'
           DB_PORT: '${{ secrets.DB_PORT }}'
           DB_CA_CERT: '${{ secrets.DB_CA_CERT }}'
           DB_SSL_MODE: '${{ secrets.DB_SSL_MODE }}'
diff --git a/.github/workflows/deploy-do-demo.yml b/.github/workflows/deploy-do-demo.yml
index bc526f6ebed..8d9bfe1343a 100644
--- a/.github/workflows/deploy-do-demo.yml
+++ b/.github/workflows/deploy-do-demo.yml
@@ -34,7 +34,7 @@ jobs:
         env:
           # below we are using GitHub secrets for both frontend and backend
           CLOUD_PROVIDER: 'DO'
-          DB_NAME: 'gauzy_demo'
+          DB_NAME: '${{ secrets.DB_NAME }}'
           SENTRY_DSN: '${{ secrets.SENTRY_DSN }}'
           SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'
           SENTRY_HTTP_TRACING_ENABLED: '${{ secrets.SENTRY_HTTP_TRACING_ENABLED }}'
diff --git a/.github/workflows/deploy-do-prod.yml b/.github/workflows/deploy-do-prod.yml
index 1d18a2e2357..84948e43b9d 100644
--- a/.github/workflows/deploy-do-prod.yml
+++ b/.github/workflows/deploy-do-prod.yml
@@ -44,7 +44,7 @@ jobs:
           DB_HOST: '${{ secrets.DB_HOST }}'
           DB_USER: '${{ secrets.DB_USER }}'
           DB_PASS: '${{ secrets.DB_PASS }}'
-          DB_NAME: 'gauzy-pool'
+          DB_NAME: '${{ secrets.DB_NAME }}'
           DB_PORT: '${{ secrets.DB_PORT }}'
           DB_CA_CERT: '${{ secrets.DB_CA_CERT }}'
           DB_SSL_MODE: '${{ secrets.DB_SSL_MODE }}'
diff --git a/.github/workflows/deploy-do-stage.yml b/.github/workflows/deploy-do-stage.yml
index 7c2bbe14b09..ae15f64a67f 100644
--- a/.github/workflows/deploy-do-stage.yml
+++ b/.github/workflows/deploy-do-stage.yml
@@ -45,7 +45,7 @@ jobs:
           DB_USER: '${{ secrets.DB_USER }}'
           DB_PASS: '${{ secrets.DB_PASS }}'
           # Note that for staging we are using for now same server, just different DB name
-          DB_NAME: 'gauzy-stage-pool'
+          DB_NAME: '${{ secrets.DB_NAME }}'
           DB_PORT: '${{ secrets.DB_PORT }}'
           DB_CA_CERT: '${{ secrets.DB_CA_CERT }}'
           DB_SSL_MODE: '${{ secrets.DB_SSL_MODE }}'