diff --git a/generic/secrets/gitleaks/generic-api-key.txt b/generic/secrets/gitleaks/generic-api-key.txt
index 099d73e5d9..9c35ba7369 100644
--- a/generic/secrets/gitleaks/generic-api-key.txt
+++ b/generic/secrets/gitleaks/generic-api-key.txt
@@ -207,4 +207,4 @@ clientToken: "pub4306832bdc5f2b8b980c492ec2c11ef3",
 // ok: generic-api-key
 keys: 'privkey1.json',
 // ok: generic-api-key
-"Keywords": "asdsadsadsaUSAdusadusadsa",
+"Keywords": "asdsadsadsaUSAdusadusadsa",
\ No newline at end of file
diff --git a/generic/secrets/security/detected-artifactory-password.txt b/generic/secrets/security/detected-artifactory-password.txt
index 4130d4ee4e..d81be1bdca 100644
--- a/generic/secrets/security/detected-artifactory-password.txt
+++ b/generic/secrets/security/detected-artifactory-password.txt
@@ -1,11 +1,5 @@
 # ruleid: detected-artifactory-password
-AP6xxxxxxxxxx
-
-# ruleid: detected-artifactory-password
-AP2xxxxxxxxxx
-
-# ruleid: detected-artifactory-password
-artifactoryx:_password=AP6xxxxxxxxxx
+artifactoryx:_password=AP6abc1231321
 
 # ok: detected-artifactory-password
 integrity sha512-AP1AyUTbi2szylgr+O0OB7gkIxEGzySLITZ2GpsaoX72YMCGI2jYAc+WUhPfvUnZYiauF4zTnN4V4TGuvFjJlw==
@@ -19,9 +13,6 @@ ImageID: "SHA256:AP1AyUTbi2szylgr266fcae00707e67a2545ef34f9a29354585f93dac906749
 # ok: detected-artifactory-password
  - hasql-1.6.0.1@sha256:AP1AyUTbi2szylgr+422a3bb776a12d5cf2bb83303778f343106f9a1cc2b4fcdf73,6628
 
-# ruleid: detected-artifactory-password
-artifactoryx_password:AP6xxxxxxxxxx
-
 # ok: detected-artifactory-password
 X-JFrog-Art-Api: $PASSWORD
 
@@ -124,7 +115,7 @@ b3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KIHRoaXMgc29mdHdhcmUgd2l0aG9
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 # ok: detected-artifactory-password
-AP6xxxxxxxxxx
+AP6abc1231321
 -----END PGP PUBLIC KEY BLOCK-----
 
 apiVersion: appprotectdos.f5.com/v1beta1
diff --git a/generic/secrets/security/detected-artifactory-password.yaml b/generic/secrets/security/detected-artifactory-password.yaml
index 90ab3a9a45..b89125ac49 100644
--- a/generic/secrets/security/detected-artifactory-password.yaml
+++ b/generic/secrets/security/detected-artifactory-password.yaml
@@ -1,35 +1,16 @@
 rules:
   - id: detected-artifactory-password
-    options:
-      generic_engine: aliengrep
-      generic_multiline: false
-      generic_caseless: true
     patterns:
-      - pattern: $ITEM
-      - metavariable-regex:
-          metavariable: $ITEM
-          regex: \bAP[\dABCDEF][a-zA-Z0-9]{8,}
-      - pattern-not-inside: |
-          sha1...
-      - pattern-not-inside: |
-          sha2...
-      - pattern-not-inside: |
-          sha3...
-      - pattern-not-inside: |
-          sha118...
-      - pattern-not-inside: |
-          sha256...
-      - pattern-not-inside: |
-          sha512...
-      - pattern-not-inside: |
-          -BEGIN ...-
-          ....
-          ...-END ...-
+      - pattern-regex: (?<ITEM>\bAP[\dABCDEF][a-zA-Z0-9]{8,})
+      - pattern-regex: .*(?i)arti[-_]?factory.*
+      - pattern-not-regex: .*(?i)sha(1|2|3|118|256|512).*
+      - pattern-not-regex: (?i)-----\s*?BEGIN[ A-Z0-9_-]*? KEY( BLOCK)?-----[\s\S]*?-----\s*?END[ A-Z0-9_-]*?\s*?-----
       - metavariable-analysis:
           analyzer: entropy
           metavariable: $ITEM
+      - pattern-not-regex: (\w|\.|\*)\1{4}
     languages:
-      - generic
+      - regex
     paths:
       exclude:
         - "*.svg"