diff --git a/GitVersion.yml b/GitVersion.yml
index f9f5ce0..5f498af 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -4,9 +4,7 @@ assembly-file-versioning-format: '{Major}.{Minor}.{Patch}.{env:BUILD_BUILDID ??
 assembly-informational-format: '{SemVer}+{ShortSha}'
 continuous-delivery-fallback-tag: preview
 branches:
-  main:
-    regex: ^main$
-  develop:
-    regex: ^dev$
+  feature:
+    tag: alpha.{BranchName}
   pull-request:
     tag: pr
diff --git a/README.md b/README.md
index 0cf4e2e..d4fbbdc 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,9 @@
 
 SpecFlow plugin that enables to use Microsoft.Extensions.DependencyInjection for resolving test dependencies.
 
-Currently supports:
-* [SpecFlow v3.9.8](https://www.nuget.org/packages/SpecFlow/3.9.8) or above
-* [Microsoft.Extensions.DependencyInjection v3.1.0](https://www.nuget.org/packages/Microsoft.Extensions.DependencyInjection/3.1.0) or above
+Currently supports *(in preview)*:
+* [SpecFlow v4](https://www.nuget.org/packages/SpecFlow/4) or above
+* [Microsoft.Extensions.DependencyInjection v6.0.0](https://www.nuget.org/packages/Microsoft.Extensions.DependencyInjection/6.0.0) or above
 
 Based on [SpecFlow.Autofac](https://github.com/gasparnagy/SpecFlow.Autofac).
 Listed on [Available Plugins for SpecFlow](https://specflow.org/documentation/Available-Plugins/).
diff --git a/SpecFlow.DependencyInjection.Tests/SpecFlow.DependencyInjection.Tests.csproj b/SpecFlow.DependencyInjection.Tests/SpecFlow.DependencyInjection.Tests.csproj
index 30e3080..4c2d39a 100644
--- a/SpecFlow.DependencyInjection.Tests/SpecFlow.DependencyInjection.Tests.csproj
+++ b/SpecFlow.DependencyInjection.Tests/SpecFlow.DependencyInjection.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Product>SpecFlow.DependencyInjection</Product>
     <RootNamespace>SolidToken.SpecFlow.DependencyInjection.Tests</RootNamespace>
@@ -9,27 +9,27 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" Version="5.7.0">
+    <PackageReference Include="SpecFlow" Version="4.*-*" />
+    <PackageReference Include="SpecFlow.xUnit" Version="4.*-*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="16.8.0" Condition="$(TargetFramework.StartsWith('net4')) AND '$(OS)' == 'Unix'" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="16.8.0" Condition="$(TargetFramework.StartsWith('net4')) AND '$(OS)' == 'Unix'" />
-    <PackageReference Include="SpecFlow" Version="3.9.8" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="SpecFlow.xUnit" Version="3.9.8" />
-    <PackageReference Include="coverlet.collector" Version="3.1.0">
+    <PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/SpecFlow.DependencyInjection/SpecFlow.DependencyInjection.csproj b/SpecFlow.DependencyInjection/SpecFlow.DependencyInjection.csproj
index fb4a30a..167d7d7 100644
--- a/SpecFlow.DependencyInjection/SpecFlow.DependencyInjection.csproj
+++ b/SpecFlow.DependencyInjection/SpecFlow.DependencyInjection.csproj
@@ -31,15 +31,15 @@
     <None Include="build/*" Pack="true" Visible="true" PackagePath="build/" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" Version="5.7.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
+    <PackageReference Include="SpecFlow" Version="4.*-*" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="SpecFlow" Version="3.9.8" />
+    <PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
 </Project>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a628bc0..9d0ff9e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -32,14 +32,6 @@ stages:
   jobs:
   - job: Build
     steps:
-    - task: UseDotNet@2
-      displayName: '.NET SDK 3.1 (until December 3, 2022)'
-      inputs:
-        version: 3.1.x      
-    - task: UseDotNet@2
-      displayName: '.NET SDK 5.0 (until May 8, 2022)'
-      inputs:
-        version: 5.0.x
     - task: UseDotNet@2
       displayName: '.NET SDK 6.0 (until November 8, 2024)'
       inputs:
@@ -47,7 +39,7 @@ stages:
     - task: gitversion/setup@0
       displayName: 'Prepare'
       inputs:
-        versionSpec: '5.x'
+        versionSpec: '5.11.1'
     - task: gitversion/execute@0
       name: 'Version'
     - task: DotNetCoreCLI@2