diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/OrchardCore.Contents.csproj b/src/OrchardCore.Modules/OrchardCore.Contents/OrchardCore.Contents.csproj
index 09d1bbb2447..eca4cea5b46 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/OrchardCore.Contents.csproj
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/OrchardCore.Contents.csproj
@@ -41,6 +41,7 @@
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Sitemaps.Abstractions\OrchardCore.Sitemaps.Abstractions.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Users.Abstractions\OrchardCore.Users.Abstractions.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Workflows.Abstractions\OrchardCore.Workflows.Abstractions.csproj" />
+    <ProjectReference Include="..\OrchardCore.Queries\OrchardCore.Queries.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentForEachTask.Fields.Design.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentForEachTask.Fields.Design.cshtml
new file mode 100644
index 00000000000..ef9e2da5275
--- /dev/null
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentForEachTask.Fields.Design.cshtml
@@ -0,0 +1,6 @@
+@model OrchardCore.Workflows.ViewModels.ActivityViewModel<ContentForEachTask>
+
+<header>
+    <h4><i class="fa fa-repeat"></i>@Model.Activity.GetTitleOrDefault(() => T["Content For Each"])</h4>
+</header>
+<em>@(Model.Activity.UseQuery ? $"Query: {Model.Activity.Query}" : $"ContentType: {Model.Activity.ContentType}")</em>
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentForEachTask.Fields.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentForEachTask.Fields.Edit.cshtml
new file mode 100644
index 00000000000..b5a8ea5ba76
--- /dev/null
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentForEachTask.Fields.Edit.cshtml
@@ -0,0 +1,107 @@
+@model ContentForEachTaskViewModel
+@if (Model.QueriesEnabled)
+{
+    <div class="mb-3" asp-validation-class-for="UseQuery">
+        <div class="form-check">
+            <input type="checkbox" class="form-check-input" asp-for="UseQuery" />
+            <label class="form-check-label" asp-for="UseQuery">@T["Use query?"]</label>
+            <span class="hint dashed">@T["Check to use (I.e. lucene, elastic or SQL) query instead of selecting all of one content type."]</span>
+        </div>
+    </div>
+    <div class="collapse" id="queryInputs">
+        <div class="card card-body mb-3">
+            <div class="mb-3" asp-validation-class-for="QuerySource">
+                <label asp-for="QuerySource">@T["Query Source"]</label>
+                <select asp-for="QuerySource" class="form-control">
+                    <option value="">@T["Select a query source"]</option>
+                    @foreach (var source in Model.QuerySources)
+                    {
+                        <option value="@source.Value">@source.Text</option>
+                    }
+                </select>
+                <span asp-validation-for="QuerySource"></span>
+            </div>
+            <div class="mb-3" asp-validation-class-for="Query">
+                <label asp-for="Query">@T["Query"]</label>
+                <select asp-for="Query" class="form-control">
+                    <option value="">@T["Select a query"]</option>
+                </select>
+                <span asp-validation-for="Query"></span>
+            </div>
+            <div class="mb-3" asp-validation-class-for="Parameters">
+                <label asp-for="Parameters">@T["Parameters"]</label>
+                <textarea asp-for="Parameters" class="form-control" rows="5"></textarea>
+                <span asp-validation-for="Parameters"></span>
+                <span class="hint">@T[@"Enter the query parameters as a JSON object. I.e. {{ 'example' : 'parameter' }} - allows liquid expressions."]</span>
+            </div>
+        </div>
+    </div>
+}
+
+<div id="contentInputs">
+    <div class="card card-body mb-3">
+        <div class="mb-3" asp-validation-class-for="ContentType">
+            <label asp-for="ContentType">@T["Content Type"]</label>
+            <select asp-for="ContentType" asp-items="@Model.AvailableContentTypes" class="form-select" asp-validation-class-for="ContentType"></select>
+            <span asp-validation-for="ContentType"></span>
+            <span class="hint">@T["Select the type of content to loop."]</span>
+        </div>
+        <div class="mb-3" asp-validation-class-for="PublishedOnly">
+            <div class="form-check">
+                <input type="checkbox" class="form-check-input" asp-for="PublishedOnly" />
+                <label class="form-check-label" asp-for="PublishedOnly">@T["Published Only?"]</label>
+                <span class="hint dashed">@T["Check if you only want to return published items. Leave unchecked to return latest (Includes published and draft)."]</span>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="mb-3" asp-validation-class-for="PageSize">
+    <label asp-for="PageSize">@T["Take"]</label>
+    <input type="text" asp-for="PageSize" class="form-control code" />
+    <span asp-validation-for="PageSize"></span>
+    <span class="hint">@T["How many to take per call. Automatically overrides size and from parameters in query if they exist, 0 to disable"]</span>
+</div>
+
+<script at="Foot">
+    $(function () {
+        var initialQuery = '@Model.Query';
+        var useQuery = $('#@Html.IdFor(x => x.UseQuery)');
+
+        if (useQuery.is(':checked')) {
+            $('#queryInputs').slideDown('fast');
+            $('#contentInputs').slideUp('fast');
+        } else {
+            $('#queryInputs').slideUp('fast');
+            $('#contentInputs').slideDown('fast');
+        }
+
+        useQuery.on('click', function () {
+            $('#contentInputs').slideToggle('fast');
+            $('#queryInputs').slideToggle('fast');
+        });
+
+        var queriesBySource = @Html.Raw(Json.Serialize(Model.QueriesBySource));
+        var querySourceSelect = $('#@Html.IdFor(m => m.QuerySource)');
+        var querySelect = $('#@Html.IdFor(m => m.Query)');
+
+        function updateQueries() {
+            var source = querySourceSelect.val();
+            querySelect.empty().append($('<option></option>').val('').text('@T["Select a query"]'));
+
+            if (source && queriesBySource[source]) {
+                $.each(queriesBySource[source], function (i, query) {
+                    querySelect.append($('<option></option>').val(query.value).text(query.text));
+                });
+                console.log('Queries loaded for source:', source);
+            } else {
+                console.log('No queries found for source:', source);
+            }
+        }
+        querySourceSelect.on('change', updateQueries);
+
+        updateQueries();
+        querySelect.val(initialQuery)
+
+    });
+</script>
\ No newline at end of file
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentForEachTask.Fields.Thumbnail.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentForEachTask.Fields.Thumbnail.cshtml
new file mode 100644
index 00000000000..26209de98e5
--- /dev/null
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentForEachTask.Fields.Thumbnail.cshtml
@@ -0,0 +1,2 @@
+<h4 class="card-title"><i class="fa fa-repeat"></i>@T["Content For Each"]</h4>
+<p>@T["Content for each task"]</p>
\ No newline at end of file
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentForEachTask.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentForEachTask.cs
new file mode 100644
index 00000000000..af7b403c257
--- /dev/null
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentForEachTask.cs
@@ -0,0 +1,228 @@
+using Microsoft.Extensions.Localization;
+using OrchardCore.ContentManagement;
+using OrchardCore.ContentManagement.Records;
+using OrchardCore.ContentManagement.Workflows;
+using OrchardCore.Environment.Shell.Descriptor.Models;
+using OrchardCore.Queries;
+using OrchardCore.Workflows.Abstractions.Models;
+using OrchardCore.Workflows.Activities;
+using OrchardCore.Workflows.Models;
+using OrchardCore.Workflows.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using YesSql;
+
+namespace OrchardCore.Contents.Workflows.Activities
+{
+    public class ContentForEachTask : TaskActivity
+    {
+        readonly IStringLocalizer S;
+        private readonly ISession _session;
+        private readonly IWorkflowScriptEvaluator _scriptEvaluator;
+        private readonly ShellDescriptor _shellDescriptor;
+        private readonly IServiceProvider _serviceProvider;
+        private int _currentPage;
+
+        public ContentForEachTask(IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<ContentForEachTask> localizer, ISession session, ShellDescriptor shellDescriptor, IServiceProvider serviceProvider)
+        {
+            _scriptEvaluator = scriptEvaluator;
+            _session = session;
+            S = localizer;
+            _shellDescriptor = shellDescriptor;
+            _serviceProvider = serviceProvider;
+        }
+
+        public override string Name => nameof(ContentForEachTask);
+
+        public override LocalizedString DisplayText => S["Content For Each Task"];
+
+        public override LocalizedString Category => S["Content"];
+
+        public override IEnumerable<Outcome> GetPossibleOutcomes(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        {
+            return Outcomes(S["Iterate"], S["Done"]);
+        }
+        public override bool CanExecute(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        {
+            return true;
+        }
+        public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecutionContext workflowContext, ActivityContext activityContext)
+        {
+
+            if (UseQuery && !_shellDescriptor.Features.Any(feature => feature.Id == "OrchardCore.Queries"))
+            {
+                throw new InvalidOperationException($"The '{nameof(ContentForEachTask)}' can't process the query as the feature OrchardCore.Queries is not enabled");
+            }
+
+            if (Index >= ContentItems.Count && !await FetchNextBatchAsync(workflowContext))
+            {
+                return Outcomes("Done");
+            }
+
+            ProcessContentItem(workflowContext);
+            return Outcomes("Iterate");
+        }
+
+        private async Task<bool> FetchNextBatchAsync(WorkflowExecutionContext workflowContext)
+        {
+            //Have already looped once and there is no PageSize parameter so all results would have come with first query.
+            if (_currentPage > 0 && PageSize == 0)
+            {
+                return false;
+            }
+            if (UseQuery)
+            {
+                ContentItems = await ExecContentQueryAsync(workflowContext);
+            }
+            else
+            {
+                await ExecuteContentTypeQueryAsync();
+            }
+            _currentPage++;
+            Index = 0;
+            return ContentItems.Count > 0;
+        }
+
+        private async Task<List<ContentItem>> ExecContentQueryAsync(WorkflowExecutionContext workflowContext)
+        {
+            var _queryManager = (IQueryManager)_serviceProvider.GetService(typeof(IQueryManager));
+            var contentItems = new List<ContentItem>();
+            Query query = await _queryManager.GetQueryAsync(Query);
+            if (query == null)
+            {
+                throw new InvalidOperationException(S[$"Failed to retrieve the query {Query} (Have you changed, deleted the query or disabled the feature?)"]);
+            }
+
+            string queryParameters = await _scriptEvaluator.EvaluateAsync(Parameters, workflowContext, null);
+
+            var parameters = !string.IsNullOrEmpty(queryParameters) ?
+                JsonSerializer.Deserialize<Dictionary<string, object>>(queryParameters)
+                : new Dictionary<string, object>();
+
+            if (PageSize > 0)
+            {
+                parameters["from"] = _currentPage * PageSize;
+                parameters["size"] = PageSize;
+            }
+            try
+            {
+                IQueryResults results = await _queryManager.ExecuteQueryAsync(query, parameters);
+                foreach (ContentItem item in results.Items)
+                {
+                    contentItems.Add(item);
+                }
+            }
+            catch (Exception e)
+            {
+                throw new InvalidOperationException(S[$"Failed to run the query {Query}, failed with message: {e.Message}."]);
+            }
+            return contentItems;
+        }
+
+        private async Task ExecuteContentTypeQueryAsync()
+        {
+            ContentItems = await _session
+                .Query<ContentItem, ContentItemIndex>(index => index.ContentType == ContentType)
+                .Where(w => (w.Published || w.Published == PublishedOnly) && (w.Latest || w.Latest == !PublishedOnly))
+                .Skip(_currentPage * PageSize)
+                .Take(PageSize)
+                .ListAsync() as List<ContentItem>;
+        }
+        private void ProcessContentItem(WorkflowExecutionContext workflowContext)
+        {
+            var contentItem = ContentItems[Index];
+            Current = contentItem;
+            workflowContext.CorrelationId = contentItem.ContentItemId;
+            workflowContext.Properties[ContentEventConstants.ContentItemInputKey] = contentItem;
+            workflowContext.LastResult = Current;
+            Index++;
+        }
+
+        /// <summary>
+        /// How many to take each db call.
+        /// </summary>
+        public int PageSize
+        {
+            get => GetProperty(() => 10);
+            set => SetProperty(value);
+        }
+        /// <summary>
+        /// The current number of iterations executed.
+        /// </summary>
+        public int Index
+        {
+            get => GetProperty(() => 0);
+            set => SetProperty(value);
+        }
+
+        /// <summary>
+        /// The current iteration value.
+        /// </summary>
+        public object Current
+        {
+            get => GetProperty<object>();
+            set => SetProperty(value);
+        }
+
+        /// <summary>
+        /// The collection of contentItems.
+        /// </summary>
+        public List<ContentItem> ContentItems
+        {
+            get => GetProperty(() => new List<ContentItem>());
+            set => SetProperty(value);
+        }
+        /// <summary>
+        /// The name of the content type to select.
+        /// </summary>
+        public string ContentType
+        {
+            get => GetProperty(() => string.Empty);
+            set => SetProperty(value);
+        }
+        /// <summary>
+        /// Toggles between using a query (I.e. Lucene or raw YesSql query).
+        /// </summary>
+        public bool UseQuery
+        {
+            get => GetProperty<bool>(() => false);
+            set => SetProperty(value);
+        }
+        /// <summary>
+        /// The selected query source, if any.
+        /// </summary>
+        public string QuerySource
+        {
+            get => GetProperty(() => string.Empty);
+            set => SetProperty(value);
+        }
+        /// <summary>
+        /// The name of the query to run.
+        /// </summary>
+        public string Query
+        {
+            get => GetProperty(() => string.Empty);
+            set => SetProperty(value);
+        }
+        /// <summary>
+        /// Parameters to pass into the query.
+        /// </summary>
+        public WorkflowExpression<string> Parameters
+        {
+            get => GetProperty(() => new WorkflowExpression<string>());
+            set => SetProperty(value);
+        }
+        /// <summary>
+        /// Only return published items.
+        /// </summary>
+        public bool PublishedOnly
+        {
+            get => GetProperty<bool>(() => false);
+            set => SetProperty(value);
+        }
+    }
+
+}
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentForEachTaskDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentForEachTaskDisplayDriver.cs
new file mode 100644
index 00000000000..93f4c9e0855
--- /dev/null
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Drivers/ContentForEachTaskDisplayDriver.cs
@@ -0,0 +1,74 @@
+using Microsoft.AspNetCore.Mvc.Rendering;
+using OrchardCore.ContentManagement.Metadata;
+using OrchardCore.Contents.Workflows.Activities;
+using OrchardCore.Contents.Workflows.ViewModels;
+using OrchardCore.Environment.Shell.Descriptor.Models;
+using OrchardCore.Queries;
+using OrchardCore.Workflows.Display;
+using OrchardCore.Workflows.Models;
+using System;
+using System.Linq;
+using YesSql;
+
+
+namespace OrchardCore.Contents.Workflows.Drivers
+{
+    public class ContentForEachTaskDisplayDriver : ActivityDisplayDriver<ContentForEachTask, ContentForEachTaskViewModel>
+    {
+        private readonly IContentDefinitionManager _contentDefinitionManager;
+        private readonly ShellDescriptor _shellDescriptor;
+        private readonly IServiceProvider _serviceProvider;
+        public ContentForEachTaskDisplayDriver(IContentDefinitionManager contentDefinitionManager, ISession session, ShellDescriptor shellDescriptor, IServiceProvider serviceProvider)
+        {
+            _contentDefinitionManager = contentDefinitionManager;
+            _shellDescriptor = shellDescriptor;
+            _serviceProvider = serviceProvider;
+        }
+        protected override async void EditActivity(ContentForEachTask activity, ContentForEachTaskViewModel model)
+        {
+            model.QueriesEnabled = _shellDescriptor.Features.Any(feature => feature.Id == "OrchardCore.Queries");
+            if (model.QueriesEnabled)
+            {
+                var _queryManager = (IQueryManager)_serviceProvider.GetService(typeof(IQueryManager));
+                model.UseQuery = activity.UseQuery;
+                model.QuerySource = activity.QuerySource;
+                model.Query = activity.Query;
+                model.Parameters = activity.Parameters?.Expression ?? "";
+                var queries = await _queryManager.ListQueriesAsync();
+
+                model.QuerySources = queries.Select(x => x.Source).Distinct()
+                    .Select(x => new SelectListItem { Text = x, Value = x })
+                    .ToList();
+
+                model.QueriesBySource = queries.GroupBy(x => x.Source)
+                .ToDictionary(
+                    g => g.Key,
+                    g => g.Select(q => new SelectListItem { Text = q.Name, Value = q.Name }).ToList());
+
+            }
+            else
+            {
+                model.UseQuery = false;
+            }
+
+            model.AvailableContentTypes = (await _contentDefinitionManager.ListTypeDefinitionsAsync())
+                .Select(x => new SelectListItem { Text = x.DisplayName, Value = x.Name })
+                .ToList();
+            model.ContentType = activity.ContentType;
+            model.PageSize = activity.PageSize;
+            model.PublishedOnly = activity.PublishedOnly;
+        }
+
+        protected override void UpdateActivity(ContentForEachTaskViewModel model, ContentForEachTask activity)
+        {
+            activity.UseQuery = model.UseQuery;
+            activity.ContentType = model.ContentType;
+            activity.Query = model.Query ?? string.Empty;
+            activity.QuerySource = model.QuerySource;
+            activity.Parameters = new WorkflowExpression<string>(model.Parameters);
+            activity.PageSize = model.PageSize;
+            activity.PublishedOnly = model.PublishedOnly;
+        }
+    }
+
+}
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Startup.cs
index 4bd3a50d67f..00a114c7661 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Startup.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Startup.cs
@@ -27,7 +27,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddActivity<CreateContentTask, CreateContentTaskDisplayDriver>();
         services.AddActivity<RetrieveContentTask, RetrieveContentTaskDisplayDriver>();
         services.AddActivity<UpdateContentTask, UpdateContentTaskDisplayDriver>();
-
+        services.AddActivity<ContentForEachTask, ContentForEachTaskDisplayDriver>();
         services.AddScoped<IContentHandler, ContentsHandler>();
         services.AddScoped<IWorkflowValueSerializer, ContentItemSerializer>();
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentForEachTaskViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentForEachTaskViewModel.cs
new file mode 100644
index 00000000000..cb1c96bbd64
--- /dev/null
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/ViewModels/ContentForEachTaskViewModel.cs
@@ -0,0 +1,29 @@
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using System.Collections.Generic;
+
+namespace OrchardCore.Contents.Workflows.ViewModels
+{
+
+    public class ContentForEachTaskViewModel
+    {
+        public bool QueriesEnabled { get; set; }
+        public bool UseQuery { get; set; }
+        public string ContentType { get; set; }
+        public string QuerySource { get; set; }
+        public string Query { get; set; }
+        public string Parameters { get; set; }
+        public bool PublishedOnly { get; set; }
+        public int PageSize { get; set; }
+
+        [BindNever]
+        public IList<SelectListItem> AvailableContentTypes { get; set; }
+
+        [BindNever]
+        public List<SelectListItem> QuerySources { get; set; }
+
+        [BindNever]
+        public Dictionary<string, List<SelectListItem>> QueriesBySource { get; set; }
+    }
+
+}
diff --git a/src/docs/reference/modules/Workflows/README.md b/src/docs/reference/modules/Workflows/README.md
index 415ab84566c..59f4f986763 100644
--- a/src/docs/reference/modules/Workflows/README.md
+++ b/src/docs/reference/modules/Workflows/README.md
@@ -85,6 +85,11 @@ Although many activities support multiple outcomes, they typically return only o
 For example, the *Send Email* activity has two possible outcomes: "Done" and "Failed".  
 When the email was sent successfully, it yields "Done" as the outcome, and "Failed" otherwise.
 
+For activities that have an iterator outcome e.g _Content For Each_, return the outcome of the next activity back to the iterate task for the iteration to continue either through the done outcome or via a fork.
+If forking make sure that the loop output is after the action output. 
+
+![Sample content for each ](docs/sample-content-for-each.png)
+
 ### Transition
 
 A transition is the connection between the outcome of one activity to another activity. Transitions are created using drag & drop operations in the workflow editor.
@@ -245,6 +250,7 @@ The following activities are available with any default Orchard installation:
 | Create Content | Task | Create a content item. |
 | Delete Content | Task | Delete a content item. |
 | Publish Content | Task | Publish a content item. |
+| For Content Type | Task | Loop through a content type. |
 **User** | * | * | * |
 | ValidateUser | Task | Used to check if the user is logged in and has the specified role(s). |
 
diff --git a/src/docs/reference/modules/Workflows/docs/sample-content-for-each.png b/src/docs/reference/modules/Workflows/docs/sample-content-for-each.png
new file mode 100644
index 00000000000..ef265ce60e3
Binary files /dev/null and b/src/docs/reference/modules/Workflows/docs/sample-content-for-each.png differ