diff --git a/src/AddressRegistry.Projections.Wms/Migrations/20250120114301_SwitchViewsToV3.Designer.cs b/src/AddressRegistry.Projections.Wms/Migrations/20250120114301_SwitchViewsToV3.Designer.cs
new file mode 100644
index 000000000..75fcecbaa
--- /dev/null
+++ b/src/AddressRegistry.Projections.Wms/Migrations/20250120114301_SwitchViewsToV3.Designer.cs
@@ -0,0 +1,225 @@
+// <auto-generated />
+using System;
+using AddressRegistry.Projections.Wms;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NetTopologySuite.Geometries;
+
+#nullable disable
+
+namespace AddressRegistry.Projections.Wms.Migrations
+{
+    [DbContext(typeof(WmsContext))]
+    [Migration("20250120114301_SwitchViewsToV3")]
+    partial class SwitchViewsToV3
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("AddressRegistry.Projections.Wms.AddressWmsItemV2.AddressWmsItemV2", b =>
+                {
+                    b.Property<int>("AddressPersistentLocalId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("BoxNumber")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("HouseNumber")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("HouseNumberLabel")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int?>("HouseNumberLabelLength")
+                        .HasColumnType("int");
+
+                    b.Property<int>("LabelType")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("OfficiallyAssigned")
+                        .HasColumnType("bit");
+
+                    b.Property<int?>("ParentAddressPersistentLocalId")
+                        .HasColumnType("int");
+
+                    b.Property<Point>("Position")
+                        .IsRequired()
+                        .HasColumnType("sys.geometry");
+
+                    b.Property<string>("PositionMethod")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("PositionSpecification")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<double>("PositionX")
+                        .HasColumnType("float");
+
+                    b.Property<double>("PositionY")
+                        .HasColumnType("float");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("Removed")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<int>("StreetNamePersistentLocalId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("VersionAsString")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTimeOffset>("VersionTimestampAsDateTimeOffset")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("VersionTimestamp");
+
+                    b.HasKey("AddressPersistentLocalId");
+
+                    SqlServerKeyBuilderExtensions.IsClustered(b.HasKey("AddressPersistentLocalId"));
+
+                    b.HasIndex("ParentAddressPersistentLocalId");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("StreetNamePersistentLocalId");
+
+                    b.HasIndex("Removed", "Status");
+
+                    SqlServerIndexBuilderExtensions.IncludeProperties(b.HasIndex("Removed", "Status"), new[] { "StreetNamePersistentLocalId", "Position" });
+
+                    b.HasIndex("PositionX", "PositionY", "Removed", "Status");
+
+                    SqlServerIndexBuilderExtensions.IncludeProperties(b.HasIndex("PositionX", "PositionY", "Removed", "Status"), new[] { "StreetNamePersistentLocalId" });
+
+                    b.ToTable("AddressWmsV2", "wms.address");
+                });
+
+            modelBuilder.Entity("AddressRegistry.Projections.Wms.AddressWmsItemV3.AddressWmsItemV3", b =>
+                {
+                    b.Property<int>("AddressPersistentLocalId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("BoxNumber")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("HouseNumber")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("HouseNumberLabel")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int?>("HouseNumberLabelLength")
+                        .HasColumnType("int");
+
+                    b.Property<int>("LabelType")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("OfficiallyAssigned")
+                        .HasColumnType("bit");
+
+                    b.Property<int?>("ParentAddressPersistentLocalId")
+                        .HasColumnType("int");
+
+                    b.Property<Point>("Position")
+                        .IsRequired()
+                        .HasColumnType("sys.geometry");
+
+                    b.Property<string>("PositionMethod")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("PositionSpecification")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<double>("PositionX")
+                        .HasColumnType("float");
+
+                    b.Property<double>("PositionY")
+                        .HasColumnType("float");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("Removed")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<int>("StreetNamePersistentLocalId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("VersionAsString")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTimeOffset>("VersionTimestampAsDateTimeOffset")
+                        .HasColumnType("datetimeoffset")
+                        .HasColumnName("VersionTimestamp");
+
+                    b.HasKey("AddressPersistentLocalId");
+
+                    SqlServerKeyBuilderExtensions.IsClustered(b.HasKey("AddressPersistentLocalId"));
+
+                    b.HasIndex("ParentAddressPersistentLocalId");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("StreetNamePersistentLocalId");
+
+                    b.HasIndex("Removed", "Status");
+
+                    SqlServerIndexBuilderExtensions.IncludeProperties(b.HasIndex("Removed", "Status"), new[] { "StreetNamePersistentLocalId", "Position" });
+
+                    b.HasIndex("PositionX", "PositionY", "Removed", "Status");
+
+                    SqlServerIndexBuilderExtensions.IncludeProperties(b.HasIndex("PositionX", "PositionY", "Removed", "Status"), new[] { "StreetNamePersistentLocalId" });
+
+                    b.ToTable("AddressWmsV3", "wms.address");
+                });
+
+            modelBuilder.Entity("Be.Vlaanderen.Basisregisters.ProjectionHandling.Runner.ProjectionStates.ProjectionStateItem", b =>
+                {
+                    b.Property<string>("Name")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("DesiredState")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTimeOffset?>("DesiredStateChangedAt")
+                        .HasColumnType("datetimeoffset");
+
+                    b.Property<string>("ErrorMessage")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<long>("Position")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Name");
+
+                    b.ToTable("ProjectionStates", "wms.address");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/AddressRegistry.Projections.Wms/Migrations/20250120114301_SwitchViewsToV3.cs b/src/AddressRegistry.Projections.Wms/Migrations/20250120114301_SwitchViewsToV3.cs
new file mode 100644
index 000000000..99f220310
--- /dev/null
+++ b/src/AddressRegistry.Projections.Wms/Migrations/20250120114301_SwitchViewsToV3.cs
@@ -0,0 +1,284 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace AddressRegistry.Projections.Wms.Migrations
+{
+    /// <inheritdoc />
+    public partial class SwitchViewsToV3 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql("DROP VIEW [wms].[AdresAfgekeurd]");
+            migrationBuilder.Sql("DROP VIEW [wms].[AdresVoorgesteld]");
+            migrationBuilder.Sql("DROP VIEW [wms].[AdresInGebruik]");
+            migrationBuilder.Sql("DROP VIEW [wms].[AdresGehistoreerd]");
+            migrationBuilder.Sql("DROP VIEW [wms].[AdresView]");
+
+            migrationBuilder.Sql(@"
+CREATE VIEW [wms].[AdresView] WITH SCHEMABINDING AS
+SELECT  a.[AddressPersistentLocalId] as ObjectId
+        ,CONCAT('https://data.vlaanderen.be/id/adres/', a.[AddressPersistentLocalId]) as Id
+        ,a.[VersionAsString] as VersieId
+        ,s.[PersistentLocalId] as StraatnaamObjectId
+        ,s.[NameDutch] as Straatnaam
+        ,a.[HouseNumberLabel] as HuisnummerLabel
+        ,a.[LabelType]
+        ,a.[HouseNumberLabelLength] as LabelLengte
+        ,s.[NisCode] as GemeenteObjectId
+        ,m.[NameDutch] as Gemeentenaam
+        ,a.[PostalCode] as PostinfoObjectId
+        ,[wms].[GetFullAddress](s.[NameDutch], a.[HouseNumber], a.[BoxNumber], a.[PostalCode], m.[NameDutch]) as VolledigAdres
+        ,a.[HouseNumber] as Huisnummer
+        ,a.[BoxNumber] as Busnummer
+        ,a.[Status] as AdresStatus
+        ,a.[Position] as AdresPositie
+        ,a.[PositionMethod] as PositieGeometrieMethode
+        ,a.[PositionSpecification] as PositieSpecificatie
+        ,a.[OfficiallyAssigned] as OfficieelToegekend
+FROM [wms.address].AddressWmsV3 as a
+JOIN [wms.streetname].[StreetNameHelperV2] s ON a.[StreetNamePersistentLocalId] = s.[PersistentLocalId] AND a.[Removed] = 0
+JOIN [wms.municipality].[MunicipalityHelper] m ON s.[NisCode] = m.[NisCode] AND s.[Removed] = 0");
+
+            migrationBuilder.Sql("CREATE UNIQUE CLUSTERED INDEX IX_AdresView_ObjectId ON [wms].[AdresView] ([ObjectId])");
+
+            migrationBuilder.Sql(@"
+CREATE VIEW [wms].[AdresVoorgesteld] WITH SCHEMABINDING AS
+SELECT
+     [ObjectId]
+    ,[Id]
+    ,[VersieId]
+    ,[StraatnaamObjectId]
+    ,[Straatnaam]
+    ,[HuisnummerLabel]
+    ,[LabelType]
+    ,[LabelLengte]
+    ,[GemeenteObjectId]
+    ,[Gemeentenaam]
+    ,[PostinfoObjectId]
+    ,[VolledigAdres]
+    ,[Huisnummer]
+    ,[Busnummer]
+    ,[AdresStatus]
+    ,[AdresPositie]
+    ,[PositieGeometrieMethode]
+    ,[PositieSpecificatie]
+    ,[OfficieelToegekend]
+FROM [wms].[AdresView]
+WHERE [AdresStatus] = 'Voorgesteld';");
+
+            migrationBuilder.Sql(@"
+CREATE VIEW [wms].[AdresInGebruik] WITH SCHEMABINDING AS
+SELECT
+     [ObjectId]
+    ,[Id]
+    ,[VersieId]
+    ,[StraatnaamObjectId]
+    ,[Straatnaam]
+    ,[HuisnummerLabel]
+    ,[LabelType]
+    ,[LabelLengte]
+    ,[GemeenteObjectId]
+    ,[Gemeentenaam]
+    ,[PostinfoObjectId]
+    ,[VolledigAdres]
+    ,[Huisnummer]
+    ,[Busnummer]
+    ,[AdresStatus]
+    ,[AdresPositie]
+    ,[PositieGeometrieMethode]
+    ,[PositieSpecificatie]
+    ,[OfficieelToegekend]
+FROM [wms].[AdresView]
+WHERE [AdresStatus] = 'InGebruik'");
+
+            migrationBuilder.Sql(@"
+CREATE VIEW [wms].[AdresGehistoreerd] WITH SCHEMABINDING AS
+SELECT
+     [ObjectId]
+    ,[Id]
+    ,[VersieId]
+    ,[StraatnaamObjectId]
+    ,[Straatnaam]
+    ,[HuisnummerLabel]
+    ,[LabelType]
+    ,[LabelLengte]
+    ,[GemeenteObjectId]
+    ,[Gemeentenaam]
+    ,[PostinfoObjectId]
+    ,[VolledigAdres]
+    ,[Huisnummer]
+    ,[Busnummer]
+    ,[AdresStatus]
+    ,[AdresPositie]
+    ,[PositieGeometrieMethode]
+    ,[PositieSpecificatie]
+    ,[OfficieelToegekend]
+FROM [wms].[AdresView]
+WHERE [AdresStatus] = 'Gehistoreerd'");
+
+            migrationBuilder.Sql(@"
+CREATE VIEW [wms].[AdresAfgekeurd] WITH SCHEMABINDING AS
+SELECT
+     [ObjectId]
+    ,[Id]
+    ,[VersieId]
+    ,[StraatnaamObjectId]
+    ,[Straatnaam]
+    ,[HuisnummerLabel]
+    ,[LabelType]
+    ,[LabelLengte]
+    ,[GemeenteObjectId]
+    ,[Gemeentenaam]
+    ,[PostinfoObjectId]
+    ,[VolledigAdres]
+    ,[Huisnummer]
+    ,[Busnummer]
+    ,[AdresStatus]
+    ,[AdresPositie]
+    ,[PositieGeometrieMethode]
+    ,[PositieSpecificatie]
+    ,[OfficieelToegekend]
+FROM [wms].[AdresView]
+WHERE [AdresStatus] = 'Afgekeurd'");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql("DROP VIEW [wms].[AdresAfgekeurd]");
+            migrationBuilder.Sql("DROP VIEW [wms].[AdresVoorgesteld]");
+            migrationBuilder.Sql("DROP VIEW [wms].[AdresInGebruik]");
+            migrationBuilder.Sql("DROP VIEW [wms].[AdresGehistoreerd]");
+            migrationBuilder.Sql("DROP VIEW [wms].[AdresView]");
+
+            migrationBuilder.Sql(@"
+CREATE VIEW [wms].[AdresView] WITH SCHEMABINDING AS
+SELECT  a.[AddressPersistentLocalId] as ObjectId
+        ,CONCAT('https://data.vlaanderen.be/id/adres/', a.[AddressPersistentLocalId]) as Id
+        ,a.[VersionAsString] as VersieId
+        ,s.[PersistentLocalId] as StraatnaamObjectId
+        ,s.[NameDutch] as Straatnaam
+        ,a.[HouseNumberLabel] as HuisnummerLabel
+        ,a.[LabelType]
+        ,a.[HouseNumberLabelLength] as LabelLengte
+        ,s.[NisCode] as GemeenteObjectId
+        ,m.[NameDutch] as Gemeentenaam
+        ,a.[PostalCode] as PostinfoObjectId
+        ,[wms].[GetFullAddress](s.[NameDutch], a.[HouseNumber], a.[BoxNumber], a.[PostalCode], m.[NameDutch]) as VolledigAdres
+        ,a.[HouseNumber] as Huisnummer
+        ,a.[BoxNumber] as Busnummer
+        ,a.[Status] as AdresStatus
+        ,a.[Position] as AdresPositie
+        ,a.[PositionMethod] as PositieGeometrieMethode
+        ,a.[PositionSpecification] as PositieSpecificatie
+        ,a.[OfficiallyAssigned] as OfficieelToegekend
+FROM [wms.address].AddressWmsV2 as a
+JOIN [wms.streetname].[StreetNameHelperV2] s ON a.[StreetNamePersistentLocalId] = s.[PersistentLocalId] AND a.[Removed] = 0
+JOIN [wms.municipality].[MunicipalityHelper] m ON s.[NisCode] = m.[NisCode] AND s.[Removed] = 0");
+
+            migrationBuilder.Sql("CREATE UNIQUE CLUSTERED INDEX IX_AdresView_ObjectId ON [wms].[AdresView] ([ObjectId])");
+
+            migrationBuilder.Sql(@"
+CREATE VIEW [wms].[AdresVoorgesteld] WITH SCHEMABINDING AS
+SELECT
+     [ObjectId]
+    ,[Id]
+    ,[VersieId]
+    ,[StraatnaamObjectId]
+    ,[Straatnaam]
+    ,[HuisnummerLabel]
+    ,[LabelType]
+    ,[LabelLengte]
+    ,[GemeenteObjectId]
+    ,[Gemeentenaam]
+    ,[PostinfoObjectId]
+    ,[VolledigAdres]
+    ,[Huisnummer]
+    ,[Busnummer]
+    ,[AdresStatus]
+    ,[AdresPositie]
+    ,[PositieGeometrieMethode]
+    ,[PositieSpecificatie]
+    ,[OfficieelToegekend]
+FROM [wms].[AdresView]
+WHERE [AdresStatus] = 'Voorgesteld';");
+
+            migrationBuilder.Sql(@"
+CREATE VIEW [wms].[AdresInGebruik] WITH SCHEMABINDING AS
+SELECT
+     [ObjectId]
+    ,[Id]
+    ,[VersieId]
+    ,[StraatnaamObjectId]
+    ,[Straatnaam]
+    ,[HuisnummerLabel]
+    ,[LabelType]
+    ,[LabelLengte]
+    ,[GemeenteObjectId]
+    ,[Gemeentenaam]
+    ,[PostinfoObjectId]
+    ,[VolledigAdres]
+    ,[Huisnummer]
+    ,[Busnummer]
+    ,[AdresStatus]
+    ,[AdresPositie]
+    ,[PositieGeometrieMethode]
+    ,[PositieSpecificatie]
+    ,[OfficieelToegekend]
+FROM [wms].[AdresView]
+WHERE [AdresStatus] = 'InGebruik'");
+
+            migrationBuilder.Sql(@"
+CREATE VIEW [wms].[AdresGehistoreerd] WITH SCHEMABINDING AS
+SELECT
+     [ObjectId]
+    ,[Id]
+    ,[VersieId]
+    ,[StraatnaamObjectId]
+    ,[Straatnaam]
+    ,[HuisnummerLabel]
+    ,[LabelType]
+    ,[LabelLengte]
+    ,[GemeenteObjectId]
+    ,[Gemeentenaam]
+    ,[PostinfoObjectId]
+    ,[VolledigAdres]
+    ,[Huisnummer]
+    ,[Busnummer]
+    ,[AdresStatus]
+    ,[AdresPositie]
+    ,[PositieGeometrieMethode]
+    ,[PositieSpecificatie]
+    ,[OfficieelToegekend]
+FROM [wms].[AdresView]
+WHERE [AdresStatus] = 'Gehistoreerd'");
+
+            migrationBuilder.Sql(@"
+CREATE VIEW [wms].[AdresAfgekeurd] WITH SCHEMABINDING AS
+SELECT
+     [ObjectId]
+    ,[Id]
+    ,[VersieId]
+    ,[StraatnaamObjectId]
+    ,[Straatnaam]
+    ,[HuisnummerLabel]
+    ,[LabelType]
+    ,[LabelLengte]
+    ,[GemeenteObjectId]
+    ,[Gemeentenaam]
+    ,[PostinfoObjectId]
+    ,[VolledigAdres]
+    ,[Huisnummer]
+    ,[Busnummer]
+    ,[AdresStatus]
+    ,[AdresPositie]
+    ,[PositieGeometrieMethode]
+    ,[PositieSpecificatie]
+    ,[OfficieelToegekend]
+FROM [wms].[AdresView]
+WHERE [AdresStatus] = 'Afgekeurd'");
+        }
+    }
+}