diff --git a/openstack_deploy/user_pending_upstream.yml b/openstack_deploy/user_pending_upstream.yml
new file mode 100644
index 0000000..ffef520
--- /dev/null
+++ b/openstack_deploy/user_pending_upstream.yml
@@ -0,0 +1,5 @@
+---
+
+# Can be removed once https://review.openstack.org/#/c/549638/
+# is implemented in the OSA SHA tag used.
+ntp_service_enabled: False