diff --git a/.github/workflows/gh-ci-cron.yaml b/.github/workflows/gh-ci-cron.yaml
index 2aa178ae173..3cef60faf6b 100644
--- a/.github/workflows/gh-ci-cron.yaml
+++ b/.github/workflows/gh-ci-cron.yaml
@@ -8,7 +8,7 @@ concurrency:
   # Probably overly cautious group naming.
   # Commits to develop/master will cancel each other, but PRs will only cancel
   # commits within the same PR
-  group: "${{ github.ref }}-${{ github.head_ref }}"
+  group: "${{ github.ref }}-${{ github.head_ref }}-${{ github.workflow }}"
   cancel-in-progress: true
 
 defaults:
diff --git a/.github/workflows/gh-ci.yaml b/.github/workflows/gh-ci.yaml
index cd05b9d870d..73bcf949797 100644
--- a/.github/workflows/gh-ci.yaml
+++ b/.github/workflows/gh-ci.yaml
@@ -13,7 +13,7 @@ concurrency:
   # Probably overly cautious group naming.
   # Commits to develop/master will cancel each other, but PRs will only cancel
   # commits within the same PR
-  group: "${{ github.ref }}-${{ github.head_ref }}"
+  group: "${{ github.ref }}-${{ github.head_ref }}-${{ github.workflow }}"
   cancel-in-progress: true
 
 defaults:
diff --git a/.github/workflows/greetings.yaml b/.github/workflows/greetings.yaml
new file mode 100644
index 00000000000..118fd96c868
--- /dev/null
+++ b/.github/workflows/greetings.yaml
@@ -0,0 +1,19 @@
+name: First Time Contributor Greetings
+
+on:
+  pull_request:
+    types: [opened]
+    branches:
+      - develop
+
+jobs:
+  greeting:
+    if: "github.repository == 'MDAnalysis/mdanalysis'"
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+    - uses: actions/first-interaction@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        pr-message: 'Hello there first time contributor! Welcome to the MDAnalysis community! We ask that all contributors abide by our [Code of Conduct](https://www.mdanalysis.org/pages/conduct/) and that first time contributors introduce themselves on the [developer mailing list](https://groups.google.com/g/mdnalysis-devel) so we can get to know you. You can learn more about [participating here](https://www.mdanalysis.org/#participating). Please also add yourself to `package/AUTHORS` as part of this PR.'
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yaml
similarity index 100%
rename from .github/workflows/labels.yml
rename to .github/workflows/labels.yaml