diff --git a/.drone.yml b/.drone.yml
index b785eb7..ff66e18 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -164,7 +164,7 @@ steps:
       DB_PORT:                  { from_secret: DB_PORT }
       DB_SSLMODE:               { from_secret: DB_SSLMODE }
       DB_USER:                  { from_secret: DB_USER }
-      ENV:                      "homologation" # Ajustado para resolver CrashLoop
+      ENV:                      { from_secret: ENV_HML }
       CORS_ORIGINS:             { from_secret: CORS_ORIGINS }
       JWT_SECRET:               { from_secret: JWT_SECRET }
       MAX_UPLOAD_CAD_SIZE:      { from_secret: MAX_UPLOAD_SIZE }
@@ -280,7 +280,7 @@ steps:
       DB_PORT:                  { from_secret: DB_PORT }
       DB_SSLMODE:               { from_secret: DB_SSLMODE }
       DB_USER:                  { from_secret: DB_USER }
-      ENV:                      "production"
+      ENV:                      { from_secret: ENV_PRD }
       CORS_ORIGINS:             { from_secret: CORS_ORIGINS }
       JWT_SECRET:               { from_secret: JWT_SECRET }
       MAX_UPLOAD_CAD_SIZE:      { from_secret: MAX_UPLOAD_SIZE }
diff --git a/k8s/dev/backend-deployment.yaml b/k8s/dev/backend-deployment.yaml
index 77454c3..e9c7b17 100644
--- a/k8s/dev/backend-deployment.yaml
+++ b/k8s/dev/backend-deployment.yaml
@@ -1,17 +1,17 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: gohorse-backend
+  name: gohorse-backend-dev
   namespace: gohorsejobsdev
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: gohorse-backend
+      app: gohorse-backend-dev
   template:
     metadata:
       labels:
-        app: gohorse-backend
+        app: gohorse-backend-dev
         env: development
     spec:
       imagePullSecrets:
diff --git a/k8s/dev/backoffice-deployment.yaml b/k8s/dev/backoffice-deployment.yaml
index 6937b0c..49c7fec 100644
--- a/k8s/dev/backoffice-deployment.yaml
+++ b/k8s/dev/backoffice-deployment.yaml
@@ -1,17 +1,17 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: gohorse-backoffice
+  name: gohorse-backoffice-dev
   namespace: gohorsejobsdev
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: gohorse-backoffice
+      app: gohorse-backoffice-dev
   template:
     metadata:
       labels:
-        app: gohorse-backoffice
+        app: gohorse-backoffice-dev
         env: development
     spec:
       imagePullSecrets:
diff --git a/k8s/hml/backend-deployment.yaml b/k8s/hml/backend-deployment.yaml
index a2aa806..65a7e85 100644
--- a/k8s/hml/backend-deployment.yaml
+++ b/k8s/hml/backend-deployment.yaml
@@ -7,11 +7,11 @@ spec:
   replicas: 2
   selector:
     matchLabels:
-      app: gohorse-backend
+      app: gohorse-backend-hml
   template:
     metadata:
       labels:
-        app: gohorse-backend
+        app: gohorse-backend-hml
         env: homologation
     spec:
       imagePullSecrets:
diff --git a/k8s/hml/backoffice-deployment-hml.yaml b/k8s/hml/backoffice-deployment-hml.yaml
index fd5404e..4ed5958 100644
--- a/k8s/hml/backoffice-deployment-hml.yaml
+++ b/k8s/hml/backoffice-deployment-hml.yaml
@@ -1,17 +1,17 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: gohorse-backoffice
+  name: gohorse-backoffice-hml
   namespace: gohorsejobshml
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: gohorse-backoffice
+      app: gohorse-backoffice-hml
   template:
     metadata:
       labels:
-        app: gohorse-backoffice
+        app: gohorse-backoffice-hml
         env: development
     spec:
       imagePullSecrets: