diff --git a/defaults/main.yml b/defaults/main.yml
index 64259119..a3963dd0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -50,9 +50,7 @@ workload_image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-
 workload_memory: "512"
 workload_launch_post_composable_upgrade: false
 
-# upgrade jinja template name:
 undercloud_upgrade_template: undercloud_upgrade.sh.j2
-undercloud_update_template: undercloud_update.sh.j2
 overcloud_upgrade_prepare_template: overcloud_upgrade_prepare.sh.j2
 overcloud_upgrade_run_template: overcloud_upgrade_run.sh.j2
 overcloud_upgrade_converge_template: overcloud_upgrade_converge.sh.j2
diff --git a/tasks/upgrade/undercloud_validate_upgrade.yaml b/tasks/common/undercloud_validate_upgrade.yaml
similarity index 100%
rename from tasks/upgrade/undercloud_validate_upgrade.yaml
rename to tasks/common/undercloud_validate_upgrade.yaml
diff --git a/tasks/update/create-update-scripts.yaml b/tasks/update/create-update-scripts.yaml
index f3506134..1caf7f72 100644
--- a/tasks/update/create-update-scripts.yaml
+++ b/tasks/update/create-update-scripts.yaml
@@ -1,7 +1,9 @@
 ---
 - name: create undercloud update script
+  vars:
+    log_prefix: "update"
   template:
-    src: "{{ undercloud_update_template }}"
+    src: "{{ undercloud_upgrade_template }}"
     dest: "{{ undercloud_update_script }}"
     mode: 0775
     force: true
diff --git a/tasks/update/main.yml b/tasks/update/main.yml
index eaa0fc7e..ef79d951 100644
--- a/tasks/update/main.yml
+++ b/tasks/update/main.yml
@@ -22,7 +22,7 @@
       when: updates_workarounds|bool
 
     - name: validate undercloud update
-      include: ../upgrade/undercloud_validate_upgrade.yaml
+      include: ../common/undercloud_validate_upgrade.yaml
       tags: undercloud_update_validate
 
   when: undercloud_update|bool
diff --git a/tasks/upgrade/create-upgrade-scripts.yaml b/tasks/upgrade/create-upgrade-scripts.yaml
index 6e011e97..22f01977 100644
--- a/tasks/upgrade/create-upgrade-scripts.yaml
+++ b/tasks/upgrade/create-upgrade-scripts.yaml
@@ -33,10 +33,13 @@
     mode: 0775
 
 - name: create undercloud upgrade script
+  vars:
+    log_prefix: "upgrade"
   template:
     src: "{{ undercloud_upgrade_template }}"
     dest: "{{ undercloud_upgrade_script }}"
     mode: 0775
+    force: true
 
 - name: create upgrade workaround scripts
   template:
diff --git a/tasks/upgrade/main.yml b/tasks/upgrade/main.yml
index 77d92ab4..62355ee7 100644
--- a/tasks/upgrade/main.yml
+++ b/tasks/upgrade/main.yml
@@ -14,7 +14,7 @@
       tags: undercloud_upgrade
 
     - name: validate undercloud upgrade
-      include: undercloud_validate_upgrade.yaml
+      include: ../common/undercloud_validate_upgrade.yaml
       tags: undercloud_upgrade_validate
 
     - name: apply post undercloud upgrade workarounds
diff --git a/templates/undercloud_update.sh.j2 b/templates/undercloud_update.sh.j2
deleted file mode 100644
index 6322153d..00000000
--- a/templates/undercloud_update.sh.j2
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-sudo yum update -y python-tripleoclient
-
-openstack undercloud upgrade 2>&1
diff --git a/templates/undercloud_upgrade.sh.j2 b/templates/undercloud_upgrade.sh.j2
index d86dde3f..8b80d95d 100644
--- a/templates/undercloud_upgrade.sh.j2
+++ b/templates/undercloud_upgrade.sh.j2
@@ -3,8 +3,5 @@
 # Perform undercloud upgrade and related steps
 set -euo pipefail
 
-# ceph-ansible needs to be installed manually
-sudo yum install -y ceph-ansible
-
 sudo yum update -y python-tripleoclient
-openstack undercloud upgrade &> undercloud_upgrade.log
+openstack undercloud upgrade &> undercloud_{{ log_prefix }}.log