diff --git a/alembic/versions/17574c57f3f8_add_disable_updates_field_for_puppets.py b/alembic/versions/17574c57f3f8_add_disable_updates_field_for_puppets.py
index b91b0f13..1cc2c949 100644
--- a/alembic/versions/17574c57f3f8_add_disable_updates_field_for_puppets.py
+++ b/alembic/versions/17574c57f3f8_add_disable_updates_field_for_puppets.py
@@ -17,7 +17,8 @@ depends_on = None
 
 
 def upgrade():
-    op.add_column("puppet", sa.Column("disable_updates", sa.Boolean(), nullable=False,
+    with op.batch_alter_table("puppet") as batch_op:
+        batch_op.add_column(sa.Column("disable_updates", sa.Boolean(), nullable=False,
                                       server_default=sa.sql.expression.false()))
 
 
diff --git a/alembic/versions/1fa46383a9d3_add_is_bot_field_to_puppets.py b/alembic/versions/1fa46383a9d3_add_is_bot_field_to_puppets.py
index 00e1d6be..03d5ca33 100644
--- a/alembic/versions/1fa46383a9d3_add_is_bot_field_to_puppets.py
+++ b/alembic/versions/1fa46383a9d3_add_is_bot_field_to_puppets.py
@@ -17,7 +17,8 @@ depends_on = None
 
 
 def upgrade():
-    op.add_column('puppet', sa.Column('is_bot', sa.Boolean(), nullable=True))
+    with op.batch_alter_table("puppet") as batch_op:
+        batch_op.add_column(sa.Column('is_bot', sa.Boolean(), nullable=True))
 
 
 def downgrade():
diff --git a/alembic/versions/30eca60587f1_add_megagroup_field_to_portals.py b/alembic/versions/30eca60587f1_add_megagroup_field_to_portals.py
index 35a0db39..2c38f5d4 100644
--- a/alembic/versions/30eca60587f1_add_megagroup_field_to_portals.py
+++ b/alembic/versions/30eca60587f1_add_megagroup_field_to_portals.py
@@ -16,7 +16,8 @@ depends_on = None
 
 
 def upgrade():
-    op.add_column('portal', sa.Column('megagroup', sa.Boolean()))
+    with op.batch_alter_table("portal") as batch_op:
+        batch_op.add_column(sa.Column('megagroup', sa.Boolean()))
 
 
 def downgrade():
diff --git a/alembic/versions/6ca3d74d51e4_move_state_store_to_main_database.py b/alembic/versions/6ca3d74d51e4_move_state_store_to_main_database.py
index b5f583da..b26f447f 100644
--- a/alembic/versions/6ca3d74d51e4_move_state_store_to_main_database.py
+++ b/alembic/versions/6ca3d74d51e4_move_state_store_to_main_database.py
@@ -57,7 +57,8 @@ class Puppet(Base):
 
 
 def upgrade():
-    op.add_column("puppet", sa.Column("matrix_registered", sa.Boolean(), nullable=False,
+    with op.batch_alter_table("puppet") as batch_op:
+        batch_op.add_column(sa.Column("matrix_registered", sa.Boolean(), nullable=False,
                                       server_default=sa.sql.expression.false()))
     op.create_table("mx_room_state",
                     sa.Column("room_id", sa.String(), nullable=False),