diff --git a/.github/workflows/publish-1.0-docs.yml b/.github/workflows/publish-1.0-docs.yml
index 78d2f34ba5e..c826c8acf81 100644
--- a/.github/workflows/publish-1.0-docs.yml
+++ b/.github/workflows/publish-1.0-docs.yml
@@ -17,7 +17,7 @@
 
 # Based on Apache Arrow's java-nightly workflow
 # https://github.com/apache/arrow/blob/master/.github/workflows/java_nightly.yml
-name: Publish 1.0 documentation
+name: Publish documentation
 
 on:
   workflow_dispatch:
@@ -27,9 +27,13 @@ permissions:
 
 jobs:
   publish:
-    name: Publish 1.0 docs
+    name: Publish docs on ${{ matrix.pekkoVersion }}
     runs-on: ubuntu-20.04
     if: github.repository == 'apache/pekko'
+    strategy:
+      fail-fast: false
+      matrix:
+        pekkoVersion: [ "main", "1.0.x" ]
     steps:
       # TODO we will need to change to use a release tag in future
       - name: Checkout
@@ -37,7 +41,7 @@ jobs:
         with:
           fetch-depth: 0
           fetch-tags: true
-          ref: 1.0.x
+          ref: ${{ matrix.pekkoVersion }}
 
       - name: Setup Java 11
         uses: actions/setup-java@v4
diff --git a/.github/workflows/publish-nightly.yml b/.github/workflows/publish-nightly.yml
index 327147726e8..51a783ace5d 100644
--- a/.github/workflows/publish-nightly.yml
+++ b/.github/workflows/publish-nightly.yml
@@ -20,18 +20,21 @@
 name: Publish nightly snapshots and documentation
 
 on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * *"
+  pull_request:
+    branches: ['**']
 
 permissions:
   contents: read
 
 jobs:
   publish-nightly:
-    name: Publish nightly
+    name: Publish nightly on ${{ matrix.pekkoVersion }}
     runs-on: ubuntu-20.04
     if: github.repository == 'apache/pekko'
+    strategy:
+      fail-fast: false
+      matrix:
+        pekkoVersion: [ "main", "1.0.x" ]
     env:
       DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
     steps:
@@ -40,6 +43,7 @@ jobs:
         with:
           fetch-depth: 0
           fetch-tags: true
+          ref: ${{ matrix.pekkoVersion }}
 
       - name: Setup Java 11
         uses: actions/setup-java@v4