diff --git a/modules/aws/etcd/nodes.tf b/modules/aws/etcd/nodes.tf
index 0dc4c44238..baccfcc2de 100644
--- a/modules/aws/etcd/nodes.tf
+++ b/modules/aws/etcd/nodes.tf
@@ -32,6 +32,11 @@ resource "aws_instance" "etcd_node" {
   user_data              = "${ignition_config.etcd.*.rendered[count.index]}"
   vpc_security_group_ids = ["${var.sg_ids}"]
 
+  lifecycle {
+    prevent_destroy = true
+    ignore_changes = ["ami"]
+  }
+
   tags = "${merge(map(
       "Name", "${var.cluster_name}-etcd-${count.index}",
       "KubernetesCluster", "${var.cluster_name}"
diff --git a/modules/aws/master-asg/master.tf b/modules/aws/master-asg/master.tf
index 651feee8bc..4bbff0897b 100644
--- a/modules/aws/master-asg/master.tf
+++ b/modules/aws/master-asg/master.tf
@@ -61,8 +61,10 @@ resource "aws_launch_configuration" "master_conf" {
   associate_public_ip_address = "${var.public_vpc}"
   user_data                   = "${var.user_data}"
 
+
   lifecycle {
     create_before_destroy = true
+    ignore_changes = ["image_id"]
   }
 
   root_block_device {