diff --git a/pom.xml b/pom.xml
index 8bc6e814a0..ad3f0abd98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -675,6 +675,7 @@
             <exclude>*.ini</exclude>
             <exclude>*.mustache</exclude>
             <exclude>*.smp</exclude>
+            <exclude>*.tpl</exclude>
             <exclude>*.txt</exclude>
             <exclude>mvnw</exclude>
             <exclude>mvnw.cmd</exclude>
diff --git a/scm-packaging/helm/pom.xml b/scm-packaging/helm/pom.xml
new file mode 100644
index 0000000000..3a7fc3ca4f
--- /dev/null
+++ b/scm-packaging/helm/pom.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    MIT License
+
+    Copyright (c) 2020-present Cloudogu GmbH and Contributors
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>sonia.scm.packaging</groupId>
+    <artifactId>scm-packaging</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>helm</artifactId>
+  <packaging>helm</packaging>
+  <version>2.0.0-SNAPSHOT</version>
+
+  <properties>
+    <helm.version>3.2.0</helm.version>
+  </properties>
+
+  <build>
+    <plugins>
+
+      <plugin>
+        <groupId>org.codehaus.gmavenplus</groupId>
+        <artifactId>gmavenplus-plugin</artifactId>
+        <version>1.9.0</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+            <version>3.0.3</version>
+            <type>pom</type>
+            <scope>runtime</scope>
+          </dependency>
+        </dependencies>
+        <executions>
+          <execution>
+            <id>add-helm-url</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>execute</goal>
+            </goals>
+            <configuration>
+              <scripts>
+                <script>
+                  <![CDATA[
+                  String os = System.getProperty("os.name").toLowerCase()
+                  if (os.startsWith("mac")){
+                    os = "darwin"
+                  }
+                  project.properties.setProperty('helm.os', os)
+
+                  String arch = System.getProperty("os.arch").toLowerCase()
+                  if ("x86_64".equals(arch)) {
+                    arch = "amd64"
+                  }
+                  project.properties.setProperty('helm.arch', arch)
+                  ]]>
+                </script>
+              </scripts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <id>copy-resources</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${basedir}/target/chart</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>src/main/chart</directory>
+                  <filtering>false</filtering>
+                  <excludes>
+                    <exclude>values.yaml</exclude>
+                  </excludes>
+                </resource>
+                <resource>
+                  <directory>src/main/chart</directory>
+                  <filtering>true</filtering>
+                  <includes>
+                    <include>values.yaml</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>com.kiwigrid</groupId>
+        <artifactId>helm-maven-plugin</artifactId>
+        <version>5.4</version>
+        <extensions>true</extensions>
+        <configuration>
+          <chartDirectory>${project.basedir}/target/chart</chartDirectory>
+          <chartVersion>${project.version}</chartVersion>
+          <autoDetectLocalHelmBinary>false</autoDetectLocalHelmBinary>
+          <appVersion>${project.version}</appVersion>
+          <helmDownloadUrl>https://get.helm.sh/helm-v${helm.version}-${helm.os}-${helm.arch}.tar.gz</helmDownloadUrl>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
+
+</project>
diff --git a/deployments/helm/.helmignore b/scm-packaging/helm/src/main/chart/.helmignore
similarity index 100%
rename from deployments/helm/.helmignore
rename to scm-packaging/helm/src/main/chart/.helmignore
diff --git a/deployments/helm/Chart.yaml b/scm-packaging/helm/src/main/chart/Chart.yaml
similarity index 100%
rename from deployments/helm/Chart.yaml
rename to scm-packaging/helm/src/main/chart/Chart.yaml
diff --git a/deployments/helm/templates/NOTES.txt b/scm-packaging/helm/src/main/chart/templates/NOTES.txt
similarity index 100%
rename from deployments/helm/templates/NOTES.txt
rename to scm-packaging/helm/src/main/chart/templates/NOTES.txt
diff --git a/deployments/helm/templates/_helpers.tpl b/scm-packaging/helm/src/main/chart/templates/_helpers.tpl
similarity index 100%
rename from deployments/helm/templates/_helpers.tpl
rename to scm-packaging/helm/src/main/chart/templates/_helpers.tpl
diff --git a/deployments/helm/templates/configmap.yaml b/scm-packaging/helm/src/main/chart/templates/configmap.yaml
similarity index 100%
rename from deployments/helm/templates/configmap.yaml
rename to scm-packaging/helm/src/main/chart/templates/configmap.yaml
diff --git a/deployments/helm/templates/deployment.yaml b/scm-packaging/helm/src/main/chart/templates/deployment.yaml
similarity index 100%
rename from deployments/helm/templates/deployment.yaml
rename to scm-packaging/helm/src/main/chart/templates/deployment.yaml
diff --git a/deployments/helm/templates/ingress.yaml b/scm-packaging/helm/src/main/chart/templates/ingress.yaml
similarity index 100%
rename from deployments/helm/templates/ingress.yaml
rename to scm-packaging/helm/src/main/chart/templates/ingress.yaml
diff --git a/deployments/helm/templates/pvc.yaml b/scm-packaging/helm/src/main/chart/templates/pvc.yaml
similarity index 100%
rename from deployments/helm/templates/pvc.yaml
rename to scm-packaging/helm/src/main/chart/templates/pvc.yaml
diff --git a/deployments/helm/templates/scripts.yaml b/scm-packaging/helm/src/main/chart/templates/scripts.yaml
similarity index 100%
rename from deployments/helm/templates/scripts.yaml
rename to scm-packaging/helm/src/main/chart/templates/scripts.yaml
diff --git a/deployments/helm/templates/service.yaml b/scm-packaging/helm/src/main/chart/templates/service.yaml
similarity index 100%
rename from deployments/helm/templates/service.yaml
rename to scm-packaging/helm/src/main/chart/templates/service.yaml
diff --git a/deployments/helm/values.yaml b/scm-packaging/helm/src/main/chart/values.yaml
similarity index 85%
rename from deployments/helm/values.yaml
rename to scm-packaging/helm/src/main/chart/values.yaml
index 84561cd619..9dc2d9db95 100644
--- a/deployments/helm/values.yaml
+++ b/scm-packaging/helm/src/main/chart/values.yaml
@@ -29,15 +29,10 @@
 # replicaCount: 1
 
 image:
-  repository: cloudogu/scm-manager
-  # TODO change after release, to something more stable
-  tag: latest
+  repository: scmmanager/scm-manager
+  tag: ${project.version}
   pullPolicy: Always
 
-# plugins:
-#  - name: scm-review-plugin
-#    url: https://oss.cloudogu.com/jenkins/job/scm-manager/job/scm-manager-bitbucket/job/scm-review-plugin/job/develop/lastSuccessfulBuild/artifact/target/scm-review-plugin-2.0.0-SNAPSHOT.smp
-
 nameOverride: ""
 fullnameOverride: ""
 
@@ -72,19 +67,19 @@ persistence:
   ##
   # storageClass: "-"
   accessMode: ReadWriteOnce
-  size: 12Gi
+  size: 40Gi
 
-resources:
+resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  limits:
-    cpu: 2000m
-    memory: 2048Mi
-  requests:
-    cpu: 50m
-    memory: 256Mi
+  #limits:
+  #  cpu: 2000m
+  #  memory: 2048Mi
+  #requests:
+  #  cpu: 50m
+  #  memory: 256Mi
 
 nodeSelector: {}
 
diff --git a/scm-packaging/pom.xml b/scm-packaging/pom.xml
index 972fe84ec2..4a593d2f81 100644
--- a/scm-packaging/pom.xml
+++ b/scm-packaging/pom.xml
@@ -45,6 +45,7 @@
     <module>unix</module>
     <module>windows</module>
     <module>docker</module>
+    <module>helm</module>
   </modules>
 
 </project>
diff --git a/scm-packaging/unix/pom.xml b/scm-packaging/unix/pom.xml
index 32ae14ad7e..5c41717a2b 100644
--- a/scm-packaging/unix/pom.xml
+++ b/scm-packaging/unix/pom.xml
@@ -91,7 +91,6 @@
         </executions>
       </plugin>
 
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>