diff --git a/apps/homer/base/deployment.yaml b/apps/homer/base/deployment.yaml
index 431d458..5bee0c2 100644
--- a/apps/homer/base/deployment.yaml
+++ b/apps/homer/base/deployment.yaml
@@ -40,5 +40,4 @@ spec:
             path: /mnt/nfs/AppData/homer/www
             type: Directory
       nodeSelector:
-        kubernetes.io/arch: arm64
         kubernetes.io/os: linux
diff --git a/apps/nexus/base/deployment.yaml b/apps/nexus/base/deployment.yaml
index d4eda86..9563418 100644
--- a/apps/nexus/base/deployment.yaml
+++ b/apps/nexus/base/deployment.yaml
@@ -37,5 +37,4 @@ spec:
             path: /mnt/nfs/AppData/nexus
             type: Directory
       nodeSelector:
-        kubernetes.io/arch: arm64
         kubernetes.io/os: linux
\ No newline at end of file
diff --git a/apps/plane/base/deployment.yaml b/apps/plane/base/deployment.yaml
index 7380d91..2ef8bb7 100644
--- a/apps/plane/base/deployment.yaml
+++ b/apps/plane/base/deployment.yaml
@@ -36,7 +36,7 @@ spec:
       serviceAccount: plane-srv-account
       serviceAccountName: plane-srv-account
       nodeSelector:
-        kubernetes.io/arch: arm64
+        kubernetes.io/os: linux
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -94,7 +94,7 @@ spec:
       serviceAccount: plane-srv-account
       serviceAccountName: plane-srv-account
       nodeSelector:
-        kubernetes.io/arch: arm64
+        kubernetes.io/os: linux
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -143,7 +143,7 @@ spec:
       serviceAccount: plane-srv-account
       serviceAccountName: plane-srv-account
       nodeSelector:
-        kubernetes.io/arch: arm64
+        kubernetes.io/os: linux
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -182,7 +182,7 @@ spec:
       serviceAccount: plane-srv-account
       serviceAccountName: plane-srv-account
       nodeSelector:
-        kubernetes.io/arch: arm64
+        kubernetes.io/os: linux
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -221,7 +221,7 @@ spec:
       serviceAccount: plane-srv-account
       serviceAccountName: plane-srv-account
       nodeSelector:
-        kubernetes.io/arch: arm64
+        kubernetes.io/os: linux
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -270,5 +270,5 @@ spec:
       serviceAccount: plane-srv-account
       serviceAccountName: plane-srv-account
       nodeSelector:
-        kubernetes.io/arch: arm64
+        kubernetes.io/os: linux
 ---
\ No newline at end of file
diff --git a/apps/snippet-box/base/deployment.yaml b/apps/snippet-box/base/deployment.yaml
index dc2902c..2eefb3a 100644
--- a/apps/snippet-box/base/deployment.yaml
+++ b/apps/snippet-box/base/deployment.yaml
@@ -33,4 +33,4 @@ spec:
             path: /mnt/nfs/AppData/snippet-box
             type: Directory
       nodeSelector:
-        kubernetes.io/arch: arm64
+        kubernetes.io/os: linux
diff --git a/resources/app-volumes/env/k3s-cluster/templates/coder-pv.yaml b/resources/app-volumes/env/k3s-cluster/templates/coder-pv.yaml
index 9cd82c5..084e307 100644
--- a/resources/app-volumes/env/k3s-cluster/templates/coder-pv.yaml
+++ b/resources/app-volumes/env/k3s-cluster/templates/coder-pv.yaml
@@ -24,10 +24,6 @@ spec:
     required:
       nodeSelectorTerms:
         - matchExpressions:
-            - key: kubernetes.io/arch
-              operator: In
-              values:
-                - arm64
             - key: kubernetes.io/os
               operator: In
               values:
diff --git a/resources/app-volumes/env/k3s-cluster/templates/plane-redis-pv.yaml b/resources/app-volumes/env/k3s-cluster/templates/plane-redis-pv.yaml
index c1b4461..af5c618 100644
--- a/resources/app-volumes/env/k3s-cluster/templates/plane-redis-pv.yaml
+++ b/resources/app-volumes/env/k3s-cluster/templates/plane-redis-pv.yaml
@@ -24,10 +24,6 @@ spec:
     required:
       nodeSelectorTerms:
         - matchExpressions:
-            - key: kubernetes.io/arch
-              operator: In
-              values:
-                - arm64
             - key: kubernetes.io/os
               operator: In
               values: