diff --git a/nodepool/elements/infra-package-needs/element-deps b/nodepool/elements/infra-package-needs/element-deps
index 7076aba945..89d13d0a34 100644
--- a/nodepool/elements/infra-package-needs/element-deps
+++ b/nodepool/elements/infra-package-needs/element-deps
@@ -1 +1,2 @@
+openssh-server
 package-installs
diff --git a/nodepool/elements/infra-package-needs/package-installs.yaml b/nodepool/elements/infra-package-needs/package-installs.yaml
index 91d7e0b076..b67d460c59 100644
--- a/nodepool/elements/infra-package-needs/package-installs.yaml
+++ b/nodepool/elements/infra-package-needs/package-installs.yaml
@@ -1,7 +1,6 @@
 coreutils:
 cron:
 util-linux:
-openssh-server:
 build-essential:
 python-dev:
 python3-dev:
diff --git a/nodepool/elements/infra-package-needs/pkg-map b/nodepool/elements/infra-package-needs/pkg-map
index 40b959c959..783bafae4c 100644
--- a/nodepool/elements/infra-package-needs/pkg-map
+++ b/nodepool/elements/infra-package-needs/pkg-map
@@ -8,7 +8,6 @@
       "cron": "sys-process/cronie",
       "python-dev": "",
       "python3-dev": "",
-      "openssh-server": "openssh",
       "traceroute": "net-analyzer/traceroute",
       "uuid-runtime": ""
     }