diff --git a/pipelines/golang.yml b/pipelines/golang.yml
index 9414fef..c2f606d 100644
--- a/pipelines/golang.yml
+++ b/pipelines/golang.yml
@@ -34,12 +34,19 @@ docker:
   stage: publish
   needs:
     - job: gobuild
-      artifacts: true  
-  only:
-    - main
+      artifacts: true
+    - job: version
+      artifacts: true        
+  rules:
+    - if: $CI_COMMIT_REF_NAME == 'main'
 
 helm:
   extends: .helm-createchart
   stage: publish
-  only:
-    - main 
\ No newline at end of file
+  needs:
+    - job: gobuild
+      artifacts: false
+    - job: version
+      artifacts: true      
+  rules:
+    - if: $CI_COMMIT_REF_NAME == 'main'
\ No newline at end of file
diff --git a/templates/docker.tpl.yml b/templates/docker.tpl.yml
index 8b869a8..078fc9a 100644
--- a/templates/docker.tpl.yml
+++ b/templates/docker.tpl.yml
@@ -10,6 +10,4 @@
   script:
     - ./scripts/docker-login.sh
     - ./scripts/docker-build.sh
-  needs:
-    - job: version
-      artifacts: true
+
diff --git a/templates/helm.tpl.yml b/templates/helm.tpl.yml
index 9975b72..e96c621 100644
--- a/templates/helm.tpl.yml
+++ b/templates/helm.tpl.yml
@@ -4,6 +4,3 @@
     - ./scripts/helm-addrepo.sh
     - ./scripts/helm-package.sh
     - ./scripts/helm-push.sh
-  needs:
-    - job: version
-      artifacts: true