diff --git a/terraform-aws-github-runner/modules/runners-instances/templates/install-config-runner.sh b/terraform-aws-github-runner/modules/runners-instances/templates/install-config-runner.sh
index 0645b50f84..6e949adae7 100644
--- a/terraform-aws-github-runner/modules/runners-instances/templates/install-config-runner.sh
+++ b/terraform-aws-github-runner/modules/runners-instances/templates/install-config-runner.sh
@@ -85,6 +85,9 @@ case \$ami_id in
   *) echo "AMI Name: unknown";;
 esac
 
+grep 'pswpin' /proc/vmstat | awk '{print $2}' >/tmp/pswpin_before_job || true
+grep 'pswpout' /proc/vmstat | awk '{print $2}' >/tmp/pswpout_before_job || true
+
 echo "AMI ID: \$ami_id"
 
 metric_report "runner_scripts.before_job" 1
@@ -94,6 +97,21 @@ EOF
 #!/bin/bash
 . /home/$USER_NAME/runner-scripts/utils.sh
 
+grep 'pswpin' /proc/vmstat | awk '{print $2}' >/tmp/pswpin_after_job || true
+grep 'pswpout' /proc/vmstat | awk '{print $2}' >/tmp/pswpout_after_job || true
+
+if cmp --silent /tmp/pswpin_before_job /tmp/pswpin_after_job ; then
+  echo "[!ALERT!] Swap in detected! [!ALERT!]"
+  metric_report "runner_scripts.swap_in" 1
+  metric_report "runner_scripts.swap_op" 1
+fi
+
+if cmp --silent /tmp/pswpout_before_job /tmp/pswpout_after_job ; then
+  echo "[!ALERT!] Swap out detected [!ALERT!]"
+  metric_report "runner_scripts.swap_out" 1
+  metric_report "runner_scripts.swap_op" 1
+fi
+
 sudo chown -R $USER_NAME:$USER_NAME /home/$USER_NAME/actions-runner
 metric_report "runner_scripts.after_job" 1
 EOF
diff --git a/terraform-aws-github-runner/modules/runners-instances/templates/user-data.sh b/terraform-aws-github-runner/modules/runners-instances/templates/user-data.sh
index 7fbbf984f9..0f03ca6902 100644
--- a/terraform-aws-github-runner/modules/runners-instances/templates/user-data.sh
+++ b/terraform-aws-github-runner/modules/runners-instances/templates/user-data.sh
@@ -138,6 +138,11 @@ fi
 
 ${post_install}
 
+sudo fallocate -l 3G /swapfile
+sudo chmod 600 /swapfile
+sudo mkswap /swapfile
+sudo swapon /swapfile
+
 ./svc.sh start
 
 metric_report "linux_userdata.success" 1