adjustments

(cherry picked from commit 00f15d4dd2982bdfff39cf927bbe773a8201e0d8)
repacked workflow