diff --git a/test/features/check-recipes.feature b/test/features/check-recipes.feature
index a0a9908a..49640a21 100644
--- a/test/features/check-recipes.feature
+++ b/test/features/check-recipes.feature
@@ -1,5 +1,5 @@
 Feature: Check for new recipe versions
-	@registry
+	@docker
 	Scenario: Find newer version for a recipe
 		Given a recipe "foo"
 		And recipe "foo" generates file "README.md" with content "initial"
@@ -16,7 +16,7 @@ Feature: Check for new recipe versions
 		Then CLI produced an output "new versions found: v0\.0\.2"
 		Then CLI produced an output "To upgrade recipes to the latest version run:\n  (.*) upgrade oci://localhost:\d+/foo:v0.0.2\n"
 
-	@registry
+	@docker
 	Scenario: Find multiple newer version for a recipe
 		Given a recipe "foo"
 		And recipe "foo" generates file "README.md" with content "initial"
@@ -34,7 +34,7 @@ Feature: Check for new recipe versions
 		Then CLI produced an output "new versions found: v0\.0\.2, v0\.0\.3"
 		Then CLI produced an output "To upgrade recipes to the latest version run:\n  (.*) upgrade oci://localhost:\d+/foo:v0\.0\.3\n"
 
-	@registry
+	@docker
 	Scenario: Find newer version for multiple recipes
 		Given a recipe "foo"
 		And recipe "foo" generates file "foo.md" with content "initial"
@@ -61,7 +61,7 @@ Feature: Check for new recipe versions
 		Then CLI produced an output "foo: new versions found: v0\.0\.2"
 		And CLI produced an output "bar: new versions found: v0\.0\.2"
 
-	@registry
+	@docker
 	Scenario: Unable to find newer recipe versions
 		Given a recipe "foo"
 		And recipe "foo" generates file "README.md" with content "initial"
@@ -76,7 +76,7 @@ Feature: Check for new recipe versions
 		And I check new versions for recipe "foo"
 		Then CLI produced an output "no new versions found"
 	
-	@registry
+	@docker
 	Scenario: Unable to find newer recipe versions for all recipes
 		Given a recipe "foo"
 		And recipe "foo" generates file "foo.md" with content "initial"
@@ -99,7 +99,7 @@ Feature: Check for new recipe versions
 		Then CLI produced an output "foo: new versions found: v0\.0\.2"
 		And CLI produced an output "bar: no new versions found"
 
-	@registry
+	@docker
 	Scenario: Executing remote recipe automatically adds the repo as source for the sauce
 		Given a recipe "foo"
 		And recipe "foo" generates file "README.md" with content "initial"
@@ -113,7 +113,7 @@ Feature: Check for new recipe versions
 		And I check new versions for recipe "foo"
 		Then CLI produced an output "new versions found: v0\.0\.2"
 
-	@registry
+	@docker
 	Scenario: Manually override the check from URL for locally executed recipe
 		Given a recipe "foo"
 		And recipe "foo" generates file "README.md" with content "initial"
@@ -127,7 +127,7 @@ Feature: Check for new recipe versions
 		Then CLI produced an output "new versions found: v0\.0\.2"
 		And the sauce in index 0 which should have property "CheckFrom" with value "^oci://localhost:\d+/foo$"
 
-	@registry
+	@docker
 	Scenario: Find and upgrade newer version for recipes
 		Given a recipe "foo"
 		And recipe "foo" generates file "README.md" with content "initial"
@@ -143,7 +143,7 @@ Feature: Check for new recipe versions
 		Then CLI produced an output "new versions found: v0\.0\.2"
 		Then CLI produced an output "Upgrade completed"
 
-	@registry
+	@docker
 	Scenario: Find and upgrade newer version for a specific recipe
 		Given a recipe "foo"
 		And recipe "foo" generates file "README.md" with content "initial"
@@ -165,7 +165,7 @@ Feature: Check for new recipe versions
 		Then CLI produced an output "new versions found: v0\.0\.2"
 		Then CLI produced an output "Upgrade completed"
 
-	@registry
+	@docker
 	Scenario: Find and upgrade newer versions for multiple recipes
 		Given a recipe "foo"
 		And recipe "foo" generates file "foo.md" with content "initial"
diff --git a/test/features/execute-manifest.feature b/test/features/execute-manifest.feature
index 22e94bc8..4c896a5e 100644
--- a/test/features/execute-manifest.feature
+++ b/test/features/execute-manifest.feature
@@ -17,7 +17,7 @@ Feature: Execute manifests
 		And the project directory should contain file "foo.md"
 		And the project directory should contain file "bar.md"
 
-	@registry
+	@docker
 	Scenario: Execute a manifest with remote recipes
 		Given a local OCI registry
 		And a recipe "foo"
diff --git a/test/features/execute-recipes.feature b/test/features/execute-recipes.feature
index d6afa443..a2aaaea0 100644
--- a/test/features/execute-recipes.feature
+++ b/test/features/execute-recipes.feature
@@ -10,7 +10,7 @@ Feature: Execute recipes
 		And the sauce in index 0 which should have property "Recipe.Name" with value "^foo$"
 		And the sauce in index 0 which has a valid ID
 
-	@registry
+	@docker
 	Scenario: Execute single recipe from remote registry
 		Given a recipe "foo"
 		And recipe "foo" generates file "README.md" with content "initial"
diff --git a/test/features/recipes-as-oci-artifacts.feature b/test/features/recipes-as-oci-artifacts.feature
index f00c17a2..eb62001c 100644
--- a/test/features/recipes-as-oci-artifacts.feature
+++ b/test/features/recipes-as-oci-artifacts.feature
@@ -2,14 +2,14 @@ Feature: Recipes as OCI artifacts
 	By pushing and pulling recipes as artifacts to OCI compatible repositories, we can improve
 	recipe availability and discoverability
 
-	@registry
+	@docker
 	Scenario: Push a recipe to OCI repository
 		Given a recipe "foo"
 		And recipe "foo" generates file "README.md" with content "initial"
 		And a local OCI registry
 		When I push the recipe "foo" to the local OCI repository
 		Then no errors were printed
-	@registry
+	@docker
 	Scenario: Pull a recipe from OCI repository
 		Given a recipe "foo"
 		And recipe "foo" generates file "README.md" with content "initial"
@@ -19,7 +19,7 @@ Feature: Recipes as OCI artifacts
 		Then no errors were printed
 		And the project directory should contain file "foo/recipe.yml"
 
-	@registry
+	@docker
 	Scenario: Push a recipe to OCI repository using the 'latest' tag
 		Given a recipe "foo"
 		And recipe "foo" generates file "README.md" with content "initial"
@@ -30,7 +30,7 @@ Feature: Recipes as OCI artifacts
 		Then no errors were printed
 		And the project directory should contain file "foo/recipe.yml" with "version: v0.0.1"
 
-	@registry
+	@docker
 	Scenario: Pushing a recipe to OCI repository using the 'latest' tag pushes the version tag also
 		Given a recipe "foo"
 		And recipe "foo" generates file "README.md" with content "initial"
@@ -41,7 +41,7 @@ Feature: Recipes as OCI artifacts
 		Then no errors were printed
 		And the project directory should contain file "foo/recipe.yml" with "version: v0.0.1"
 
-	@registry
+	@docker
 	Scenario: Pushing a recipe to OCI repository using the 'latest' tag replaces the previous tag
 		Given a recipe "foo"
 		And recipe "foo" generates file "README.md" with content "initial"
@@ -55,7 +55,7 @@ Feature: Recipes as OCI artifacts
 		Then no errors were printed
 		And the project directory should contain file "foo/recipe.yml" with "version: v0.0.2"
 	
-	@registry
+	@docker
 	Scenario: Push a recipe to OCI repository with authentication
 		Given a recipe "foo"
 		And recipe "foo" generates file "README.md" with content "initial"
@@ -63,7 +63,7 @@ Feature: Recipes as OCI artifacts
 		When I push the recipe "foo" to the local OCI repository
 		Then no errors were printed
 
-	@registry
+	@docker
 	Scenario: Pull a recipe from OCI repository with authentication
 		Given a recipe "foo"
 		And recipe "foo" generates file "README.md" with content "initial"
@@ -73,7 +73,7 @@ Feature: Recipes as OCI artifacts
 		Then no errors were printed
 		And the project directory should contain file "foo/recipe.yml"
 
-	@registry
+	@docker
 	Scenario: Try to push a recipe to OCI repository without authentication
 		Given a recipe "foo"
 		And recipe "foo" generates file "README.md" with content "initial"
@@ -82,13 +82,13 @@ Feature: Recipes as OCI artifacts
 		When I push the recipe "foo" to the local OCI repository
 		Then CLI produced an error "basic credential not found"
 
-	@registry
+	@docker
 	Scenario: Try to pull a recipe from OCI repository which not exist
 		Given a local OCI registry with authentication
 		When I pull recipe from the local OCI repository "foo:v0.0.1"
 		Then CLI produced an error "recipe not found"
 
-	@registry
+	@docker
 	Scenario: Push a recipe from OCI repository using credentials from config file
 		Given a recipe "foo"
 		And recipe "foo" generates file "README.md" with content "initial"
diff --git a/test/features/upgrade-recipe.feature b/test/features/upgrade-recipe.feature
index 5d59908b..829a77eb 100644
--- a/test/features/upgrade-recipe.feature
+++ b/test/features/upgrade-recipe.feature
@@ -95,7 +95,7 @@ Feature: Upgrade sauce
 		And the project directory should contain file "./foo/README.md" with "New version"
 		And the project directory should contain file "./bar/README.md" with "initial"
 
-	@registry
+	@docker
 	Scenario: Upgrade sauce from remote recipe
 		Given a local OCI registry
 		And a recipe "foo"
diff --git a/test/main_test.go b/test/main_test.go
index baf4ff9a..7390bf5d 100644
--- a/test/main_test.go
+++ b/test/main_test.go
@@ -77,7 +77,7 @@ func TestFeatures(t *testing.T) {
 
 	// Skip tests needing OCI registry on Windows because there is no windows/amd64 image available
 	if runtime.GOOS == "windows" {
-		opts.Tags = "~@registry"
+		opts.Tags = "~@docker"
 	}
 
 	suite := godog.TestSuite{