diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index 909f0c1a..0905cfc4 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -20,14 +20,17 @@ jobs:
         uses: actions/checkout@v4
       - name: Build image
         run: |
-          docker build -t quay.io/hawtio/online:latest .
+          make image
       - name: Display image
         run: |
           docker images
+
+      # Only push from main repository
       - name: Push image to Quay.io
+        if: github.repository == 'hawtio/hawtio-online'
         env:
           USERNAME: ${{ secrets.QUAY_USERNAME }}
           PASSWORD: ${{ secrets.QUAY_PASSWORD }}
         run: |
-          docker login -u $USERNAME -p $PASSWORD quay.io
-          docker push quay.io/hawtio/online:latest
+          docker login -u ${USERNAME} -p ${PASSWORD} quay.io
+          make image-push
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b485345a..fb07e050 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['18', '20']
+        node: ['20']
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -30,9 +30,7 @@ jobs:
           echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/ubuntu `lsb_release -cs` nginx" | sudo tee /etc/apt/sources.list.d/nginx.list
           echo -e "Package: *\nPin: origin nginx.org\nPin: release o=nginx\nPin-Priority: 900\n" | sudo tee /etc/apt/preferences.d/99nginx
           sudo apt-get update -y
-          sudo apt-get install -y nginx=1.18.0-2~focal nginx-module-njs=1.18.0.0.4.4-2~focal
-      - name: Show NJS versions for debugging
-        run: sudo apt-cache showpkg nginx-module-njs
+          sudo apt-get install -y nginx=1.20.2-1~focal
 
       - name: Set up Node
         uses: actions/setup-node@v4