diff --git a/.drone.yml b/.drone.yml
index c996dde..43366e6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -103,13 +103,13 @@ steps:
   - name: deploy-apps
     image: bitnami/kubectl:latest
     commands:
-      - kubectl delete deployment gohorse-backend -n gohorsejobsdev --ignore-not-found
-      - kubectl delete deployment gohorse-backoffice -n gohorsejobsdev --ignore-not-found
-      - kubectl apply -f k8s/dev/backend-deployment.yaml -n gohorsejobsdev
-      - kubectl apply -f k8s/dev/backend-service.yaml -n gohorsejobsdev
+      - kubectl delete deployment gohorse-backend-dev -n gohorsejobsdev --ignore-not-found
+      - kubectl delete deployment gohorse-backoffice-dev -n gohorsejobsdev --ignore-not-found
+      - kubectl apply -f k8s/dev/backend-deployment-dev.yaml -n gohorsejobsdev
+      - kubectl apply -f k8s/dev/backend-service-dev.yaml -n gohorsejobsdev
       - kubectl apply -f k8s/dev/backend-ingress-dev.yaml -n gohorsejobsdev
-      - kubectl apply -f k8s/dev/backoffice-deployment.yaml -n gohorsejobsdev
-      - kubectl apply -f k8s/dev/backoffice-service.yaml -n gohorsejobsdev
+      - kubectl apply -f k8s/dev/backoffice-deployment-dev.yaml -n gohorsejobsdev
+      - kubectl apply -f k8s/dev/backoffice-service-dev.yaml -n gohorsejobsdev
       - kubectl apply -f k8s/dev/backoffice-ingress-dev.yaml -n gohorsejobsdev
 
 ---
@@ -220,8 +220,8 @@ steps:
     commands:
       - kubectl delete deployment gohorse-backend-hml -n gohorsejobshml --ignore-not-found
       - kubectl delete deployment gohorse-backoffice-hml -n gohorsejobshml --ignore-not-found
-      - kubectl apply -f k8s/hml/backend-deployment.yaml -n gohorsejobshml
-      - kubectl apply -f k8s/hml/backend-service.yaml -n gohorsejobshml
+      - kubectl apply -f k8s/hml/backend-deployment-hml.yaml -n gohorsejobshml
+      - kubectl apply -f k8s/hml/backend-service-hml.yaml -n gohorsejobshml
       - kubectl apply -f k8s/hml/backend-ingress-hml.yaml -n gohorsejobshml
       - kubectl apply -f k8s/hml/backoffice-deployment-hml.yaml -n gohorsejobshml
       - kubectl apply -f k8s/hml/backoffice-service-hml.yaml -n gohorsejobshml
@@ -333,16 +333,13 @@ steps:
   - name: deploy-apps
     image: bitnami/kubectl:latest
     commands:
-      # Limpa o deploy atual para garantir que não haverá mais de 1 pod durante o processo
       - kubectl delete deployment gohorse-backend -n gohorsejobs --ignore-not-found
       - kubectl delete deployment gohorse-backoffice -n gohorsejobs --ignore-not-found
-      # Aplica os novos recursos (vai subir apenas 1 pod conforme seu manifest)
-      - kubectl apply -f k8s/prd/backend-deployment.yaml -n gohorsejobs
-      - kubectl apply -f k8s/prd/backend-service.yaml -n gohorsejobs
+      - kubectl apply -f k8s/prd/backend-deployment-prd.yaml -n gohorsejobs
+      - kubectl apply -f k8s/prd/backend-service-prd.yaml -n gohorsejobs
       - kubectl apply -f k8s/prd/backend-ingress-prd.yaml -n gohorsejobs
-      - kubectl apply -f k8s/prd/backoffice-deployment.yaml -n gohorsejobs
-      - kubectl apply -f k8s/prd/backoffice-service.yaml -n gohorsejobs
+      - kubectl apply -f k8s/prd/backoffice-deployment-prd.yaml -n gohorsejobs
+      - kubectl apply -f k8s/prd/backoffice-service-prd.yaml -n gohorsejobs
       - kubectl apply -f k8s/prd/backoffice-ingress-prd.yaml -n gohorsejobs
-      # Aguarda a disponibilidade do novo pod único
       - kubectl rollout status deployment/gohorse-backend -n gohorsejobs
       - kubectl rollout status deployment/gohorse-backoffice -n gohorsejobs
\ No newline at end of file
diff --git a/k8s/dev/backend-deployment.yaml b/k8s/dev/backend-deployment-dev.yaml
similarity index 100%
rename from k8s/dev/backend-deployment.yaml
rename to k8s/dev/backend-deployment-dev.yaml
diff --git a/k8s/dev/backend-service.yaml b/k8s/dev/backend-service-dev.yaml
similarity index 74%
rename from k8s/dev/backend-service.yaml
rename to k8s/dev/backend-service-dev.yaml
index b88762a..538739d 100644
--- a/k8s/dev/backend-service.yaml
+++ b/k8s/dev/backend-service-dev.yaml
@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: gohorse-backend-hml
+  name: gohorse-backend-dev
   namespace: gohorsejobsdev
 spec:
   selector:
-    app: gohorse-backend
+    app: gohorse-backend-dev
   ports:
     - name: http
       port: 8521
diff --git a/k8s/dev/backoffice-deployment.yaml b/k8s/dev/backoffice-deployment-dev.yaml
similarity index 100%
rename from k8s/dev/backoffice-deployment.yaml
rename to k8s/dev/backoffice-deployment-dev.yaml
diff --git a/k8s/dev/backoffice-service.yaml b/k8s/dev/backoffice-service-dev.yaml
similarity index 70%
rename from k8s/dev/backoffice-service.yaml
rename to k8s/dev/backoffice-service-dev.yaml
index c309cef..5fb3df4 100644
--- a/k8s/dev/backoffice-service.yaml
+++ b/k8s/dev/backoffice-service-dev.yaml
@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: gohorse-backoffice-service
+  name: gohorse-backoffice-service-dev
   namespace: gohorsejobsdev
 spec:
   selector:
-    app: gohorse-backoffice
+    app: gohorse-backoffice-dev
   ports:
     - name: http
       port: 3001
diff --git a/k8s/hml/backend-deployment.yaml b/k8s/hml/backend-deployment-hml.yaml
similarity index 100%
rename from k8s/hml/backend-deployment.yaml
rename to k8s/hml/backend-deployment-hml.yaml
diff --git a/k8s/hml/backend-ingress-hml.yaml b/k8s/hml/backend-ingress-hml.yaml
index 71d08a5..6560082 100644
--- a/k8s/hml/backend-ingress-hml.yaml
+++ b/k8s/hml/backend-ingress-hml.yaml
@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: gohorse-backend-ingress-hml
-  namespace: gohorsejobsdev
+  namespace: gohorsejobshml
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-dns
     external-dns.alpha.kubernetes.io/cloudflare-proxied: "true"
diff --git a/k8s/hml/backend-service.yaml b/k8s/hml/backend-service-hml.yaml
similarity index 74%
rename from k8s/hml/backend-service.yaml
rename to k8s/hml/backend-service-hml.yaml
index ab3b51f..df3d8d8 100644
--- a/k8s/hml/backend-service.yaml
+++ b/k8s/hml/backend-service-hml.yaml
@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: gohorse-backend
+  name: gohorse-backend-hml
   namespace: gohorsejobshml
 spec:
   selector:
-    app: gohorse-backend
+    app: gohorse-backend-hml
   ports:
     - name: http
       port: 8521
diff --git a/k8s/hml/backoffice-deployment-hml.yaml b/k8s/hml/backoffice-hml.yaml
similarity index 100%
rename from k8s/hml/backoffice-deployment-hml.yaml
rename to k8s/hml/backoffice-hml.yaml
diff --git a/k8s/hml/backoffice-ingress-hml.yaml b/k8s/hml/backoffice-ingress-hml.yaml
index a1d930c..cda20f3 100644
--- a/k8s/hml/backoffice-ingress-hml.yaml
+++ b/k8s/hml/backoffice-ingress-hml.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: gohorse-backoffice-ingress-dev
+  name: gohorse-backoffice-ingress-hml
   namespace: gohorsejobshml
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-dns
diff --git a/k8s/hml/backoffice-service-hml.yaml b/k8s/hml/backoffice-service-hml.yaml
index 6b76268..7bc28b9 100644
--- a/k8s/hml/backoffice-service-hml.yaml
+++ b/k8s/hml/backoffice-service-hml.yaml
@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: gohorse-backoffice-service
+  name: gohorse-backoffice-service-hml
   namespace: gohorsejobshml
 spec:
   selector:
-    app: gohorse-backoffice
+    app: gohorse-backoffice-hml
   ports:
     - name: http
       port: 3001
diff --git a/k8s/prd/backend-deployment.yaml b/k8s/prd/backend-deployment.-prd.yaml
similarity index 91%
rename from k8s/prd/backend-deployment.yaml
rename to k8s/prd/backend-deployment.-prd.yaml
index 82af567..68a2a25 100644
--- a/k8s/prd/backend-deployment.yaml
+++ b/k8s/prd/backend-deployment.-prd.yaml
@@ -1,17 +1,17 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: gohorse-backend
+  name: gohorse-backend-prd
   namespace: gohorsejobs
 spec:
   replicas: 3
   selector:
     matchLabels:
-      app: gohorse-backend
+      app: gohorse-backend-prd
   template:
     metadata:
       labels:
-        app: gohorse-backend
+        app: gohorse-backend-prd
         env: production
     spec:
       imagePullSecrets:
diff --git a/k8s/prd/backend-service.yaml b/k8s/prd/backend-service-prd.yaml
similarity index 74%
rename from k8s/prd/backend-service.yaml
rename to k8s/prd/backend-service-prd.yaml
index 080faff..2d9269d 100644
--- a/k8s/prd/backend-service.yaml
+++ b/k8s/prd/backend-service-prd.yaml
@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: gohorse-backend
+  name: gohorse-backend-prd
   namespace: gohorsejobs
 spec:
   selector:
-    app: gohorse-backend
+    app: gohorse-backend-prd
   ports:
     - name: http
       port: 8521
diff --git a/k8s/prd/backoffice-deployment.yaml b/k8s/prd/backoffice-deployment-prd.yaml
similarity index 89%
rename from k8s/prd/backoffice-deployment.yaml
rename to k8s/prd/backoffice-deployment-prd.yaml
index 0ce1b47..4368390 100644
--- a/k8s/prd/backoffice-deployment.yaml
+++ b/k8s/prd/backoffice-deployment-prd.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: gohorse-backoffice
+  name: gohorse-backoffice-prd
   namespace: gohorsejobs
 spec:
   replicas: 1
@@ -9,11 +9,11 @@ spec:
     type: Recreate # Crítico para ambientes com pouco recurso
   selector:
     matchLabels:
-      app: gohorse-backoffice
+      app: gohorse-backoffice-prd
   template:
     metadata:
       labels:
-        app: gohorse-backoffice
+        app: gohorse-backoffice-prd
         env: production # Alterado para production
     spec:
       imagePullSecrets:
diff --git a/k8s/prd/backoffice-ingress-dev.yaml b/k8s/prd/backoffice-ingress-prd.yaml
similarity index 94%
rename from k8s/prd/backoffice-ingress-dev.yaml
rename to k8s/prd/backoffice-ingress-prd.yaml
index 1a8a6ce..247f0e2 100644
--- a/k8s/prd/backoffice-ingress-dev.yaml
+++ b/k8s/prd/backoffice-ingress-prd.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: gohorse-backoffice-ingress-dev
+  name: gohorse-backoffice-ingress-prd
   namespace: gohorsejobs
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-dns
diff --git a/k8s/prd/backoffice-service.yaml b/k8s/prd/backoffice-service-prd.yaml
similarity index 69%
rename from k8s/prd/backoffice-service.yaml
rename to k8s/prd/backoffice-service-prd.yaml
index 4f7dfc8..e3f1f1e 100644
--- a/k8s/prd/backoffice-service.yaml
+++ b/k8s/prd/backoffice-service-prd.yaml
@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: gohorse-backoffice-service
+  name: gohorse-backoffice-service-prd
   namespace: gohorsejobs
 spec:
   selector:
-    app: gohorse-backoffice
+    app: gohorse-backoffice-prd
   ports:
     - name: http
       port: 3001