diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 53ba8e86..1814fc31 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -18,7 +18,6 @@
 #* SPDX-License-Identifier: Apache-2.0
 #********************************************************************************
 
-
 name: build
 
 # Controls when the workflow will run
@@ -38,10 +37,8 @@ on:
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: catenax-ng/tx-managed-service-orchestrator/autosetup
-  # Allows you to run this workflow manually from the Actions tab
- 
+  IMAGE_NAMESPACE: "tractusx"
+  IMAGE_NAME: "sdfactory"
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -63,7 +60,9 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+            ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
+          # Automatically prepare image tags; See action docs for more examples. 
+          # semver patter will generate tags like these for example :1 :1.2 :1.2.3
           tags: |
             type=ref,event=branch
             type=ref,event=pr
@@ -73,18 +72,31 @@ jobs:
           flavor: |
               latest=true
 
-      - name: Log into registry ${{ env.REGISTRY }}
+      - name: DockerHub login
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v2
         with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          # Use existing DockerHub credentials present as secrets
+          username: ${{ secrets.DOCKER_HUB_USER }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
 
       - name: Build and push
         uses: docker/build-push-action@v3
         with:
           context: .
+          # Build image for verification purposes on every trigger event. Only push if event is not a PR
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+
+      # https://github.com/peter-evans/dockerhub-description
+      # Important step to push image description to DockerHub 
+      - name: Update Docker Hub description
+        if: github.event_name != 'pull_request'
+        uses: peter-evans/dockerhub-description@v3
+        with:
+        # readme-filepath defaults to toplevel README.md, Only necessary if you have a dedicated file with your 'Notice for docker images'   
+        # readme-filepath: path/to/dedicated/notice-for-docker-image.md 
+          username: ${{ secrets.DOCKER_HUB_USER }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+          repository: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39b207d6..b81e74b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ## [Unreleased]
  - NA
 
+## [1.4.0] - 2023-08-17
+
+### Fixed
+ - Security issue fixed
+ 
 ## [1.3.9] - 2023-08-14
 
 ### Added
diff --git a/README.md b/README.md
index ebf68053..bcc7fcbb 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,8 @@ This service will help service provider to set up DFT/SDE with EDC and EDC as se
 ### Software Version
 
 ```shell
-Application version: 1.3.9
-Helm release version: 1.3.9
+Application version: 1.4.0
+Helm release version: 1.4.0
 ```
 
 ### Container images
diff --git a/charts/orchestrator/Chart.yaml b/charts/orchestrator/Chart.yaml
index 2e9aa839..f0746311 100644
--- a/charts/orchestrator/Chart.yaml
+++ b/charts/orchestrator/Chart.yaml
@@ -38,13 +38,13 @@ sources:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.3.9
+version: 1.4.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.3.9"
+appVersion: "1.4.0"
 
 dependencies:
   - condition: postgresql.enabled
diff --git a/charts/orchestrator/README.md b/charts/orchestrator/README.md
index d81d009d..b6874f44 100644
--- a/charts/orchestrator/README.md
+++ b/charts/orchestrator/README.md
@@ -1,6 +1,6 @@
 # autosetup
 
-![Version: 1.3.9](https://img.shields.io/badge/Version-1.3.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.9](https://img.shields.io/badge/AppVersion-1.3.9-informational?style=flat-square)
+![Version: 1.4.0](https://img.shields.io/badge/Version-1.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.0](https://img.shields.io/badge/AppVersion-1.4.0-informational?style=flat-square)
 
 This service will help service provider to set up DFT/SDE with EDC and EDC as service in service provider environment.
 
diff --git a/pom.xml b/pom.xml
index b283a4ed..d87a7978 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 	</parent>
 	<groupId>org.eclipse.tractusx</groupId>
 	<artifactId>auto-setup</artifactId>
-	<version>1.3.9</version>
+	<version>1.4.0</version>
 	<name>auto-setup</name>
 	<description>auto-setup</description>
 	<properties>