diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml
index f06c295..e5d8472 100644
--- a/.gitea/workflows/release.yaml
+++ b/.gitea/workflows/release.yaml
@@ -22,6 +22,10 @@ on:
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
+    env:
+      REGISTRY: ${{ inputs.registry }}
+      HELM_USER: ${{ secrets.CI_BOT_USERNAME }}
+      HELM_PASS: ${{ secrets.CI_BOT_TOKEN }}
     steps:
       # Checkout repo
       - name: Checkout repository
@@ -43,16 +47,14 @@ jobs:
       # Login to OCI registry
       - name: Helm OCI Login
         run: |
-          echo "${{ secrets.CI_BOT_TOKEN }}" | helm registry login ${{ inputs.registry }} \
-            --username ${{ secrets.CI_BOT_USERNAME }} \
+          echo "$HELM_PASS" | helm registry login "$REGISTRY" \
+            --username "$HELM_USER" \
             --password-stdin
 
       # Package Helm chart
       - name: Package Helm Chart
-        run: |
-          helm package ${{ inputs.chart-path }}
+        run: helm package ${{ inputs.chart-path }}
 
       # Push chart to OCI registry
       - name: Push Helm Chart
-        run: |
-          helm push ${chart_name}-${chart_version}.tgz oci://${{ inputs.registry }}
\ No newline at end of file
+        run: helm push ${chart_name}-${chart_version}.tgz oci://$REGISTRY
\ No newline at end of file
diff --git a/release.yaml b/release.yaml
deleted file mode 100644
index f06c295..0000000
--- a/release.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-name: Helm OCI CI
-
-on:
-  workflow_call:
-    inputs:
-      chart-path:
-        description: "Path to the Helm chart directory"
-        required: false
-        default: "./helm"
-        type: string
-      registry:
-        description: "OCI registry URL"
-        required: false
-        default: "gitea.lulz.ltd/helm"
-        type: string
-    secrets:
-      CI_BOT_USERNAME:
-        required: true
-      CI_BOT_TOKEN:
-        required: true
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    steps:
-      # Checkout repo
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      # Install Helm
-      - name: Set up Helm
-        uses: azure/setup-helm@v4
-
-      # Extract chart name & version
-      - name: Get Chart Info
-        id: chart
-        run: |
-          NAME=$(helm show chart ${{ inputs.chart-path }} | grep '^name:' | awk '{print $2}')
-          VERSION=$(helm show chart ${{ inputs.chart-path }} | grep '^version:' | awk '{print $2}')
-          echo "chart_name=$NAME" >> $GITHUB_ENV
-          echo "chart_version=$VERSION" >> $GITHUB_ENV
-
-      # Login to OCI registry
-      - name: Helm OCI Login
-        run: |
-          echo "${{ secrets.CI_BOT_TOKEN }}" | helm registry login ${{ inputs.registry }} \
-            --username ${{ secrets.CI_BOT_USERNAME }} \
-            --password-stdin
-
-      # Package Helm chart
-      - name: Package Helm Chart
-        run: |
-          helm package ${{ inputs.chart-path }}
-
-      # Push chart to OCI registry
-      - name: Push Helm Chart
-        run: |
-          helm push ${chart_name}-${chart_version}.tgz oci://${{ inputs.registry }}
\ No newline at end of file