diff --git a/meta-google/recipes-core/systemd/systemd_%.bbappend b/meta-google/recipes-core/systemd/systemd_%.bbappend
deleted file mode 100644
index 34e44b4..0000000
--- a/meta-google/recipes-core/systemd/systemd_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-# Disable timesync as we don't use it and it makes rebooting much slower
-PACKAGECONFIG:remove:gbmc = "timesyncd"
diff --git a/meta-google/recipes-google/systemd/files/40-gbmc-time.conf b/meta-google/recipes-google/systemd/files/40-gbmc-time.conf
new file mode 100644
index 0000000..ca30e45
--- /dev/null
+++ b/meta-google/recipes-google/systemd/files/40-gbmc-time.conf
@@ -0,0 +1,10 @@
+[Time]
+ConnectionRetrySec=30
+PollIntervalMinSec=30
+PollIntervalMaxSec=60
+SaveIntervalSec=15
+# time.google.com addresses are stable, no need for DNS
+NTP=2001:4860:4806::
+NTP=2001:4860:4806:4::
+NTP=2001:4860:4806:8::
+NTP=2001:4860:4806:c::
diff --git a/meta-google/recipes-google/systemd/gbmc-systemd-config.bb b/meta-google/recipes-google/systemd/gbmc-systemd-config.bb
index 843053b..feb023b 100644
--- a/meta-google/recipes-google/systemd/gbmc-systemd-config.bb
+++ b/meta-google/recipes-google/systemd/gbmc-systemd-config.bb
@@ -12,12 +12,14 @@
   file://firmware-updates-pre.target \
   file://40-gbmc-forward.conf \
   file://40-system.conf \
+  file://40-gbmc-time.conf \
   "
 
 FILES:${PN}:append = " \
   ${systemd_unitdir}/coredump.conf.d/40-gbmc-coredump.conf \
   ${systemd_unitdir}/resolved.conf.d/40-gbmc-nomdns.conf \
   ${systemd_unitdir}/system.conf.d/40-system.conf \
+  ${systemd_unitdir}/timesyncd.conf.d/40-gbmc-time.conf \
   ${libdir}/sysctl.d/40-gbmc-forward.conf \
   "
 
@@ -49,6 +51,9 @@
 
   install -d -m 0755 ${D}${systemd_unitdir}/system.conf.d/
   install -D -m0644 ${WORKDIR}/40-system.conf ${D}${systemd_unitdir}/system.conf.d/
+
+  install -d -m 0755 ${D}${systemd_unitdir}/timesyncd.conf.d/
+  install -D -m0644 ${WORKDIR}/40-gbmc-time.conf ${D}${systemd_unitdir}/timesyncd.conf.d/
 }
 
 do_install:append:dev() {
diff --git a/meta-google/recipes-phosphor/settings/phosphor-settings-manager/timemanager-default-HOST-MANUAL.override.yml b/meta-google/recipes-phosphor/settings/phosphor-settings-manager/timemanager-default-HOST-MANUAL.override.yml
deleted file mode 100644
index d7d46ec..0000000
--- a/meta-google/recipes-phosphor/settings/phosphor-settings-manager/timemanager-default-HOST-MANUAL.override.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2021 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-/xyz/openbmc_project/time/sync_method:
-  - Interface: xyz.openbmc_project.Time.Synchronization
-    Properties:
-        TimeSyncMethod:
-            Default: Synchronization::Method::Manual
diff --git a/meta-google/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-google/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
deleted file mode 100644
index 764f0c8..0000000
--- a/meta-google/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-#Override the default time settings from BMC/NTP to Host/Manual, so that host
-#can set BMC time via an IPMI command.
-
-FILESEXTRAPATHS:append:gbmc := ":${THISDIR}/${PN}"
-SRC_URI:append:gbmc = " file://timemanager-default-HOST-MANUAL.override.yml"
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager/timeowner-host-no-ntp.override.yml b/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager/timeowner-host-no-ntp.override.yml
deleted file mode 100644
index 0096eeb..0000000
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager/timeowner-host-no-ntp.override.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-/xyz/openbmc_project/time/sync_method:
-    - Interface: xyz.openbmc_project.Time.Synchronization
-      Properties:
-          TimeSyncMethod:
-              Default: Synchronization::Method::Manual
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
index 656528a..85ae4b2 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
@@ -1,3 +1,2 @@
 FILESEXTRAPATHS:append:zaius := ":${THISDIR}/${PN}"
 SRC_URI:append:zaius = " file://powerpolicy-default-ALWAYS_POWER_ON.override.yml"
-SRC_URI:append:zaius = " file://timeowner-host-no-ntp.override.yml"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/settings/phosphor-settings-manager/time-default.override.yml b/meta-quanta/meta-gbs/recipes-phosphor/settings/phosphor-settings-manager/time-default.override.yml
deleted file mode 100644
index 0096eeb..0000000
--- a/meta-quanta/meta-gbs/recipes-phosphor/settings/phosphor-settings-manager/time-default.override.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-/xyz/openbmc_project/time/sync_method:
-    - Interface: xyz.openbmc_project.Time.Synchronization
-      Properties:
-          TimeSyncMethod:
-              Default: Synchronization::Method::Manual
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
index 8bd8b22..63b7e25 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
@@ -1,3 +1,2 @@
 FILESEXTRAPATHS:append:gbs := ":${THISDIR}/${PN}"
-SRC_URI:append:gbs = " file://time-default.override.yml"
 SRC_URI:append:gbs = " file://restrictionmode-default-whitelist.override.yml"
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager/time-default.override.yml b/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager/time-default.override.yml
deleted file mode 100644
index 0096eeb..0000000
--- a/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager/time-default.override.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-/xyz/openbmc_project/time/sync_method:
-    - Interface: xyz.openbmc_project.Time.Synchronization
-      Properties:
-          TimeSyncMethod:
-              Default: Synchronization::Method::Manual
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
index bbc797a..01060b4 100644
--- a/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ b/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
@@ -1,3 +1,2 @@
 FILESEXTRAPATHS:prepend:gsj := "${THISDIR}/${BPN}:"
-SRC_URI:append:gsj = " file://time-default.override.yml"
 SRC_URI:append:gsj = " file://restrictionmode-default-whitelist.override.yml"