diff --git a/site-modules/profile/files/puppet/swh-puppet-master-decommission.sh b/site-modules/profile/files/puppet/swh-puppet-master-decommission.sh
index c19d3fda0673fdab3c066a1dca159be43ae4dc80..4ebc14ba3169ff73f7a329a0a6b9dfb38add6aa6 100644
--- a/site-modules/profile/files/puppet/swh-puppet-master-decommission.sh
+++ b/site-modules/profile/files/puppet/swh-puppet-master-decommission.sh
@@ -8,5 +8,6 @@
 
 set -x
 
-puppet node deactivate "$@"
-puppet node clean "$@"
+server_list=$(echo "$@" | tr -s '[:blank:]' ',')
+
+echo puppetserver ca clean --certname "${server_list}"