diff --git a/.github/workflows/fly-deploy.yml b/.github/workflows/fly-dev-deploy-backend.yml
similarity index 90%
rename from .github/workflows/fly-deploy.yml
rename to .github/workflows/fly-dev-deploy-backend.yml
index 03e3705d..033313ca 100644
--- a/.github/workflows/fly-deploy.yml
+++ b/.github/workflows/fly-dev-deploy-backend.yml
@@ -45,6 +45,6 @@ jobs:
       - name: Deploy to Dev env
         uses: superfly/flyctl-actions/setup-flyctl@master
 
-      - run: flyctl deploy --remote-only
+      - run: flyctl deploy --remote-only --config fly-dev.toml
         env:
-          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
\ No newline at end of file
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN_DEV }}
\ No newline at end of file
diff --git a/.github/workflows/fly-prod-deploy-backend.yml b/.github/workflows/fly-prod-deploy-backend.yml
index 03949bfb..c4d458e1 100644
--- a/.github/workflows/fly-prod-deploy-backend.yml
+++ b/.github/workflows/fly-prod-deploy-backend.yml
@@ -44,4 +44,4 @@ jobs:
 
       - run: flyctl deploy --remote-only --config fly-prod.toml
         env:
-          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
\ No newline at end of file
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN_PROD }}
\ No newline at end of file
diff --git a/fly-dev.toml b/fly-dev.toml
new file mode 100644
index 00000000..61ec0a48
--- /dev/null
+++ b/fly-dev.toml
@@ -0,0 +1,25 @@
+# fly-dev.toml app configuration file generated for wcc-backend on 2025-09-21T19:00:40+02:00
+#
+# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
+#
+
+app = 'wcc-backend-dev'
+primary_region = 'lhr'
+
+[build]
+
+[env]
+SPRING_PROFILES_ACTIVE = "flyio"
+
+[http_service]
+internal_port = 8080
+force_https = true
+auto_stop_machines = 'true'
+auto_start_machines = true
+min_machines_running = 0
+processes = ['app']
+
+[[vm]]
+memory = '512mb'
+cpu_kind = 'shared'
+cpus = 1
diff --git a/fly-prod.toml b/fly-prod.toml
new file mode 100644
index 00000000..46e76929
--- /dev/null
+++ b/fly-prod.toml
@@ -0,0 +1,25 @@
+# fly-dev.toml app configuration file generated for wcc-backend on 2025-09-21T19:00:40+02:00
+#
+# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
+#
+
+app = 'wcc-backend-prod'
+primary_region = 'lhr'
+
+[build]
+
+[env]
+SPRING_PROFILES_ACTIVE = "flyio"
+
+[http_service]
+internal_port = 8080
+force_https = true
+auto_stop_machines = 'true'
+auto_start_machines = true
+min_machines_running = 0
+processes = ['app']
+
+[[vm]]
+memory = '512mb'
+cpu_kind = 'shared'
+cpus = 1
diff --git a/fly.toml b/fly.toml
deleted file mode 100644
index 11d162dd..00000000
--- a/fly.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-# fly.toml app configuration file generated for wcc-backend on 2025-09-21T19:00:40+02:00
-#
-# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
-#
-
-app = 'wcc-backend'
-primary_region = 'lhr'
-
-[build]
-
-[env]
-  SPRING_PROFILES_ACTIVE = "flyio"
-
-[http_service]
-  internal_port = 8080
-  force_https = true
-  auto_stop_machines = 'off'
-  auto_start_machines = true
-  min_machines_running = 0
-  processes = ['app']
-
-[[vm]]
-  memory = '512mb'
-  cpu_kind = 'shared'
-  cpus = 1