diff --git a/ansible/tasks/internal/node-exporter.yml b/ansible/tasks/internal/node-exporter.yml
index fbc34234e..355dcdb15 100644
--- a/ansible/tasks/internal/node-exporter.yml
+++ b/ansible/tasks/internal/node-exporter.yml
@@ -41,6 +41,6 @@
 - name: node_exporter - reload systemd
   systemd:
     daemon_reload: yes
-    enabled: yes
-    state: restarted
+    enabled: no
+    state: stopped
     name: node_exporter
diff --git a/ansible/tasks/internal/optimizations.yml b/ansible/tasks/internal/optimizations.yml
new file mode 100644
index 000000000..f41eca62b
--- /dev/null
+++ b/ansible/tasks/internal/optimizations.yml
@@ -0,0 +1,16 @@
+- name: ensure services are stopped
+  community.general.snap:
+    name: amazon-ssm-agent
+    state: absent
+
+- name: ensure services are stopped and disabled for first boot
+  systemd:
+    enabled: no
+    name: '{{ item }}'
+    state: stopped
+  with_items:
+    - snapd
+    - postgresql
+    - postgrest
+    - pgbouncer
+    - fail2ban
diff --git a/ansible/tasks/internal/postgres-exporter.yml b/ansible/tasks/internal/postgres-exporter.yml
index c0109d4df..4fecaeabf 100644
--- a/ansible/tasks/internal/postgres-exporter.yml
+++ b/ansible/tasks/internal/postgres-exporter.yml
@@ -38,9 +38,9 @@
     src: files/queries.yml.j2
     dest: /opt/postgres_exporter/queries.yml
 
-- name: exporter enable service
+- name: exporter ensure service is present
   systemd:
-    enabled: yes
+    enabled: no
     name: postgres_exporter
     daemon_reload: yes
-    state: restarted
+    state: stopped
diff --git a/ansible/tasks/setup-supabase-internal.yml b/ansible/tasks/setup-supabase-internal.yml
index 0e339477c..52b69584f 100644
--- a/ansible/tasks/setup-supabase-internal.yml
+++ b/ansible/tasks/setup-supabase-internal.yml
@@ -2,6 +2,7 @@
   apt:
     pkg:
       - unzip
+      - jq
     install_recommends: no
 
 - name: AWS CLI (arm)
@@ -33,4 +34,7 @@
   import_tasks: internal/node-exporter.yml
 
 - name: Install supautils
-  import_tasks: internal/supautils.yml
\ No newline at end of file
+  import_tasks: internal/supautils.yml
+
+- name: Boot time optimizations
+  import_tasks: internal/optimizations.yml