diff --git a/cloud-deployments/aws/cloudformation/aws_build_from_source_no_credentials.json b/cloud-deployments/aws/cloudformation/aws_build_from_source_no_credentials.json
index a96413774..86971696e 100644
--- a/cloud-deployments/aws/cloudformation/aws_build_from_source_no_credentials.json
+++ b/cloud-deployments/aws/cloudformation/aws_build_from_source_no_credentials.json
@@ -70,7 +70,7 @@
                 "\n",
                 "#cloud-config\n",
                 "cloud_final_modules:\n",
-                "- [scripts-user, always]\n",
+                "- [scripts-user, once-per-instance]\n",
                 "\n",
                 "\n",
                 "--//\n",
@@ -260,4 +260,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/cloud-deployments/aws/cloudformation/cf_template.template b/cloud-deployments/aws/cloudformation/cf_template.template
index b261a2d89..7aeb28b14 100644
--- a/cloud-deployments/aws/cloudformation/cf_template.template
+++ b/cloud-deployments/aws/cloudformation/cf_template.template
@@ -70,7 +70,7 @@
                 "\n",
                 "#cloud-config\n",
                 "cloud_final_modules:\n",
-                "- [scripts-user, always]\n",
+                "- [scripts-user, once-per-instance]\n",
                 "\n",
                 "\n",
                 "--//\n",
@@ -252,4 +252,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}