diff --git a/roles/baseline/tasks/firewall.yml b/roles/baseline/tasks/firewall.yml
index e5ad359..dda5981 100644
--- a/roles/baseline/tasks/firewall.yml
+++ b/roles/baseline/tasks/firewall.yml
@@ -14,3 +14,12 @@
     mode: "0755"
     src: firewall.j2
   notify: Restart firewall
+
+- name: Firewall for mosh
+  ansible.builtin.template:
+    dest: /etc/firewall.d/mosh
+    group: root
+    owner: root
+    mode: "0755"
+    src: mosh.j2
+  notify: Restart firewall
diff --git a/roles/baseline/tasks/packages.yml b/roles/baseline/tasks/packages.yml
index 5d2cb57..2d5ec7f 100644
--- a/roles/baseline/tasks/packages.yml
+++ b/roles/baseline/tasks/packages.yml
@@ -40,12 +40,5 @@
       - acl
       - sudo
       - ntpsec-ntpdate
-
-- name: Firewall for mosh
-  ansible.builtin.template:
-    dest: /etc/firewall.d/mosh
-    group: root
-    owner: root
-    mode: "0755"
-    src: mosh.j2
-  notify: Restart firewall
+      - openssh-server
+      - ifupdown