A former U.S. Army soldier who was convicted of manslaughter for fatally shooting a handcuffed civilian in Iraq was arrested Monday on charges that he attacked police officers with a baton during the U.S. Capitol riot three years ago.

Edward Richmond Jr., 40, of Geismar, Louisiana, was wearing a helmet, shoulder pads, goggles and a Louisiana state flag patch on his chest when he assaulted police in a tunnel outside the Capitol on Jan. 6, 2021, according to an FBI agent’s affidavit.

Richmond was arrested in Baton Rouge, Louisiana, and is scheduled to make his initial court appearance Tuesday on charges including civil disorder and assaulting, resisting or impeding police with a dangerous weapon.