diff --git a/installer/install/tpot.yml b/installer/install/tpot.yml
index 4d77184f..b4a12d92 100644
--- a/installer/install/tpot.yml
+++ b/installer/install/tpot.yml
@@ -477,6 +477,22 @@
         - "Rocky"
         - "Ubuntu"
 
+    - name: Ensure vm.max_map_count is set (All)
+      lineinfile:
+        path: /etc/sysctl.conf
+        line: "vm.max_map_count=262144"
+        state: present
+        create: yes
+      when: ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "openSUSE Tumbleweed", "Raspbian", "Rocky", "Ubuntu"]
+      tags:
+        - "AlmaLinux"
+        - "Debian"
+        - "Fedora"
+        - "openSUSE Tumbleweed"
+        - "Raspbian"
+        - "Rocky"
+        - "Ubuntu"
+
     - name: Disable ssh.socket unit (Ubuntu)
       systemd:
         name: ssh.socket
diff --git a/installer/remove/tpot.yml b/installer/remove/tpot.yml
index 887e52fd..6196f31a 100644
--- a/installer/remove/tpot.yml
+++ b/installer/remove/tpot.yml
@@ -215,6 +215,21 @@
         - "Rocky"
         - "Ubuntu"
 
+    - name: Remove vm.max_map_count setting (All)
+      lineinfile:
+        path: /etc/sysctl.conf
+        line: "vm.max_map_count=262144"
+        state: absent
+      when: ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "openSUSE Tumbleweed", "Raspbian", "Rocky", "Ubuntu"]
+      tags:
+        - "AlmaLinux"
+        - "Debian"
+        - "Fedora"
+        - "openSUSE Tumbleweed"
+        - "Raspbian"
+        - "Rocky"
+        - "Ubuntu"
+
     - name: Remove T-Pot user (All)
       user:
         name: tpot