diff --git a/.github/workflows/create-lint-wf.yml b/.github/workflows/create-lint-wf.yml
index dbee44654a..c4d0358982 100644
--- a/.github/workflows/create-lint-wf.yml
+++ b/.github/workflows/create-lint-wf.yml
@@ -6,6 +6,15 @@ on:
   pull_request:
   release:
     types: [published]
+  workflow_dispatch:
+    inputs:
+      runners:
+        description: "Runners to test on"
+        type: choice
+        options:
+          - "ubuntu-latest"
+          - "self-hosted"
+        default: "self-hosted"
 
 # Cancel if a newer run is started
 concurrency:
@@ -17,7 +26,7 @@ env:
 
 jobs:
   MakeTestWorkflow:
-    runs-on: self-hosted
+    runs-on: ${{ github.event.inputs.runners || 'self-hosted' }}
     env:
       NXF_ANSI_LOG: false
     strategy:
diff --git a/.github/workflows/create-test-lint-wf-template.yml b/.github/workflows/create-test-lint-wf-template.yml
index fb00471b90..7d586fc3d2 100644
--- a/.github/workflows/create-test-lint-wf-template.yml
+++ b/.github/workflows/create-test-lint-wf-template.yml
@@ -8,6 +8,15 @@ on:
   pull_request:
   release:
     types: [published]
+  workflow_dispatch:
+    inputs:
+      runners:
+        description: "Runners to test on"
+        type: choice
+        options:
+          - "ubuntu-latest"
+          - "self-hosted"
+        default: "self-hosted"
 
 # Cancel if a newer run is started
 concurrency:
@@ -29,7 +38,8 @@ jobs:
           - "template_skip_github_badges.yml"
           - "template_skip_igenomes.yml"
           - "template_skip_ci.yml"
-        runner: ["self-hosted"]
+        runner:
+          - ${{ github.event.inputs.runners || 'self-hosted' }}
         profile: ["self_hosted_runner"]
         include:
           - TEMPLATE: "template_skip_all.yml"
diff --git a/.github/workflows/create-test-wf.yml b/.github/workflows/create-test-wf.yml
index e128e16a36..9301d1224e 100644
--- a/.github/workflows/create-test-wf.yml
+++ b/.github/workflows/create-test-wf.yml
@@ -6,6 +6,15 @@ on:
   pull_request:
   release:
     types: [published]
+  workflow_dispatch:
+    inputs:
+      runners:
+        description: "Runners to test on"
+        type: choice
+        options:
+          - "ubuntu-latest"
+          - "self-hosted"
+        default: "self-hosted"
 
 # Cancel if a newer run is started
 concurrency:
@@ -17,7 +26,7 @@ env:
 
 jobs:
   RunTestWorkflow:
-    runs-on: self-hosted
+    runs-on: ${{ github.event.inputs.runners || 'self-hosted' }}
     env:
       NXF_ANSI_LOG: false
     strategy:
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index 139e3d9298..8a4afe9161 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -15,6 +15,14 @@ on:
   release:
     types: [published]
   workflow_dispatch:
+    inputs:
+      runners:
+        description: "Runners to test on"
+        type: choice
+        options:
+          - "ubuntu-latest"
+          - "self-hosted"
+        default: "self-hosted"
 
 # Cancel if a newer run with the same workflow name is queued
 concurrency:
@@ -64,7 +72,7 @@ jobs:
     name: Run ${{matrix.test}} with Python ${{ needs.setup.outputs.python-version }} on ${{ needs.setup.outputs.runner }}
     needs: [setup, list_tests]
     if: ${{ needs.setup.outputs.run-tests }}
-    runs-on: self-hosted
+    runs-on: ${{ github.event.inputs.runners || 'self-hosted' }}
     strategy:
       matrix: ${{ fromJson(needs.list_tests.outputs.tests) }}
       fail-fast: false # run all tests even if one fails
@@ -154,7 +162,7 @@ jobs:
 
   coverage:
     needs: test
-    runs-on: self-hosted
+    runs-on: ${{ github.event.inputs.runners || 'self-hosted' }}
     steps:
       - name: go to subdirectory
         run: |
diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
index 9bbc12cf4b..aeb24839f1 100644
--- a/.github/workflows/sync.yml
+++ b/.github/workflows/sync.yml
@@ -8,6 +8,13 @@ on:
         type: boolean
         description: Only run on nf-core/testpipeline?
         required: true
+      runners:
+        description: "Runners to test on"
+        type: choice
+        options:
+          - "ubuntu-latest"
+          - "self-hosted"
+        default: "self-hosted"
 
 # Cancel if a newer run is started
 concurrency:
@@ -16,7 +23,7 @@ concurrency:
 
 jobs:
   get-pipelines:
-    runs-on: self-hosted
+    runs-on: ${{ github.event.inputs.runners || 'self-hosted' }}
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -31,7 +38,7 @@ jobs:
 
   sync:
     needs: get-pipelines
-    runs-on: self-hosted
+    runs-on: ${{ github.event.inputs.runners || 'self-hosted' }}
     strategy:
       matrix: ${{fromJson(needs.get-pipelines.outputs.matrix)}}
       fail-fast: false
diff --git a/nf_core/create.py b/nf_core/create.py
index f9e9933ee3..8038a995c5 100644
--- a/nf_core/create.py
+++ b/nf_core/create.py
@@ -174,8 +174,8 @@ def create_param_dict(self, name, description, author, version, template_yaml_pa
         param_dict["name_noslash"] = param_dict["name"].replace("/", "-")
         param_dict["prefix_nodash"] = param_dict["prefix"].replace("-", "")
         param_dict["name_docker"] = param_dict["name"].replace(param_dict["prefix"], param_dict["prefix_nodash"])
-        param_dict["logo_light"] = f"{param_dict['short_name']}_logo_light.png"
-        param_dict["logo_dark"] = f"{param_dict['short_name']}_logo_dark.png"
+        param_dict["logo_light"] = f"nf-core-{param_dict['short_name']}_logo_light.png"
+        param_dict["logo_dark"] = f"nf-core-{param_dict['short_name']}_logo_dark.png"
         param_dict["version"] = version
 
         if (
diff --git a/nf_core/pipeline-template/.github/workflows/download_pipeline.yml b/nf_core/pipeline-template/.github/workflows/download_pipeline.yml
index 06f0075e43..07ac82c1ed 100644
--- a/nf_core/pipeline-template/.github/workflows/download_pipeline.yml
+++ b/nf_core/pipeline-template/.github/workflows/download_pipeline.yml
@@ -20,7 +20,7 @@ env:
 
 jobs:
   download:
-    runs-on: ["self-hosted"]
+    runs-on: ubuntu-latest
     steps:
       - name: Install Nextflow
         uses: nf-core/setup-nextflow@v1