diff --git a/mirror-image/scripts/mirrors.sh b/mirror-image/scripts/mirrors.sh
index 224ebe7..67cf90c 100644
--- a/mirror-image/scripts/mirrors.sh
+++ b/mirror-image/scripts/mirrors.sh
@@ -3,14 +3,12 @@
 SALT_OPTS="-l debug -t 10 --retcode-passthrough --no-color"
 
 #aptly
-# FIXME: remove duplicate run after fix: PROD-21387
-# RC: aptly may fail to import gpg key's randomly(most probably,nw issue), so lets run it twice
-salt-call ${SALT_OPTS} state.sls aptly.server || true
-sleep 5
+# Drop auto-generated by aptly itself certs
+rm -rfv /srv/volumes/aptly/{.gnupg,gpg_batch,public/public.gpg}
 salt-call ${SALT_OPTS} state.sls aptly.server
+sleep 10
 salt-call ${SALT_OPTS} state.sls aptly.publisher
-salt-call ${SALT_OPTS} state.sls aptly || true
-sleep 5
+sleep 10
 salt-call ${SALT_OPTS} state.sls aptly
 aptly_mirror_update.sh -sv
 aptly-publisher --url http://10.99.0.1:18084 --timeout=1200 publish -v -d -c /etc/aptly/publisher.yaml --architectures amd64 --recreate --force-overwrite