diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 38dfb8b..ce4c8df 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,6 +2,14 @@ name: Build
 
 on:
   push:
+    branches:
+      - master
+      - develop
+      - "feature/**"
+      - "release/**"
+      - "hotfix/**"
+    tags:
+      - "*"
     paths-ignore:
       - "README.md"
   pull_request:
@@ -9,10 +17,9 @@ on:
 jobs:
   build:
     runs-on: ${{ matrix.os }}
-    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest, macos-latest]
+        os: [windows-latest, ubuntu-18.04, macos-latest]
 
     env:
       AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }}
@@ -67,4 +74,4 @@ jobs:
         with:
           if-no-files-found: warn
           name: package
-          path: BuildArtifacts/Packages/**/*
\ No newline at end of file
+          path: BuildArtifacts/Packages/**/*
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 0c0cb96..0fa92b0 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     strategy:
       fail-fast: false
diff --git a/.github/workflows/dependabot-cake.yml b/.github/workflows/dependabot-cake.yml
index f34a967..304c519 100644
--- a/.github/workflows/dependabot-cake.yml
+++ b/.github/workflows/dependabot-cake.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   dependabot-cake:
-    runs-on: ubuntu-latest # linux, because this is a docker-action
+    runs-on: ubuntu-18.04 # linux, because this is a docker-action
     steps:
       - name: check/update cake dependencies
         uses: nils-org/dependabot-cake-action@v1
\ No newline at end of file
diff --git a/.github/workflows/publishDocs.yml b/.github/workflows/publishDocs.yml
index 390a58d..48577fe 100644
--- a/.github/workflows/publishDocs.yml
+++ b/.github/workflows/publishDocs.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   cake:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: checkout
diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
index 8fa1ace..d78451a 100644
--- a/.github/workflows/release-notes.yml
+++ b/.github/workflows/release-notes.yml
@@ -7,7 +7,7 @@ jobs:
   draft-stable:
     env:
       GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
       - name: Checkout the requested branch
diff --git a/recipe.cake b/recipe.cake
index 35a760e..d573753 100644
--- a/recipe.cake
+++ b/recipe.cake
@@ -1,4 +1,4 @@
-#load nuget:?package=Cake.Recipe&version=2.2.0
+#load nuget:?package=Cake.Recipe&version=2.2.1
 
 Environment.SetVariableNames();
 
diff --git a/src/Cake.FileHelpers/Cake.FileHelpers.csproj b/src/Cake.FileHelpers/Cake.FileHelpers.csproj
index 9822c98..e62d753 100644
--- a/src/Cake.FileHelpers/Cake.FileHelpers.csproj
+++ b/src/Cake.FileHelpers/Cake.FileHelpers.csproj
@@ -13,7 +13,7 @@
     <Title>Cake.FileHelpers</Title>
     <Summary>Cake build aliases for Reading, Writing, and Replacing Text in files.</Summary>
     <Description>Cake Build addon to provide Aliases for common File operations (Reading, Writing, Replacing Text).</Description>
-    <PackageTags>Cake Script Build</PackageTags>
+    <PackageTags>cake;script;build;cake-addin</PackageTags>
     <Authors>Redth</Authors>
     <Owners>Redth; cake-contrib</Owners>
     <Copyright>Copyright 2017-$([System.DateTime]::Now.Year) - Cake Contributions</Copyright>