diff --git a/installer/install/tpot.yml b/installer/install/tpot.yml
index 850f9d21..cd17e792 100644
--- a/installer/install/tpot.yml
+++ b/installer/install/tpot.yml
@@ -481,8 +481,16 @@
     - 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:
+        - "AlmaLinux"
+        - "Debian"
+        - "Fedora"
+        - "Raspbian"
+        - "Rocky"
+        - "Ubuntu"
 
     - name: Change SSH Port to 64295 (AlmaLinux, Debian, Fedora, Raspbian, Rocky, Ubuntu)
       lineinfile: