diff --git a/docker/Dockerfile b/docker/Dockerfile
index 112164087..f65e5b75b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -15,7 +15,7 @@ COPY ./Nuget.Config ./
 # build and publish (UseAppHost=false created platform independent binaries)
 WORKDIR /source/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith
 RUN dotnet build "ElsaDashboard.Samples.AspNetCore.Monolith.csproj" -c Release -o /app/build
-RUN dotnet publish "ElsaDashboard.Samples.AspNetCore.Monolith.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore
+RUN dotnet publish "ElsaDashboard.Samples.AspNetCore.Monolith.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore -f net5.0
 
 # move binaries into smaller base image
 FROM mcr.microsoft.com/dotnet/aspnet:5.0-buster-slim AS base
diff --git a/docker/Dockerfile-elsa-dashboard b/docker/Dockerfile-elsa-dashboard
index 25edf7cff..457092644 100644
--- a/docker/Dockerfile-elsa-dashboard
+++ b/docker/Dockerfile-elsa-dashboard
@@ -28,7 +28,7 @@ COPY --from=client-build /app/designer/bindings/aspnet/Elsa.Designer.Components.
 # build and publish (UseAppHost=false created platform independent binaries)
 WORKDIR /source/src/dashboards/ElsaDashboard
 RUN dotnet build "ElsaDashboard.Web.csproj" -c Release -o /app/build
-RUN dotnet publish "ElsaDashboard.Web.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore
+RUN dotnet publish "ElsaDashboard.Web.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore -f net5.0
 
 # move binaries into smaller base image
 FROM mcr.microsoft.com/dotnet/aspnet:5.0-buster-slim AS base
diff --git a/docker/Dockerfile-elsa-dashboard-and-server b/docker/Dockerfile-elsa-dashboard-and-server
index 7a8ec7113..97593a553 100644
--- a/docker/Dockerfile-elsa-dashboard-and-server
+++ b/docker/Dockerfile-elsa-dashboard-and-server
@@ -28,7 +28,7 @@ COPY --from=client-build /app/designer/bindings/aspnet/Elsa.Designer.Components.
 # build and publish (UseAppHost=false creates platform independent binaries)
 WORKDIR /source/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith
 RUN dotnet build "ElsaDashboard.Samples.AspNetCore.Monolith.csproj" -c Release -o /app/build
-RUN dotnet publish "ElsaDashboard.Samples.AspNetCore.Monolith.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore
+RUN dotnet publish "ElsaDashboard.Samples.AspNetCore.Monolith.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore -f net5.0
 
 # move binaries into smaller base image
 FROM mcr.microsoft.com/dotnet/aspnet:5.0-buster-slim AS base
diff --git a/src/designer/elsa-workflows-studio/src/components.d.ts b/src/designer/elsa-workflows-studio/src/components.d.ts
index f2bdaf80f..cba2f49ff 100644
--- a/src/designer/elsa-workflows-studio/src/components.d.ts
+++ b/src/designer/elsa-workflows-studio/src/components.d.ts
@@ -16,8 +16,6 @@ import { ToastNotificationOptions } from "./components/shared/elsa-toast-notific
 export namespace Components {
     interface ElsaActivityEditorModal {
     }
-    interface ElsaActivityPickerModal {
-    }
     interface ElsaCheckListProperty {
         "propertyDescriptor": ActivityPropertyDescriptor;
         "propertyModel": ActivityDefinitionProperty;
@@ -245,12 +243,6 @@ declare global {
         prototype: HTMLElsaActivityEditorModalElement;
         new (): HTMLElsaActivityEditorModalElement;
     };
-    interface HTMLElsaActivityPickerModalElement extends Components.ElsaActivityPickerModal, HTMLStencilElement {
-    }
-    var HTMLElsaActivityPickerModalElement: {
-        prototype: HTMLElsaActivityPickerModalElement;
-        new (): HTMLElsaActivityPickerModalElement;
-    };
     interface HTMLElsaCheckListPropertyElement extends Components.ElsaCheckListProperty, HTMLStencilElement {
     }
     var HTMLElsaCheckListPropertyElement: {
@@ -493,7 +485,6 @@ declare global {
     };
     interface HTMLElementTagNameMap {
         "elsa-activity-editor-modal": HTMLElsaActivityEditorModalElement;
-        "elsa-activity-picker-modal": HTMLElsaActivityPickerModalElement;
         "elsa-check-list-property": HTMLElsaCheckListPropertyElement;
         "elsa-checkbox-property": HTMLElsaCheckboxPropertyElement;
         "elsa-confirm-dialog": HTMLElsaConfirmDialogElement;
@@ -539,8 +530,6 @@ declare global {
 declare namespace LocalJSX {
     interface ElsaActivityEditorModal {
     }
-    interface ElsaActivityPickerModal {
-    }
     interface ElsaCheckListProperty {
         "propertyDescriptor"?: ActivityPropertyDescriptor;
         "propertyModel"?: ActivityDefinitionProperty;
@@ -760,7 +749,6 @@ declare namespace LocalJSX {
     }
     interface IntrinsicElements {
         "elsa-activity-editor-modal": ElsaActivityEditorModal;
-        "elsa-activity-picker-modal": ElsaActivityPickerModal;
         "elsa-check-list-property": ElsaCheckListProperty;
         "elsa-checkbox-property": ElsaCheckboxProperty;
         "elsa-confirm-dialog": ElsaConfirmDialog;
@@ -808,7 +796,6 @@ declare module "@stencil/core" {
     export namespace JSX {
         interface IntrinsicElements {
             "elsa-activity-editor-modal": LocalJSX.ElsaActivityEditorModal & JSXBase.HTMLAttributes<HTMLElsaActivityEditorModalElement>;
-            "elsa-activity-picker-modal": LocalJSX.ElsaActivityPickerModal & JSXBase.HTMLAttributes<HTMLElsaActivityPickerModalElement>;
             "elsa-check-list-property": LocalJSX.ElsaCheckListProperty & JSXBase.HTMLAttributes<HTMLElsaCheckListPropertyElement>;
             "elsa-checkbox-property": LocalJSX.ElsaCheckboxProperty & JSXBase.HTMLAttributes<HTMLElsaCheckboxPropertyElement>;
             "elsa-confirm-dialog": LocalJSX.ElsaConfirmDialog & JSXBase.HTMLAttributes<HTMLElsaConfirmDialogElement>;