diff --git a/installer/install/tpot.yml b/installer/install/tpot.yml
index cd17e792..f2b64dfb 100644
--- a/installer/install/tpot.yml
+++ b/installer/install/tpot.yml
@@ -481,7 +481,7 @@
     - name: Comment out Port(s) in sshd_config, can cause port conflicts on deploy (AlmaLinux, Debian, Fedora, Raspbian, Rocky, Ubuntu)
       ansible.builtin.replace:
         path: /etc/ssh/sshd_config
-        regexp: "(^Port [0-9]+)"
+        regexp: "^(Port [0-9]+)"
         replace: '# \1'
       when: ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "Raspbian", "Rocky", "Ubuntu"]
       tags:
diff --git a/installer/remove/tpot.yml b/installer/remove/tpot.yml
index 6196f31a..1a0e483f 100644
--- a/installer/remove/tpot.yml
+++ b/installer/remove/tpot.yml
@@ -215,6 +215,20 @@
         - "Rocky"
         - "Ubuntu"
 
+    - name: Revert Comment out Port(s) in sshd_config, can cause port conflicts on deploy (AlmaLinux, Debian, Fedora, Raspbian, Rocky, Ubuntu)
+      ansible.builtin.replace:
+        path: /etc/ssh/sshd_config
+        regexp: "^# (Port [0-9]+)"
+        replace: '\1'
+      when: ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "Raspbian", "Rocky", "Ubuntu"]
+      tags:
+        - "AlmaLinux"
+        - "Debian"
+        - "Fedora"
+        - "Raspbian"
+        - "Rocky"
+        - "Ubuntu"
+
     - name: Remove vm.max_map_count setting (All)
       lineinfile:
         path: /etc/sysctl.conf