diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index b3d57424..1774cd92 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -50,11 +50,32 @@ jobs:
         with:
           name: rundeck.deb
           path: rd-cli-tool/build/distributions
-      - name: deb/rpm install test
+      - name: deb install test
         run: bash scripts/install-test.sh -deb
         env:
           UBUNTUVERS: ${{matrix.ubuntu}}
           DEBJDK: ${{matrix.jdk}}
+  rpm_install_tests:
+    runs-on: ubuntu-latest
+    needs: build
+    strategy:
+      matrix:
+        jdk: [ "java-11-openjdk","java-17-openjdk","java-21-openjdk" ]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: mkdirs
+        run: mkdir -p rd-cli-tool/build/distributions
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: rundeck.rpm
+          path: rd-cli-tool/build/distributions
+      - name: rpm install test
+        run: bash scripts/install-test.sh -rpm
+        env:
+          RPMJDK: ${{matrix.jdk}}
   build:
 
     runs-on: ubuntu-latest
@@ -82,8 +103,6 @@ jobs:
       with:
         name: integration-test-report
         path: integration-tests/build/reports/tests/integrationTest
-#    - name: deb/rpm install test
-#      run: bash scripts/install-test.sh
     - name: rpm upgrade test
       run: bash scripts/rpm-upgrade.sh
     - name: Get Release Version
@@ -103,17 +122,10 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         # Artifact name
-        name: rundeck-cli-${{ steps.get_rpm_version.outputs.VERSION }}-1.noarch.rpm
+        name: rundeck.rpm
         # Directory containing files to upload
         path: rd-cli-tool/build/distributions/rundeck-cli-${{ steps.get_rpm_version.outputs.VERSION }}-1.noarch.rpm
     - name: Upload deb
-      uses: actions/upload-artifact@v4
-      with:
-        # Artifact name
-        name: rundeck-cli_${{ steps.get_rpm_version.outputs.VERSION }}-1_all.deb
-        # Directory containing files to upload
-        path: rd-cli-tool/build/distributions/rundeck-cli_${{ steps.get_rpm_version.outputs.VERSION }}-1_all.deb
-    - name: Upload deb-basic
       uses: actions/upload-artifact@v4
       with:
         # Artifact name