diff --git a/src/@orb.yml b/src/@orb.yml
index 4f35557..d132494 100644
--- a/src/@orb.yml
+++ b/src/@orb.yml
@@ -1,9 +1,12 @@
 version: 2.1
 
 description: |
-  An orb for running OWASP vulnerability checks through command-line or tasks configured in Gradle and Maven builds.
+  An orb for running OWASP vulnerability checks through command-line or
+  tasks configured in Gradle and Maven builds.
   Reports are persisted as artifacts under the directory 'Report/OWASP'.
-  Source: https://github.com/entur/owasp-orb
+  For Gradle and Maven, additional dependency caching is available for
+  improved run times.
+  Source: https://github.com/entur/owasp-orb.
 
 examples:
   gradle:
@@ -55,8 +58,8 @@ examples:
                 arguments: "--scan ./ --failOnCVSS 7 --suppression ./dependency-check-suppressions.xml"
 
 orbs:
-  gradle: circleci/gradle@1.0.11
-  maven: circleci/maven@0.0.11
+  gradle: entur/gradle-orb@dev:testing
+  maven: entur/maven-orb@dev:testing
 
 executors:
   default:
@@ -92,23 +95,24 @@ aliases:
     steps:
       - checkout
       - gradle/with_cache:
+          cache_key: << parameters.cache_key >>
           steps:
             - generate_cache_keys:
-                cache_key: gradle-<< parameters.cache_key >>-cache-key-v6
+                cache_key: gradle-owasp-<< parameters.cache_key >>-cache-key-v6
             - restore_owasp_cache
             - run:
                 name: Update OWASP Dependency-Check Database
-                command: ./gradlew dependencyCheckUpdate --info
+                command: ./gradlew dependencyCheckUpdate --info --no-daemon
             - store_owasp_cache:
                 cve_data_directory: <<parameters.cve_data_directory>>
             - run:
                 name: Run OWASP Dependency-Check Analyzer
-                command: ./gradlew <<parameters.task>> --info
+                command: ./gradlew <<parameters.task>> --info --no-daemon
             - run:
                 # note: Also run purge so so that vulernability data is not cached twice.
                 # Run in seperate step so not run for each submodule.
                 name: OWASP Dependency-Check cache cleanup
-                command: ./gradlew dependencyCheckPurge --info
+                command: ./gradlew dependencyCheckPurge --info --no-daemon
             - collect_reports:
                 persist_to_workspace: <<parameters.persist_to_workspace>>
 
@@ -291,9 +295,10 @@ jobs:
       - checkout
       - maven/with_cache:
           settings_file: << parameters.settings_file >>
+          cache_key: << parameters.cache_key >>
           steps:
             - generate_cache_keys:
-                cache_key: maven-<< parameters.cache_key >>-cache-key-v6
+                cache_key: maven-owasp-<< parameters.cache_key >>-cache-key-v6
             - restore_owasp_cache
             - run:
                 name: Update OWASP Dependency-Check Database
@@ -347,7 +352,7 @@ jobs:
           cache_key: << parameters.cache_key >>
           steps:
             - generate_cache_keys:
-                cache_key: commmandline-<< parameters.cache_key >>-cache-key-v6
+                cache_key: commmandline-owasp-<< parameters.cache_key >>-cache-key-v6
             - restore_owasp_cache
             - run:
                 name: Update OWASP Dependency-Check Database