diff --git a/aws_confluence_dc_node.yml b/aws_confluence_dc_node.yml
index ce6c06e..046657c 100644
--- a/aws_confluence_dc_node.yml
+++ b/aws_confluence_dc_node.yml
@@ -17,7 +17,9 @@
     - 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: restore_backups
     - role: confluence_common
     - role: confluence_config
diff --git a/aws_confluence_synchrony_node.yml b/aws_confluence_synchrony_node.yml
index 3d13d85..b0fd8f2 100644
--- a/aws_confluence_synchrony_node.yml
+++ b/aws_confluence_synchrony_node.yml
@@ -23,6 +23,7 @@
     - role: aws_shared_fs_config
     - role: product_common
     - role: product_install
+      tags: [skip_on_stack_update]
     - role: confluence_common
     - role: synchrony_config
     - role: product_startup
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/aws_jira_dc_node.yml b/aws_jira_dc_node.yml
index be81d83..a994279 100644
--- a/aws_jira_dc_node.yml
+++ b/aws_jira_dc_node.yml
@@ -24,7 +24,9 @@
     - 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: restore_backups
     - role: jira_config
     - role: product_startup
diff --git a/roles/confluence_config/tasks/main.yml b/roles/confluence_config/tasks/main.yml
index ff58aff..887324e 100644
--- a/roles/confluence_config/tasks/main.yml
+++ b/roles/confluence_config/tasks/main.yml
@@ -113,4 +113,6 @@
     - 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
diff --git a/roles/crowd_config/tasks/main.yml b/roles/crowd_config/tasks/main.yml
index 246e0d2..73843b9 100644
--- a/roles/crowd_config/tasks/main.yml
+++ b/roles/crowd_config/tasks/main.yml
@@ -117,6 +117,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
diff --git a/roles/jira_config/tasks/main.yml b/roles/jira_config/tasks/main.yml
index 7d58529..5064f5d 100644
--- a/roles/jira_config/tasks/main.yml
+++ b/roles/jira_config/tasks/main.yml
@@ -115,4 +115,6 @@
     - 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