diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 828790fda54d9e3dc3b69d83f89f02f3257e27e0..79ed2ab8494ed87cffc3a51c00921da545c16d27 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,54 +1,16 @@
-image:
-  name: alpine/helm:3.7.1
-  entrypoint: ["/bin/sh", "-c"]
+include:
+  - remote: https://open.greenhost.net/stackspin/stackspin/-/raw/main/.gitlab/ci_templates/helm_package.yml
+  - template: 'Workflows/MergeRequest-Pipelines.gitlab-ci.yml'
 
 stages:
   - lint-helm-chart
   - package-helm-chart
   - release-helm-chart
 
-# Only package a new chart once the version number has been updated
-.chart_release_rules:
-  rules:
-    - changes:
-      - Chart.yaml
+variables:
+  CHART_NAME: nextcloud-onlyoffice
 
+# Override allow_failure because this chart does not lint yet
+# (https://open.greenhost.net/stackspin/nextcloud/-/issues/1000)
 lint-helm:
-  stage: lint-helm-chart
-  script:
-    - helm dep update
-    - helm lint .
-  artifacts:
-    paths:
-      - 'charts/**'
-    expire_in: 1 week
-    # Even if lint fails, upload the charts/ folder as artifact
-    when: always
   allow_failure: true
-  rules:
-    - changes:
-      - '*.yaml'
-      - templates/*.yaml
-
-package-chart:
-  stage: package-helm-chart
-  script:
-    - helm package .
-  artifacts:
-    paths:
-      - nextcloud-onlyoffice-*
-    expire_in: 1 week
-  extends:
-    - .chart_release_rules
-
-# Push helm chart. Charts on the `main` branch are pushed to `stable`, others
-# are pushed to the `unstable` channel.
-release-helm:
-  image: "rancher/curlimages-curl:7.73.0"
-  stage: release-helm-chart
-  script:
-    - if [ "$CI_COMMIT_BRANCH" == "main" ]; then export HELM_CHANNEL='stable'; else export HELM_CHANNEL='unstable'; fi
-    - export CHART_FILE=$(ls nextcloud-onlyoffice-*.tgz)
-    - curl --request POST --user gitlab-ci-token:$CI_JOB_TOKEN --form "chart=@${CHART_FILE}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/helm/api/${HELM_CHANNEL}/charts"
-  extends:
-    - .chart_release_rules
diff --git a/Chart.yaml b/Chart.yaml
index 449634bc573cc8d3b25127a2c4c16f5adff358d2..b73b656018f8305e54d4360fd67a287ea9669cf9 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 description: |
   A helm chart for installing NextCloud and setting up ONLYOFFICE integration
 name: nextcloud-onlyoffice
-version: 0.5.3
+version: 0.5.4
 appVersion: NC-20.0.11-OO-6.2.2.21
 icon: https://cdn.rawgit.com/docker-library/docs/defa5ffc7123177acd60ddef6e16bddf694cc35f/nextcloud/logo.svg
 dependencies: