diff --git a/toolbx/Dockerfile b/toolbx/Dockerfile
index 4c1078831bff6bc40436d67b90d2a1f5407229ba..390ec4c33e1e35f519949a1d195bec581d5839d3 100644
--- a/toolbx/Dockerfile
+++ b/toolbx/Dockerfile
@@ -24,21 +24,14 @@ RUN rm /etc/apt/apt.conf.d/docker-* && \
     && \
     export GNUPGHOME=/tmp/gnupghome && \
     mkdir --mode=0700 "$GNUPGHOME" && \
-    curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
-    gpg --no-default-keyring --import --batch --keyring /usr/share/keyrings/google-cloud.gpg && \
-    curl https://pgp.mongodb.com/server-5.0.asc | \
-    gpg --no-default-keyring --import --batch --keyring /usr/share/keyrings/mongodb.gpg && \
-    curl https://apt.releases.hashicorp.com/gpg | \
-    gpg --no-default-keyring --import --batch --keyring /usr/share/keyrings/hashicorp.gpg && \
-    curl https://dl.cloudsmith.io/public/cloudposse/packages/gpg.7333C6FDEFA717CC.key | \
-    gpg --no-default-keyring --import --batch --keyring /usr/share/keyrings/cloudposse.gpg && \
-    curl https://repo.charm.sh/apt/gpg.key | \
-    gpg --no-default-keyring --import --batch --keyring /usr/share/keyrings/charm.gpg && \
-    curl https://packages.opentofu.org/opentofu/tofu/gpgkey | \
-    gpg --no-default-keyring --import --batch --keyring /usr/share/keyrings/opentofu.gpg && \
-    curl https://download.docker.com/linux/debian/gpg | \
-    gpg --no-default-keyring --import --batch --keyring /usr/share/keyrings/docker.gpg && \
-    gpg --no-default-keyring --keyring /usr/share/keyrings/clickhouse.gpg --keyserver hkp://keyserver.ubuntu.com:80  --recv-keys 8919F6BD2B48D754 && \
+    curl https://packages.cloud.google.com/apt/doc/apt-key.gpg  --output /etc/apt/keyrings/google-cloud.asc && \
+    curl https://pgp.mongodb.com/server-5.0.asc --output /etc/apt/keyrings/mongodb.asc && \
+    curl https://apt.releases.hashicorp.com/gpg --output /etc/apt/keyrings/hashicorp.asc && \
+    curl https://dl.cloudsmith.io/public/cloudposse/packages/gpg.7333C6FDEFA717CC.key --output /etc/apt/keyrings/cloudposse.asc && \
+    curl https://repo.charm.sh/apt/gpg.key --output /etc/apt/keyrings/charm.asc && \
+    curl https://packages.opentofu.org/opentofu/tofu/gpgkey --output /etc/apt/keyrings/opentofu.asc && \
+    curl https://download.docker.com/linux/debian/gpg --output /etc/apt/keyrings/docker.asc && \
+    curl https://packages.clickhouse.com/rpm/lts/repodata/repomd.xml.key --output /etc/apt/keyrings/clickhouse.asc && \
     ln --symbolic --target /usr/local/bin/ /usr/libexec/flatpak-xdg-utils/* && \
     ln --symbolic /usr/local/bin/host-spawn /usr/local/bin/podman && \
     #mkdir /etc/krb5.conf.d && \
diff --git a/toolbx/sources.d/charm.sources b/toolbx/sources.d/charm.sources
index f9aa3d43204b18f44b8d89e397481b3fa4b84047..d151bd37f4849b34d243e43ec9fc363b9c8c4ff1 100644
--- a/toolbx/sources.d/charm.sources
+++ b/toolbx/sources.d/charm.sources
@@ -2,4 +2,4 @@ Types: deb
 URIs:https://repo.charm.sh/apt/
 Suites: *
 Components: *
-Signed-By: /usr/share/keyrings/charm.gpg
+Signed-By: /etc/apt/keyrings/charm.asc
diff --git a/toolbx/sources.d/clickhouse.sources b/toolbx/sources.d/clickhouse.sources
index 7ff6432a883c663294ff68f19e388b5ec85584ad..978cc5efddae9ca406bfedb331fe46d4bd31ad6e 100644
--- a/toolbx/sources.d/clickhouse.sources
+++ b/toolbx/sources.d/clickhouse.sources
@@ -2,4 +2,4 @@ Types: deb
 URIs: https://packages.clickhouse.com/deb
 Suites: stable
 Components: main
-Signed-By: /usr/share/keyrings/clickhouse.gpg
+Signed-By: /etc/apt/keyrings/clickhouse.asc
diff --git a/toolbx/sources.d/cloudposse.sources b/toolbx/sources.d/cloudposse.sources
index 4dd3a48b3001293826cec24b5de62519ee9917e5..a42a6539755e2f784dc19d1cb0d9b14bca0bfb95 100644
--- a/toolbx/sources.d/cloudposse.sources
+++ b/toolbx/sources.d/cloudposse.sources
@@ -2,4 +2,4 @@ Types: deb deb-src
 URIs: https://dl.cloudsmith.io/public/cloudposse/packages/deb/debian
 Suites: any-version
 Components: main
-Signed-By: /usr/share/keyrings/cloudposse.gpg
+Signed-By: /etc/apt/keyrings/cloudposse.asc
diff --git a/toolbx/sources.d/docker.sources b/toolbx/sources.d/docker.sources
index c06d5851d8a5b7e87555bac8e401fae01f67fdfc..e5c5ddf9f3c0ee1ed609337e51cc707cc788f733 100644
--- a/toolbx/sources.d/docker.sources
+++ b/toolbx/sources.d/docker.sources
@@ -2,4 +2,4 @@ Types: deb
 URIs: https://download.docker.com/linux/debian
 Suites: bookworm
 Components: stable
-Signed-By: /usr/share/keyrings/docker.gpg
+Signed-By: /etc/apt/keyrings/docker.asc
diff --git a/toolbx/sources.d/google-cloud.sources b/toolbx/sources.d/google-cloud.sources
index fc8038f3d50c8cc564f19a63dfed208d39bc1f5f..514d5be6d91e6a4d772c32f9d146657321a4f8cd 100644
--- a/toolbx/sources.d/google-cloud.sources
+++ b/toolbx/sources.d/google-cloud.sources
@@ -2,4 +2,4 @@ Types: deb
 URIs: https://packages.cloud.google.com/apt
 Suites: cloud-sdk
 Components: main
-Signed-By: /usr/share/keyrings/google-cloud.gpg
+Signed-By: /etc/apt/keyrings/google-cloud.asc
diff --git a/toolbx/sources.d/hashicorp.sources b/toolbx/sources.d/hashicorp.sources
index 215512f24071a46556eb075ad326f708c4bd4f9f..7f3816efc5efe875cb39a4a1aa9818626b680623 100644
--- a/toolbx/sources.d/hashicorp.sources
+++ b/toolbx/sources.d/hashicorp.sources
@@ -2,4 +2,4 @@ Types: deb
 URIs: https://apt.releases.hashicorp.com
 Suites: bookworm
 Components: main
-Signed-By: /usr/share/keyrings/hashicorp.gpg
+Signed-By: /etc/apt/keyrings/hashicorp.asc
diff --git a/toolbx/sources.d/mongodb.sources b/toolbx/sources.d/mongodb.sources
index bb92c98122981a68f5ec8c9a1601a021cfbb237f..79e0bd693a9fcdc94380d4ad34e02853798c43a3 100644
--- a/toolbx/sources.d/mongodb.sources
+++ b/toolbx/sources.d/mongodb.sources
@@ -2,4 +2,4 @@ Types: deb
 URIs: https://repo.mongodb.org/apt/debian
 Suites: buster/mongodb-org/5.0
 Components: main
-Signed-By: /usr/share/keyrings/mongodb.gpg
+Signed-By: /etc/apt/keyrings/mongodb.asc
diff --git a/toolbx/sources.d/opentofu.sources b/toolbx/sources.d/opentofu.sources
index 9ea032e9f6a3738dd207e30b60f98312fc1ee09f..c50613d2425a075f0bb1b0371d22512718732718 100644
--- a/toolbx/sources.d/opentofu.sources
+++ b/toolbx/sources.d/opentofu.sources
@@ -2,4 +2,4 @@ Types: deb deb-src
 URIs: https://packages.opentofu.org/opentofu/tofu/any/
 Suites: any
 Components: main
-Signed-By: /usr/share/keyrings/opentofu.gpg
+Signed-By: /etc/apt/keyrings/opentofu.asc