diff --git a/extraconfig/post_deploy/undercloud_post.sh b/extraconfig/post_deploy/undercloud_post.sh
index f6ac937474..5f327813ec 100755
--- a/extraconfig/post_deploy/undercloud_post.sh
+++ b/extraconfig/post_deploy/undercloud_post.sh
@@ -157,22 +157,39 @@ fi
 
 # MISTRAL WORKFLOW CONFIGURATION
 if [ "$(hiera mistral_api_enabled)" = "true" ]; then
-    # load workflows
+    echo Configuring Mistral workbooks.
     for workbook in $(openstack workbook list | grep tripleo | cut -f 2 -d ' '); do
         openstack workbook delete $workbook
     done
-    for workflow in $(openstack workflow list | grep tripleo | cut -f 2 -d ' '); do
-        openstack workflow delete $workflow
+    if openstack cron trigger show publish-ui-logs-hourly &>/dev/null; then
+        openstack cron trigger delete publish-ui-logs-hourly
+    fi
+    #TODO In the future we should be able to run something like
+    # openstack workflow list --filter=tag=tripleo-common-managed
+    # but right now this is broken in Mistral, so we'll fix later.
+    for workflow in $(openstack workflow list -c Name -c Tags | grep tripleo-common-managed); do
+        NAME=$(echo ${workflow} | awk '{print $2}')
+        TAG=$(echo ${workflow} | awk '{print $4}')
+        if echo $TAG | grep -q tripleo-common-managed; then
+            openstack workflow delete $NAME
+        fi
     done
     for workbook in $(ls /usr/share/openstack-tripleo-common/workbooks/*); do
         openstack workbook create $workbook
     done
+    openstack cron trigger create publish-ui-logs-hourly tripleo.plan_management.v1.publish_ui_logs_to_swift --pattern '0 * * * *'
+    echo Mistral workbooks configured successfully.
 
   # Store the SNMP password in a mistral environment
   if ! openstack workflow env show tripleo.undercloud-config &>/dev/null; then
       TMP_MISTRAL_ENV=$(mktemp)
       echo "{\"name\": \"tripleo.undercloud-config\", \"variables\": {\"undercloud_ceilometer_snmpd_password\": \"$snmp_readonly_user_password\"}}" > $TMP_MISTRAL_ENV
+      echo Configure Mistral environment with undercloud-config
       openstack workflow env create $TMP_MISTRAL_ENV
-   fi
+  fi
 
+  if [ "$(enable_validations)" = "true" ]; then
+      echo Execute copy_ssh_key validations
+      openstack workflow execution create tripleo.validations.v1.copy_ssh_key
+  fi
 fi
diff --git a/extraconfig/post_deploy/undercloud_post.yaml b/extraconfig/post_deploy/undercloud_post.yaml
index 116d319e82..b0e13f3a17 100644
--- a/extraconfig/post_deploy/undercloud_post.yaml
+++ b/extraconfig/post_deploy/undercloud_post.yaml
@@ -47,6 +47,11 @@ parameters:
     description: The user password for SNMPd with readonly rights running on all Overcloud nodes
     type: string
     hidden: true
+  EnableValidations:
+    default: false
+    description: >
+      Whether the TripleO validations are enabled.
+    type: boolean
 
 conditions:
 
@@ -78,6 +83,7 @@ resources:
         - name: admin_password
         - name: auth_url
         - name: snmp_readonly_user_password
+        - name: enable_validations
       config: {get_file: ./undercloud_post.sh}
 
   UndercloudPostDeployment:
@@ -97,6 +103,7 @@ resources:
         homedir: {get_param: UndercloudHomeDir}
         admin_password: {get_param: AdminPassword}
         snmp_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
+        enable_validations: [get_params: EnableValidations]
         # if SSL is enabled we use the public virtual ip as the stackrc endpoint
         auth_url:
           if: