diff --git a/data_bags/credentials/botka_irc-libera-chat.json b/data_bags/credentials/botka_irc-libera-chat.json
deleted file mode 100644
index f1676c4..0000000
--- a/data_bags/credentials/botka_irc-libera-chat.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "id": "botka_irc-libera-chat",
-  "rs_logger_token": {
-    "encrypted_data": "K0totr/aUIZ/ArLHLsXOCtpmhYRyebJv5GOsYEgCo3s2ObdYOWsDEIkhj7ho\nf9fFwdii\n",
-    "iv": "zpdygbdrCqumn2Us\n",
-    "auth_tag": "xqjaUt8BjBPNNKas47gzmA==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "nickserv_password": {
-    "encrypted_data": "QBKx59optTSTfhLAtZ1h0dcQD1Xh7/ornslRb4en1A==\n",
-    "iv": "DrpHZPcfac7Cq4wf\n",
-    "auth_tag": "CUI9Wf/EObL3CpEr8MfqLw==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "znc_host": {
-    "encrypted_data": "U7n5uu39L6ShcnLY3iKuRsUZpI4NuZvBnBkqedc=\n",
-    "iv": "QFqfqQEjxmi1O12z\n",
-    "auth_tag": "uLXLy7AGt1/SarBx8QpWSw==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "znc_port": {
-    "encrypted_data": "T2lZ6mXjUwlulpyqkM1VTBGf2zU/SBi+\n",
-    "iv": "BtF1HBLST3RmYk/s\n",
-    "auth_tag": "htf0Clo/9H5FWbTwFc4W8Q==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "znc_user": {
-    "encrypted_data": "q/rGDx8G51/MlFr/fE29GyZmEC7e9OnSJK07yCABNw==\n",
-    "iv": "Lvj2yLTpWba1cOLT\n",
-    "auth_tag": "V43rrkVYDXmZ7csTKiQpJg==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "znc_password": {
-    "encrypted_data": "0QZxtYSDiYEfXGm3rMsAmE2lUWa1P5X0L1d7jHIdPww=\n",
-    "iv": "+yICaeYVn1HtaVYS\n",
-    "auth_tag": "7qe/85sww2TCc31/l0Gszw==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "gcm_api_key": {
-    "encrypted_data": "UnarSxLUWt9JUUxRH7yeeA1VKOvePwwCCPO1Vi0F6hl/1P8HOxpGp2O1a/1R\nC78KVFfi9vmLa2Gwlw==\n",
-    "iv": "C25lCAZeEiki0Ruq\n",
-    "auth_tag": "XhtL3J79PpltMLs6Y2xg9A==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "vapid_public_key": {
-    "encrypted_data": "LU7E8wwKSrJLzsM1yDl6MO/SiVQ600NWpLhZFO+cb5jfHGoU4x0Zvo9zKVle\nG+SGzvm+OM14ld2MTbHCCtSkHuIR+tO2lrDg19gnQRmHRrf4A8Vbhl7nQ33E\ntwKjo2UUTSYQGGeNbSAOHw==\n",
-    "iv": "ppveJZXb2+nFHOwP\n",
-    "auth_tag": "ZcY9O5NCenlWrp4zS9uSjQ==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "vapid_private_key": {
-    "encrypted_data": "69aGVRJOA4MjErS5uB4HG4Y4vw4ch6t6xe0AFN1Ir5a6uC7JULy5pTWpht/k\n5KWSJgynjYH405bIompkTMo=\n",
-    "iv": "zofy6sRjLVO2q/XD\n",
-    "auth_tag": "f79xkUJpaoYhcCLqA7WURQ==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  }
-}
\ No newline at end of file
diff --git a/data_bags/credentials/hal8000_freenode.json b/data_bags/credentials/hal8000_freenode.json
deleted file mode 100644
index 4e09a1a..0000000
--- a/data_bags/credentials/hal8000_freenode.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "id": "hal8000_freenode",
-  "nickserv_password": {
-    "encrypted_data": "rkCsvjS6EipHlxgxPdSiPVl6CCyjyy845P2ftSykmIW0+fxahTSOxbSMYJl8\n1DW6Go88ZE+eKKWIugp2nWDS+5Pnx58I\n",
-    "iv": "EvNcR0eqpZngoNJx\n",
-    "auth_tag": "kKFPUuff8llgVZYROTg/EA==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "webhook_token": {
-    "encrypted_data": "ItDsU9w6HCGS7ykQdkZEXQEZzPEt6bW42Fbh00AtZz+h7JmQ\n",
-    "iv": "OdaAg/XoUMIEfQEQ\n",
-    "auth_tag": "9ThqnVhWEZbo4jF4lqa5TA==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "kredits_webhook_token": {
-    "encrypted_data": "kUp4XAQkwWFphQT1f4wsGVJJtmhBqrEiW6W1D1ONrpZ0z94=\n",
-    "iv": "XiGtQlKn4BvAeaS1\n",
-    "auth_tag": "1hkTI7ccxBN4/6U4VF19WQ==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "kredits_wallet_password": {
-    "encrypted_data": "mKcJBPto0OdPpBXB5x3ynxq01DA2CEz476lTAgjGjTNDHQ==\n",
-    "iv": "LIvTZ+fx1suOcnjD\n",
-    "auth_tag": "mcjLU242nqtNn5XR7ku4BQ==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  }
-}
\ No newline at end of file
diff --git a/data_bags/credentials/hal8000_xmpp.json b/data_bags/credentials/hal8000_xmpp.json
deleted file mode 100644
index bf88cf3..0000000
--- a/data_bags/credentials/hal8000_xmpp.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  "id": "hal8000_xmpp",
-  "xmpp_password": {
-    "encrypted_data": "fFHM54i7mlfD9dpZWJWIsjSXGzekctbsNZc0DOSOijg=\n",
-    "iv": "kKkZ9dbk3l9Gygkz\n",
-    "auth_tag": "Sx2oYaWlrrjn27x/7+Hciw==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "webhook_token": {
-    "encrypted_data": "I1b52yjcijL8G/5rQOaK+Us4mqj3zfrS14C1FNX/QGYfk5qo\n",
-    "iv": "JKhm4WyvV09cW5WY\n",
-    "auth_tag": "EdbJQ+robm4Ekibbid8WQg==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "kredits_webhook_token": {
-    "encrypted_data": "xybuwYnGSyOZd+C89mkXYQNp3QOdGCNby7T26VHQw9cJ9BI=\n",
-    "iv": "p4JRoucq6402kJTA\n",
-    "auth_tag": "Q9tRvbk9Yeii7BAqB153PA==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "kredits_wallet_password": {
-    "encrypted_data": "GiWqyYSRipI7+HTV2mlaWZBchPkDSAqf0c0GwmcGXzuc6g==\n",
-    "iv": "txQNno2CBfscTEZ9\n",
-    "auth_tag": "NUEYUOOYIczFW11T8RPApg==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "kredits_session_secret": {
-    "encrypted_data": "BZoUrStW49IHALMNBMZFQwu40VeuUF++JRI7MqggXhSCWu9l5MIuBjwiOd9O\nUXaAfY3NgrYC\n",
-    "iv": "yGLVq+owGBs7UHle\n",
-    "auth_tag": "ar81Cg0/ae83pNqkTos+Zg==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "gitea_token": {
-    "encrypted_data": "8cN3+ptBOv4Ha0VBrq94fXnuLSYUWU3WaRXcblt4KSak3GMziYCTVw2mYxbE\nsfrYH7Ukypht/mEu+kY=\n",
-    "iv": "Vz7f+khl5VNdbtaG\n",
-    "auth_tag": "OXWUsIUcazdSfQIlevpKPg==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "github_token": {
-    "encrypted_data": "13MyNGNRKiKIrfwauhV/XS7rIzaflHL+BARDO/JMMUxoG8vsNvci5gHBHr95\nr9hqRu218czoZFl/O/Q=\n",
-    "iv": "QuC8lFzZwH73J4Dy\n",
-    "auth_tag": "ZZdBCh/K3l8i1QKpT8aR1A==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "kredits_github_key": {
-    "encrypted_data": "5iAJpKHyGIpNnB7xo03p150Gs4chTlx5cWBXXeo8QVzho5aBOhjc\n",
-    "iv": "6X1u9Y0SPPZrS26f\n",
-    "auth_tag": "KMB9VG/M3emW6Cd9kX23Zg==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "kredits_github_secret": {
-    "encrypted_data": "bY2Aa7h3gJ8owtK9HZ0Fnvi35HtvAKX25R1WF1Lgmqj8tKIASnDjTHTh38b2\nfa8NFt4OAwrOkIDK6sM=\n",
-    "iv": "quCBdq6e5Hs3O5Yr\n",
-    "auth_tag": "jOAcMTyqSJ04H8ZPVZz6Zw==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
-  "kredits_zoom_jwt": {
-    "encrypted_data": "d/UWwRN99Tel0oHBwrXptDzQ8k2GpWers8+aD4bfVqM4aoHex7+4/IQE529i\n2wm//3yxzPfVicqnYvToWDorKvL7buZdQmTJNRdN7gxjt+NLNtB4FYWImNnI\ntfyufpx3bYsA1ULLfoO14QDm/nfvf8jsftArwXZZMLEbCHrS7E4LYS9+UVQM\nRytRTgQhCtB9hPSUwykZ3OgYrJnm5HCPss+IHaTDmPG5jY8xZs4xvUdeFa6T\nkzsfpXf5aIzxei5UEl75mTm3XXAARvc=\n",
-    "iv": "6WaZCHRuUp46xTAG\n",
-    "auth_tag": "ZA2gb03AO/GGq8Kl+You5Q==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  }
-}
\ No newline at end of file
diff --git a/data_bags/credentials/hubot.json b/data_bags/credentials/hubot.json
new file mode 100644
index 0000000..3e54fa5
--- /dev/null
+++ b/data_bags/credentials/hubot.json
@@ -0,0 +1,17 @@
+{
+  "id": "hubot",
+  "botka_irc-libera-chat": {
+    "encrypted_data": "ceX2xHYBYFTuTEdHSXCgfONEy+uj0iRkqVoJXTCz/V/LP5Wvyp8sPF0YNBjC\nX+DwClNtAfKevXV1XKompL4X9/vTVW4Z4gLGhkwalslj8AcjMYwNgdee+d4F\n2alckEuuTnVW5Qd4PYp2m8mwbXRrSY8XvZ5A7hrCdw9kQPFS/O1jWlqcCVn1\ntLMK4dpKcgsO0eVjqq3sBPv1QEYuE1U4T3yHV0fSc1kpT+Ta9VDpU/PyMBQ7\nNj+ehGbsZ4Auzigb2/qVVecdR1YzCg+9re5FJ9jS\n",
+    "iv": "NWpKmpywB552avSP\n",
+    "auth_tag": "mbgE/xkW1XumbvteRav+Ug==\n",
+    "version": 3,
+    "cipher": "aes-256-gcm"
+  },
+  "hal8000_xmpp": {
+    "encrypted_data": "l5OXEJXWopStN9T3CZaaZuXdpuuT13Lpd3srIrOBg17K8x4P2qcc+24iPpC2\n3zemKbh2FEcdmguQIIqDbcqJ5kEFfRZz65K1YKFAgiWVrNToyZ6TUzgy1rE2\nIdljvuaVjN900WdU+2AjqD6LAEzAuV/LoLDV88h7EfHbyp2IjwB/BJYpOGaG\ntdO8hvTTvlqpwLokshm7U/BntKqOUK6K+/gq0mBvqqotEtEe3d+Wsvxn+MxR\n2eFuSaX2FCgDLk+aQNAOqN1+D9JnmIsp8AzNaftAULo3GTnQZThVF9giPCfq\nDhN3IRDoyvYkSE+Yg2QuX/4P8TDFIL+x9B26T6o5qQs+9Bzo85K1VJpH4QsZ\nG89D2QIf6R2IoNAzQJUcbpp4HhIXLcZxMbDMUF9tA13SVkOMjtyvaZciEMfT\n1uxKXOU9kGQLoiB9kSAFQVzZP6zxufUbK7FeqYMpU3bHl6062wn90EMeLPto\nsLV+7Lw3LKK6AjlKl8kg8aUdSsB38rQ5CAOyqFAAf1eWMO1cpxCpYxzvNXd6\n80A85SKVkYT88pK1HwZYxqAdTkeImtZIxMgvirr8ywRKRutzcZi3Z2XHvfF0\nep/vnJY+VJuhZ4+k1QxcY9flLw+OVbu1+eVMdZlznHmfkr9sTrRIwNFTq4c+\n53ZCFH3Fa3DoW8O4nzkAcOEt+Fr94f3bCJemuvtkqF5F3ahNImjyTubXF9El\nqWXub+NvEyqiW+XtO1BlRfocgNLty6uqtXH6vPWZmzXsf+J4vZkBbmhhjgkq\nw67FAw43ikXZSzQRus1yBBGfuiNX9VITp0gW5v4uINuqYTWY5F0/i4ySjmbU\niiJLSvsklV4TVehW99o/987Ex70lqlGdnjxp0aot3lYR26EiBYA=\n",
+    "iv": "hUs2EqXGGFJeu9pv\n",
+    "auth_tag": "n298dNAMe8K/N6/KMEoQQg==\n",
+    "version": 3,
+    "cipher": "aes-256-gcm"
+  }
+}
\ No newline at end of file
diff --git a/site-cookbooks/kosmos-mediawiki/recipes/default.rb b/site-cookbooks/kosmos-mediawiki/recipes/default.rb
index 2ed9194..3da5f35 100644
--- a/site-cookbooks/kosmos-mediawiki/recipes/default.rb
+++ b/site-cookbooks/kosmos-mediawiki/recipes/default.rb
@@ -100,8 +100,7 @@ ark "MediawikiHubot" do
   action :cherry_pick
 end
 
-hubot_credentials = data_bag_item('credentials', 'hal8000_xmpp')
-webhook_token = hubot_credentials['webhook_token']
+webhook_token = data_bag_item('credentials', 'hubot')['hal8000_xmpp']['webhook_token']
 
 template "#{node['mediawiki']['webdir']}/extensions/MediawikiHubot/DefaultConfig.php" do
   source "MediawikiHubot/DefaultConfig.php.erb"
diff --git a/site-cookbooks/kosmos_prometheus/recipes/alertmanager.rb b/site-cookbooks/kosmos_prometheus/recipes/alertmanager.rb
index b8625a9..156d6a4 100644
--- a/site-cookbooks/kosmos_prometheus/recipes/alertmanager.rb
+++ b/site-cookbooks/kosmos_prometheus/recipes/alertmanager.rb
@@ -58,8 +58,8 @@ file "/usr/local/bin/alertmanager" do
 end
 
 # TODO use Auth header once supported by hubot-incoming-webhook
-credentials = data_bag_item("credentials", "hal8000_xmpp")
-webhook_url = "https://hal8000.kosmos.chat/incoming/#{credentials['webhook_token']}"
+webhook_token = data_bag_item('credentials', 'hubot')['hal8000_xmpp']['webhook_token']
+webhook_url = "https://hal8000.kosmos.chat/incoming/#{webhook_token}"
 
 template "/etc/prometheus/alertmanager.yml" do
   source "alertmanager.yml.erb"