diff --git a/.github/workflows/helm-chart-test.yaml b/.github/workflows/helm-chart-test.yaml
index 9b82e6cc..59232017 100644
--- a/.github/workflows/helm-chart-test.yaml
+++ b/.github/workflows/helm-chart-test.yaml
@@ -82,7 +82,7 @@ jobs:
           helm repo add pgadmin4 https://helm.runix.net
           helm repo add bitnami https://charts.bitnami.com/bitnami
           helm repo add tractusx-dev https://eclipse-tractusx.github.io/charts/dev
-          helm install country-risk tractusx-dev/country-risk --version ${{ github.event.inputs.upgrade_from  }}
+          helm install country-risk tractusx-dev/country-risk --version ${{ github.event.inputs.upgrade_from || '1.1.0' }}
           helm dependency update charts/country-risk
           helm upgrade country-risk charts/country-risk
         if: github.event_name != 'pull_request' || steps.list-changed.outputs.changed == 'true'
\ No newline at end of file
diff --git a/charts/country-risk/Chart.yaml b/charts/country-risk/Chart.yaml
index ce103117..b919a7ef 100644
--- a/charts/country-risk/Chart.yaml
+++ b/charts/country-risk/Chart.yaml
@@ -20,7 +20,7 @@
 apiVersion: v2
 name: country-risk
 type: application
-version: 3.0.3
+version: 3.0.4
 appVersion: "1.2.1"
 description: A Helm chart for deploying the Country Risk service
 home: https://github.com/eclipse-tractusx/vas-country-risk-frontend
diff --git a/charts/country-risk/values.yaml b/charts/country-risk/values.yaml
index 1c48b236..a5a333d1 100644
--- a/charts/country-risk/values.yaml
+++ b/charts/country-risk/values.yaml
@@ -22,14 +22,6 @@
 country-risk-frontend:
   replicaCount: 1
 
-  image:
-    registry: "tractusx"
-    # -- Name of the docker image
-    name: "vas-country-risk"
-    pullPolicy: Always
-    # -- Overrides the image tag whose default is the chart appVersion.
-    tag: ""
-
   certificate:
     # -- Hostname for the certificate
     host: "frontend.countryrisk.example.net"
@@ -154,13 +146,6 @@ country-risk-frontend:
 country-risk-backend:
 
   replicaCount: 1
-  image:
-    registry: "tractusx"
-    # -- Name of the docker image
-    name: "vas-country-risk-backend"
-    pullPolicy: Always
-    # -- Overrides the image tag whose default is the chart appVersion.
-    tag: ""
 
   certificate:
     # -- Hostname for the certificate