diff --git a/.woodpecker/cron.yml b/.woodpecker/cron.yml
index 31a3932..299765e 100644
--- a/.woodpecker/cron.yml
+++ b/.woodpecker/cron.yml
@@ -24,6 +24,9 @@ steps:
       - /var/run/docker.sock:/var/run/docker.sock
     commands:
       - molecule test --scenario-name ${MOLECULE_SCENARIO:-default}
-    secrets: [ ]
+    secrets: [ auth_duo_host, 
+               auth_duo_ikey, 
+               auth_duo_skey, 
+               auth_duo_mirror_url ]
     when:
       event: [ cron ]
diff --git a/.woodpecker/lint.yml b/.woodpecker/lint.yml
index fd4efb2..b130545 100644
--- a/.woodpecker/lint.yml
+++ b/.woodpecker/lint.yml
@@ -1,3 +1,12 @@
+clone:
+  git:
+    image: woodpeckerci/plugin-git
+    settings:
+      recursive: true
+      submodule_update_remote: true
+when:
+  event: [ push, manual ]
+
 steps:
   ansible-lint:
     group: test
@@ -18,3 +27,17 @@ steps:
       - yamllint -f colored .
     when:
       event: [ push, manual ]
+  ntfy:
+    image: codeberg.org/l-x/woodpecker-ntfy
+    settings:
+        url: https://ntfy.cybercinch.nz/ci-status
+        title: "Lint failed for ${CI_REPO_NAME}" 
+        priority: urgent
+        icon: https://woodpecker-ci.org/img/logo.svg
+        tags: robot,warning,rotating_light,${CI_BUILD_EVENT},${CI_REPO_NAME}
+        message: >
+          📝 Commit by ${CI_COMMIT_AUTHOR} on ${CI_COMMIT_BRANCH}:
+                ${CI_COMMIT_MESSAGE}
+    when:
+      event: [ push, manual ]
+      status: [ failure ]
diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml
index 009ac8c..2a17bfd 100644
--- a/.woodpecker/test.yml
+++ b/.woodpecker/test.yml
@@ -24,10 +24,24 @@ steps:
       - /var/run/docker.sock:/var/run/docker.sock
     commands:
       - molecule test --scenario-name ${MOLECULE_SCENARIO:-default}
-    secrets: []
+    secrets: [ auth_duo_host, auth_duo_ikey, auth_duo_skey, auth_duo_mirror_url ]
     when:
-      event:
+      event: 
         - push
         - manual
+  ntfy:
+    image: codeberg.org/l-x/woodpecker-ntfy
+    settings:
+        url: https://ntfy.cybercinch.nz/ci-status
+        title: "Test failed for ${CI_REPO_NAME} - Distro: ${MOLECULE_DISTRO} Scenario: ${MOLECULE_SCENARIO:-default}" 
+        priority: urgent
+        icon: https://woodpecker-ci.org/img/logo.svg
+        tags: robot,warning,rotating_light,${CI_BUILD_EVENT},${CI_REPO_NAME}
+        message: >
+          📝 Commit by ${CI_COMMIT_AUTHOR} on ${CI_COMMIT_BRANCH}:
+                ${CI_COMMIT_MESSAGE}
+    when:
+      event: [ push, manual ]
+      status: [ failure ]
 depends_on:
   - lint
diff --git a/.woodpecker/z.cron-ntfy.yml b/.woodpecker/z.ntfy-cron.yml
similarity index 77%
rename from .woodpecker/z.cron-ntfy.yml
rename to .woodpecker/z.ntfy-cron.yml
index f0a09dc..ac77a50 100644
--- a/.woodpecker/z.cron-ntfy.yml
+++ b/.woodpecker/z.ntfy-cron.yml
@@ -10,9 +10,7 @@ steps:
         icon: https://woodpecker-ci.org/img/logo.svg
         tags: robot,white_check_mark,${CI_BUILD_EVENT},${CI_REPO_NAME}
         message: >
-          📝 Commit by ${CI_COMMIT_AUTHOR} on ${CI_COMMIT_BRANCH}:
-
-                ${CI_COMMIT_MESSAGE}
+          Test success when run by cron for ${CI_REPO_NAME}.
 depends_on:
-  - cron
+  - "cron"
 runs_on: [ success ]
diff --git a/.woodpecker/z.ntfy.yml b/.woodpecker/z.ntfy.yml
index 735ffb5..7d69719 100644
--- a/.woodpecker/z.ntfy.yml
+++ b/.woodpecker/z.ntfy.yml
@@ -5,13 +5,16 @@ steps:
     image: codeberg.org/l-x/woodpecker-ntfy
     settings:
         url: https://ntfy.cybercinch.nz/ci-status
-        title: Build ${CI_PIPELINE_STATUS} on ${CI_REPO_NAME}
+        title: "Build completed for ${CI_REPO_NAME}" 
         priority: urgent
         icon: https://woodpecker-ci.org/img/logo.svg
-        tags: robot,white_check_mark,${CI_BUILD_EVENT},${CI_REPO_NAME}
+        tags: robot,tada,white_check_mark,${CI_BUILD_EVENT},${CI_REPO_NAME}
         message: >
           📝 Commit by ${CI_COMMIT_AUTHOR} on ${CI_COMMIT_BRANCH}:
-              ${CI_COMMIT_MESSAGE}
+                ${CI_COMMIT_MESSAGE}
+    when:
+      event: [ push, manual ]
+      status: [ success ]
 depends_on:
   - lint
   - test
diff --git a/.woodpecker/z.failed-cron-ntfy.yml b/.woodpecker/zz.ntfy-cron-failed.yml
similarity index 73%
rename from .woodpecker/z.failed-cron-ntfy.yml
rename to .woodpecker/zz.ntfy-cron-failed.yml
index 386e51b..5b88cdc 100644
--- a/.woodpecker/z.failed-cron-ntfy.yml
+++ b/.woodpecker/zz.ntfy-cron-failed.yml
@@ -10,9 +10,7 @@ steps:
         icon: https://woodpecker-ci.org/img/logo.svg
         tags: robot,rotating_light,no_entry,${CI_BUILD_EVENT},${CI_REPO_NAME}
         message: >
-          📝 Commit by ${CI_COMMIT_AUTHOR} on ${CI_COMMIT_BRANCH}:
-
-                ${CI_COMMIT_MESSAGE}
+          Test failed when run by cron for ${CI_REPO_NAME}.
 depends_on:
-  - cron
-runs_on: [ failure ]
+  - "cron"
+runs_on: [ failure ]
\ No newline at end of file