diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0a02071a..3c42dfeb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,8 +14,8 @@ release:
   script:
     - |
       cd $CI_PROJECT_DIR
-      for i in $(git show --pretty="" --name-only | grep '^[^/]*/chart/Chart.yaml' | cut -d/ -f1); do
-        pack=$(helm package $i/chart | sed 's/Success.*: \(.*\)/\1/')
+      for i in $(git show --pretty="" --name-only | grep '^charts/.*/Chart.yaml' | cut -d/ -f2); do
+        pack=$(helm package ./charts/$i | sed 's/Success.*: \(.*\)/\1/')
         if [ ! -z $pack ]; then
           chart=$(basename $pack)
           curl --request POST \
@@ -33,8 +33,8 @@ rebuild:
   script:
     - |
       cd $CI_PROJECT_DIR
-      for i in $(find -maxdepth 3 -name Chart.yaml | cut -d/ -f2); do
-        pack=$(helm package $i/chart | sed 's/Success.*: \(.*\)/\1/')
+      for i in $(find ./charts -maxdepth 2 -name Chart.yaml | cut -d/ -f3); do
+        pack=$(helm package ./charts/$i | sed 's/Success.*: \(.*\)/\1/')
         if [ ! -z $pack ]; then
           chart=$(basename $pack)
           curl --request POST \