diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index 8931fe1..21eebf7 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -159,7 +159,7 @@ jobs:
 
   ############### SONATYPE SCAN ###############
   sonatype-scan:
-    if: false
+    if: always()
     needs: [ci]
     runs-on: ubuntu-latest
     steps:
@@ -188,8 +188,8 @@ jobs:
     - name: Sonatype Lifecycle SCA Scan
       uses: sonatype-nexus-community/iq-github-action@main
       with:
-        username: ${{ secrets.ORG_MORPHIR_SONATYPE_USER }}
-        password: ${{ secrets.ORG_MORPHIR_SONATYPE_PASSWORD }}
+        username: ${{ secrets.SONATYPE_SCANNER_USERNAME }}
+        password: ${{ secrets.SONATYPE_SCANNER_PASSWORD }}
         serverUrl: ${{ env.SonatypeUrl }}
         applicationId: ${{ env.SonatypeAppId }}
         stage: ${{ env.SonatypeStage }}
@@ -199,7 +199,7 @@ jobs:
       if: always()
       run: |
         mkdir reports/
-        iqCredentials="${{ secrets.ORG_MORPHIR_SONATYPE_USER }}:${{ secrets.ORG_MORPHIR_SONATYPE_PASSWORD }}"
+        iqCredentials="${{ secrets.SONATYPE_SCANNER_USERNAME }}:${{ secrets.SONATYPE_SCANNER_PASSWORD }}"
         echo 'Get internal app ID for public ID: '$SonatypeAppId
         res=$(curl -u $iqCredentials --location $SonatypeUrl'api/v2/applications?publicId='$SonatypeAppId)
         IFS='"' read -a array <<< "$res"