diff --git a/aws_crowd_dc_node.yml b/aws_crowd_dc_node.yml
index 9259979..d08a0d6 100644
--- a/aws_crowd_dc_node.yml
+++ b/aws_crowd_dc_node.yml
@@ -16,6 +16,8 @@
     - role: aws_shared_fs_config
     - role: product_common
     - role: product_install
+      tags: [skip_on_stack_update]
     - role: database_init
+      tags: [skip_on_stack_update]
     - role: crowd_config
     - role: product_startup
diff --git a/roles/crowd_config/tasks/main.yml b/roles/crowd_config/tasks/main.yml
index ec3c9b9..d003ef8 100644
--- a/roles/crowd_config/tasks/main.yml
+++ b/roles/crowd_config/tasks/main.yml
@@ -106,6 +106,8 @@
     - atl_proxy_name is defined
     - atl_tomcat_scheme is defined
     - db_created is undefined or not db_created.changed
+  tags:
+    - skip_on_stack_update
   ignore_errors: yes  # For Molecule as it has no db test framework included
 
 - name: Check that crowd.cfg.xml exists