diff --git a/.gitea/workflows/build-java.yaml b/.gitea/workflows/build-java.yaml
index 2be998f..0a6b279 100644
--- a/.gitea/workflows/build-java.yaml
+++ b/.gitea/workflows/build-java.yaml
@@ -1,13 +1,3 @@
-#
-# 
-# Build workflow for all modules of captica.expert
-# 
-# Project: workflows
-# Author: Marc Böhm <marc.boehm@captica.de>
-# License: MIT License (see LICENSE.md)
-# 
-# Copyright (c) captica GmbH est. 2021
-#
 name: Java build workflow for captica.expert modules
 on:
   workflow_call:
diff --git a/.gitea/workflows/publish-docker-springboot.yaml b/.gitea/workflows/publish-docker-springboot.yaml
index 8c3e791..e3db9e1 100644
--- a/.gitea/workflows/publish-docker-springboot.yaml
+++ b/.gitea/workflows/publish-docker-springboot.yaml
@@ -1,13 +1,3 @@
-#
-#
-# Publish docker workflow for all modules of captica.expert
-#
-# Project: workflows
-# Author: Marc Böhm <marc.boehm@captica.de>
-# License: MIT License (see LICENSE.md)
-#
-# Copyright (c) captica GmbH est. 2021
-#
 name: Publish docker workflow for captica.expert modules
 on:
   workflow_call:
@@ -42,7 +32,7 @@ jobs:
           push: true
           tags: "${{ vars.CONTAINER_REGISTRY_URL }}/${{gitea.repository}}:latest"
           build-args: |
-            FILE_BINARY=${{ env.CAPTICA_APPLICATION_FILE_BINARY }}
-            NAME_APPLICATION=${{ env.CAPTICA_APPLICATION_NAME }}
-            PORT_EXPOSURE=${{ env.CAPTICA_APPLICATION_PORT }}
-            JAVA_VERSION=${{ env.CAPTICA_APPLICATION_JAVA_VERSION }}
\ No newline at end of file
+            FILE_BINARY=${{ env.APPLICATION_FILE_BINARY }}
+            NAME_APPLICATION=${{ env.APPLICATION_NAME }}
+            PORT_EXPOSURE=${{ env.APPLICATION_PORT }}
+            JAVA_VERSION=${{ env.APPLICATION_JAVA_VERSION }}
\ No newline at end of file
diff --git a/gradle/build-version.gradle b/gradle/build-version.gradle
index 34db1bd..6a579af 100644
--- a/gradle/build-version.gradle
+++ b/gradle/build-version.gradle
@@ -1,13 +1,3 @@
-/*
- * Enables version handling on build process
- * 
- * Project: gradle
- * Author: Marc Böhm <marc.boehm@captica.de>
- * License: MIT License (see LICENSE.md)
- * 
- * Copyright (c) captica GmbH est. 2021
- */
-
 // Load external plugins
 buildscript {
     repositories {
@@ -52,18 +42,18 @@ task writeVersionFile() {
 #!/bin/sh
 
 # Default env vars
-export CAPTICA_APPLICATION_VERSION=${version}
-export CAPTICA_APPLICATION_NAME=${project.name}
-export CAPTICA_APPLICATION_FILE_BINARY=${bootJar.archiveFileName.get()}
-export CAPTICA_APPLICATION_PORT=${applicationPort}
-export CAPTICA_APPLICATION_JAVA_VERSION=${java.sourceCompatibility}
+export APPLICATION_VERSION=${version}
+export APPLICATION_NAME=${project.name}
+export APPLICATION_FILE_BINARY=${bootJar.archiveFileName.get()}
+export APPLICATION_PORT=${applicationPort}
+export APPLICATION_JAVA_VERSION=${java.sourceCompatibility}
 
 # Gitea/Github specific env variables
-echo "CAPTICA_APPLICATION_VERSION=\$CAPTICA_APPLICATION_VERSION" >> \$GITHUB_ENV
-echo "CAPTICA_APPLICATION_FILE_BINARY=\$CAPTICA_APPLICATION_FILE_BINARY" >> \$GITHUB_ENV
-echo "CAPTICA_APPLICATION_NAME=\$CAPTICA_APPLICATION_NAME" >> \$GITHUB_ENV
-echo "CAPTICA_APPLICATION_PORT=\$CAPTICA_APPLICATION_PORT" >> \$GITHUB_ENV
-echo "CAPTICA_APPLICATION_JAVA_VERSION=\$CAPTICA_APPLICATION_JAVA_VERSION" >> \$GITHUB_ENV
+echo "APPLICATION_VERSION=\$APPLICATION_VERSION" >> \$GITHUB_ENV
+echo "APPLICATION_FILE_BINARY=\$APPLICATION_FILE_BINARY" >> \$GITHUB_ENV
+echo "APPLICATION_NAME=\$APPLICATION_NAME" >> \$GITHUB_ENV
+echo "APPLICATION_PORT=\$APPLICATION_PORT" >> \$GITHUB_ENV
+echo "APPLICATION_JAVA_VERSION=\$APPLICATION_JAVA_VERSION" >> \$GITHUB_ENV
 """
 	}    
 }