I'm in the process of switching departments at my firm because of the WFH policies. Each department was segmented into groups with different minimum requiremen

I'm in the process of switching departments at my firm because of the WFH policies. Each department was segmented into groups with different minimum requirements for days per week in the office. My group got 2 -3 days minimum requirement. Meanwhile, our IT department was marked virtual and will get to keep WFH. I reached out to the MD there and secured myself a software engineer position. My KPI was up 200% while WFH because I didn't have to waste my time with office BS. Now, due to working in the office, having to book conference rooms, etc. my numbers slowly dropping, and boss is getting upset, wondering why "productivity is dropping". He's breathing down my neck, and I just lost moral to continue being productive in my current role. Working in the office is just not for me. My boss and I had a big fight about me transferring departments and one of his arguments for me not switching was 'the hybrid work model may not be permanent.' I really hope calls like this from the mayor won't end hybrid / WFH completely.