diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml
index 1e357cf2..6b2a2b5d 100644
--- a/.github/actions/run-tests/action.yml
+++ b/.github/actions/run-tests/action.yml
@@ -4,29 +4,29 @@ description: Runs Unit and Integration Test. Tests will be executed on a Databro
 inputs:
   upload-test-reports:
     description: "Uploads the resulting test reports if enabled"
-    required: false
     default: 'false'
   upload-code-coverage-reports:
     description: "Executes Code Coverage Generation and uploads the resulting reports if enabled"
-    required: false
     default: 'false'
   databroker-version:
     description: "Databroker Version"
-    required: false
     default: 'master'
+  kotest-tag:
+    description: >
+      The Kotest Tag to use when executing the tests. Check Tag.kt for valid options. Different Tags might require the
+      Databroker to be started in a different mode. Currently only unsecured mode (no tls, no authentication) is
+      supported.
+    default: '!CustomDatabroker'
 
 runs:
   using: "composite"
   steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-
     - name: "Run Docker Container of Databroker in detached mode"
       run: docker run --pull=always --rm --publish 55556:55556/tcp --detach --name databroker ghcr.io/eclipse/kuksa.val/databroker:${{ inputs.databroker-version }} --port 55556 --insecure
       shell: bash
 
     - name: Run 'test' with Gradle Wrapper
-      run: ./gradlew test -Dkotest.tags="!CustomDatabroker"
+      run: ./gradlew test -Dkotest.tags="${{ inputs.kotest-tag}}"
       shell: bash
 
     - name: Upload Test Reports