diff --git a/elements/eos/deps.bst b/elements/eos/deps.bst
index 2575889f8..9f50cabd7 100644
--- a/elements/eos/deps.bst
+++ b/elements/eos/deps.bst
@@ -44,7 +44,6 @@ depends:
 - eos/eos-theme.bst
 - eos/eos-updater.bst
 - eos/payg/deps.bst
-- eos/update-ca-certificates-symlink.bst
 
 # Used by eos-image-builder. This could move into a separate tree.
 # See: <https://github.com/endlessm/eos-build-meta/issues/81>
diff --git a/elements/eos/eos-boot-helper.bst b/elements/eos/eos-boot-helper.bst
index 9f49c68df..677b8fc80 100644
--- a/elements/eos/eos-boot-helper.bst
+++ b/elements/eos/eos-boot-helper.bst
@@ -24,8 +24,8 @@ variables:
 sources:
 - kind: git_repo
   url: github:endlessm/eos-boot-helper
-  track: master
-  ref: Release_6.0.5-17-g5f8019dba9859784b1ea90accee7895f3786c4a3
+  track: 174-use-update-ca-trust
+  ref: a1f642cb0cf0c59bb94f56311d0354b16614455d
 
 public:
   bst:
diff --git a/elements/eos/eos-keyring-base.bst b/elements/eos/eos-keyring-base.bst
index ab1c9629e..167d199cd 100644
--- a/elements/eos/eos-keyring-base.bst
+++ b/elements/eos/eos-keyring-base.bst
@@ -20,7 +20,8 @@ description: |
 sources:
 - kind: git_repo
   url: github:endlessm/eos-keyring.git
-  ref: 99f6609b0d799f7463c87fec45e5a9e1a9a36994
+  track: 174-use-update-ca-trust
+  ref: c9c7fb95fc34d91c69efa057ae7392435491a1a9
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/eos/eos-theme.bst b/elements/eos/eos-theme.bst
index e6bf42425..9c5bba3ef 100644
--- a/elements/eos/eos-theme.bst
+++ b/elements/eos/eos-theme.bst
@@ -12,7 +12,8 @@ description: |
 sources:
 - kind: git_repo
   url: github:endlessm/eos-theme.git
-  ref: 27604966c939ce49532d1d868c0e14af18d0e45d
+  track: 174-use-update-ca-trust
+  ref: 43acff2553cb0c03f1dc5b0d522e9790aa13bc70
 
 build-depends:
 - freedesktop-sdk.bst:components/systemd.bst
diff --git a/elements/eos/update-ca-certificates-symlink.bst b/elements/eos/update-ca-certificates-symlink.bst
deleted file mode 100644
index b3564f6b5..000000000
--- a/elements/eos/update-ca-certificates-symlink.bst
+++ /dev/null
@@ -1,22 +0,0 @@
-kind: manual
-description: |
-  Compatibility symlink for the `update-ca-certificates` program.
-
-  Freedesktop SDK includes the Red Hat CA certificates package which is
-  updated via `update-ca-trust`.
-
-  EOS6 included the Debian CA certificates package which is updated via
-  `update-ca-certificates`.
-
-  The eos-safe-defaults program and maybe other things assume they can run
-  `update-ca-certificates`, we add a compatibility symlink so this keeps
-  working.
-
-build-depends:
-  - freedesktop-sdk.bst:bootstrap-import.bst
-
-config:
-  install-commands:
-    - |
-      mkdir -p %{install-root}/usr/bin/
-      ln -sf /usr/bin/update-ca-trust %{install-root}/usr/bin/update-ca-certificates