diff --git a/.github/workflows/main-deploy.yaml b/.github/workflows/main-deploy.yaml
index ebc4696d..f378c7a8 100644
--- a/.github/workflows/main-deploy.yaml
+++ b/.github/workflows/main-deploy.yaml
@@ -46,23 +46,27 @@ jobs:
         role-session-name: ${{ inputs.role_session_name }}
         aws-region: ${{ inputs.aws_region }}
 
+    - name: Create Parameters file
+      run: echo '${{ inputs.helm_values }}' > parameters.json
+
     - name: Deploy
       uses: vimeda/helm@v1.6.8
       with:
         helm: helm3
         chart: lykon-charts/lykon-service
-        chart-version: "0.10.4"
+        chart-version: "0.10.1"
         track: stable
         version: ${{ github.sha }}
         token: ${{ github.token }}
         secrets: ${{ toJSON(secrets) }}
-        value-files: ${{ inputs.helm_value_files }}
+        value-files: '[
+          ${{ inputs.helm_values_files }},
+          "./parameters.json"]'
         repo: ${{ secrets.CHARTMUSEUM_REPO }}
         repo-alias: lykon-charts
         repo-username: ${{ secrets.CHARTMUSEUM_USERNAME }}
         repo-password: ${{ secrets.CHARTMUSEUM_PASSWORD }}
         release: ${{ inputs.release_name }}
         namespace: ${{ inputs.namespace }}
-        values: ${{ inputs.helm_values }}
       env:
         KUBECONFIG_FILE: ${{ secrets.STAGING_KUBECONFIG }}
diff --git a/.github/workflows/main-terraform.yaml b/.github/workflows/main-terraform.yaml
index 3c7d2e25..d85777b8 100644
--- a/.github/workflows/main-terraform.yaml
+++ b/.github/workflows/main-terraform.yaml
@@ -13,6 +13,9 @@ on:
       working_directory:
         required: true
         type: string
+      staging_tfvars_json:
+        required: true
+        type: string
 
 permissions:
   id-token: write
@@ -41,11 +44,8 @@ jobs:
           role-session-name: ${{ inputs.role_session_name }}
           aws-region: ${{ inputs.aws_region }}
 
-      - name: Download Staging Variables
-        uses: actions/download-artifact@v3
-        with:
-          name: staging-variables
-          path: ${{ inputs.working_directory }}
+      - name: Create Parameters file
+        run: echo '${{ inputs.staging_tfvars_json }}' > staging.tfvars.json
 
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v2
diff --git a/.github/workflows/release-deploy.yaml b/.github/workflows/release-deploy.yaml
index 66c63f2d..68d25ced 100644
--- a/.github/workflows/release-deploy.yaml
+++ b/.github/workflows/release-deploy.yaml
@@ -46,23 +46,27 @@ jobs:
         role-session-name: ${{ inputs.role_session_name }}
         aws-region: ${{ inputs.aws_region }}
 
+    - name: Create Parameters file
+      run: echo '${{ inputs.helm_values }}' > parameters.json
+
     - name: Deploy
       uses: vimeda/helm@v1.6.8
       with:
         helm: helm3
         chart: lykon-charts/lykon-service
-        chart-version: "0.10.4"
+        chart-version: "0.10.1"
         track: stable
         version: ${{ github.sha }}
         token: ${{ github.token }}
         secrets: ${{ toJSON(secrets) }}
-        value-files: ${{ inputs.helm_value_files }}
+        value-files: '[
+          ${{ inputs.helm_values_files }},
+          "./parameters.json"]'
         repo: ${{ secrets.CHARTMUSEUM_REPO }}
         repo-alias: lykon-charts
         repo-username: ${{ secrets.CHARTMUSEUM_USERNAME }}
         repo-password: ${{ secrets.CHARTMUSEUM_PASSWORD }}
         release: ${{ inputs.release_name }}
         namespace: ${{ inputs.namespace }}
-        values: ${{ inputs.helm_values }}
       env:
         KUBECONFIG_FILE: ${{ secrets.PROD_KUBECONFIG }}
diff --git a/.github/workflows/release-terraform.yaml b/.github/workflows/release-terraform.yaml
index 36b15405..0b83452d 100644
--- a/.github/workflows/release-terraform.yaml
+++ b/.github/workflows/release-terraform.yaml
@@ -13,6 +13,9 @@ on:
       working_directory:
         required: true
         type: string
+      prod_tfvars_json:
+        required: true
+        type: string
 
 permissions:
   id-token: write
@@ -41,11 +44,8 @@ jobs:
           role-session-name: ${{ inputs.role_session_name }}
           aws-region: ${{ inputs.aws_region }}
 
-      - name: Download Prod Variables
-        uses: actions/download-artifact@v3
-        with:
-          name: prod-variables
-          path: ${{ inputs.working_directory }}
+      - name: Create Parameters file
+        run: echo '${{ inputs.prod_tfvars_json }}' > prod.tfvars.json
 
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v2
@@ -60,5 +60,5 @@ jobs:
         id: apply-prod
         run: terraform apply -no-color -var-file=prod.tfvars.json
         env:
-          TF_WORKSPACE: staging
+          TF_WORKSPACE: prod
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}