diff --git a/IaC/aws/terraform/ec2.tf b/IaC/aws/terraform/ec2.tf
index b664101..8ce6930 100644
--- a/IaC/aws/terraform/ec2.tf
+++ b/IaC/aws/terraform/ec2.tf
@@ -11,13 +11,30 @@ resource "aws_instance" "ec2example" {
   associate_public_ip_address = true
   key_name                    = aws_key_pair.ec2_key_pair.key_name
 
+}
+
+resource "null_resource" "wait_for_instance" {
+  depends_on = [aws_instance.ec2example]
+
   provisioner "local-exec" {
-    command = "ansible-playbook -i '${self.public_ip},' ${path.module}/../../ansible/apache.yml"
+    command = <<EOF
+    while [ "$(aws ec2 describe-instances --instance-ids ${aws_instance.ec2example.id} --query 'Reservations[].Instances[].State.Name' --output text)" != "running" ]; do
+      echo "Waiting for instance to be in running state"
+      sleep 10
+    done
+    echo "Instance is running, proceeding to check system status checks..."
+    while [ "$(aws ec2 describe-instance-status --instance-ids ${aws_instance.ec2example.id} --query 'InstanceStatuses[].SystemStatus.Status' --output text)" != "ok" ]; do
+      echo "Waiting for system status check to pass"
+      sleep 10
+    done
+    EOF
   }
+}
+
+resource "null_resource" "ansible_provisioning" {
+  depends_on = [null_resource.wait_for_instance]
 
-  provisioner "remote-exec" {
-    inline = [
-      "echo 'Waiting for instance to be ready'"
-    ]
+  provisioner "local-exec" {
+    command = "ansible-playbook -i '${aws_instance.ec2example.public_ip},' ${path.module}/../../ansible/apache.yml"
   }
 }