Revert "[FIX CI] attachment/image factory"

This reverts commit 551e56cab885d9f8ae3b6b756b6b6ba49b4e42fc.