diff --git a/.github/workflows/ci-run-on-pr.yaml b/.github/workflows/ci-run-on-pr.yaml
index f81f084..5a2cadb 100644
--- a/.github/workflows/ci-run-on-pr.yaml
+++ b/.github/workflows/ci-run-on-pr.yaml
@@ -14,8 +14,8 @@ jobs:
           #- 14
           #- 15
           #- 16
-          - 17
-          #- 18
+          #- 17
+          - 18
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -47,6 +47,13 @@ jobs:
         env:
           PGVERSION: ${{ matrix.pgversion }}
 
+      - name: Run rpm signer
+        env:
+          PGVERSION: ${{ matrix.pgversion }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          GPG_KEY_B64: ${{ secrets.GPG_KEY_B64 }}
+        run: docker-compose up rpmsigner --exit-code-from rpmsigner
+
       - name: copy rpm to postgres context
         run: |
           cp -av rpms docker/postgres/
diff --git a/docker-compose.yml b/docker-compose.yml
index d67fd20..8cc5433 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,8 +20,7 @@ services:
     platform: linux/amd64
     volumes:
       - ./:/host
-    command: >
-      - /scripts/build_rpm.sh
+    command: /scripts/build_rpm.sh
   postgres:
     build:
       context: docker/postgres
@@ -29,13 +28,12 @@ services:
       LD_LIBRARY_PATH: /opt/ibm/db2/V12.1/lib64
   rpmsigner:
     image: builder
-    command:
-      - /host/scripts/sign_rpms.sh
+    command: /scripts/sign_rpms.sh
     volumes:
       - ./:/host
     environment:
-      - GPG_PASSPHRASE
-      - GPG_KEY_B64
+      GPG_PASSPHRASE: ${GPG_PASSPHRASE}
+      GPG_KEY_B64: ${GPG_KEY_B64}
   #dev:
   #  image: builder
   #  platform: linux/amd64
diff --git a/docker/builder/scripts/sign_rpms.sh b/docker/builder/scripts/sign_rpms.sh
index f18144b..543ee6c 100755
--- a/docker/builder/scripts/sign_rpms.sh
+++ b/docker/builder/scripts/sign_rpms.sh
@@ -5,7 +5,7 @@ DEST=${DEST:-/host}
 cd "$DEST"
 export GPG_TTY=$(tty)
 
-sed "s/PASSPHRASE/${GPG_PASSPHRASE}/" config/signmacros >~/.rpmmacros
+sed "s/GPG_PASSPHRASE/${GPG_PASSPHRASE}/" config/signmacros >~/.rpmmacros
 gpg --import --no-tty --batch --yes <RPM-GPG-KEY-myrepo
 echo "Importing seckey..."
 echo "${GPG_KEY_B64}" | base64 -d | gpg --import --no-tty --batch --yes