diff --git a/k8s/datatracker.yaml b/k8s/datatracker.yaml
index 9f59c28c8..b2a443db3 100644
--- a/k8s/datatracker.yaml
+++ b/k8s/datatracker.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: deployment
+  name: datatracker
 spec:
   replicas: 1
   revisionHistoryLimit: 2
@@ -15,24 +15,6 @@ spec:
       labels:
         app: datatracker
     spec:
-      # -------------------------------------------------------
-      # Node Affinity
-      # -------------------------------------------------------
-      nodeSelector:
-        doks.digitalocean.com/node-pool: pool-apollo-hperf
-      affinity:
-        podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-            - weight: 100
-              podAffinityTerm:
-                labelSelector:
-                  matchExpressions:
-                  - key: app
-                    operator: In
-                    values:
-                    - mailarchive
-                topologyKey: "kubernetes.io/hostname"
-      # -------------------------------------------------------
       securityContext:
         runAsNonRoot: true
       containers:
diff --git a/k8s/rabbitmq.yaml b/k8s/rabbitmq.yaml
index 4c4a47223..c5a823ac2 100644
--- a/k8s/rabbitmq.yaml
+++ b/k8s/rabbitmq.yaml
@@ -14,24 +14,6 @@ spec:
       labels:
         app: rabbitmq
     spec:
-      # -------------------------------------------------------
-      # Node Affinity
-      # -------------------------------------------------------
-      nodeSelector:
-        doks.digitalocean.com/node-pool: pool-apollo-hperf
-      affinity:
-        podAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-            - weight: 100
-              podAffinityTerm:
-                labelSelector:
-                  matchExpressions:
-                  - key: app
-                    operator: In
-                    values:
-                    - datatracker
-                topologyKey: "kubernetes.io/hostname"
-      # -------------------------------------------------------
       securityContext:
         runAsNonRoot: true
       initContainers: