diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..762752c
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,5 @@
+draft.toml
+charts/
+NOTICE
+LICENSE
+README.md
\ No newline at end of file
diff --git a/.helmignore b/.helmignore
new file mode 100644
index 0000000..747e6e9
--- /dev/null
+++ b/.helmignore
@@ -0,0 +1,27 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+*.png
+
+# known compile time folders
+target/
+node_modules/
+vendor/
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..d008962
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,14 @@
+FROM openjdk:8-jdk-slim
+ENV PORT 8080
+ENV CLASSPATH /opt/lib
+EXPOSE 8080
+
+# copy pom.xml and wildcards to avoid this command failing if there's no target/lib directory
+COPY pom.xml target/lib* /opt/lib/
+
+# NOTE we assume there's only 1 jar in the target dir
+# but at least this means we don't have to guess the name
+# we could do with a better way to know the name - or to always create an app.jar or something
+COPY target/*.jar /opt/app.jar
+WORKDIR /opt
+CMD ["java", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000..978b9d6
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,98 @@
+pipeline {
+    agent {
+      label "jenkins-maven"
+    }
+    environment {
+      ORG               = 'snoopdave'
+      APP_NAME          = 'rollarcus'
+      CHARTMUSEUM_CREDS = credentials('jenkins-x-chartmuseum')
+    }
+    stages {
+      stage('CI Build and push snapshot') {
+        when {
+          branch 'PR-*'
+        }
+        environment {
+          PREVIEW_VERSION = "0.0.0-SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER"
+          PREVIEW_NAMESPACE = "$APP_NAME-$BRANCH_NAME".toLowerCase()
+          HELM_RELEASE = "$PREVIEW_NAMESPACE".toLowerCase()
+        }
+        steps {
+          container('maven') {
+            sh "mvn versions:set -DnewVersion=$PREVIEW_VERSION"
+            sh "mvn install"
+            sh 'export VERSION=$PREVIEW_VERSION && skaffold build -f skaffold.yaml'
+
+
+            sh "jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION"
+          }
+
+          dir ('./charts/preview') {
+           container('maven') {
+             sh "make preview"
+             sh "jx preview --app $APP_NAME --dir ../.."
+           }
+          }
+        }
+      }
+      stage('Build Release') {
+        when {
+          branch 'master'
+        }
+        steps {
+          container('maven') {
+            // ensure we're not on a detached head
+            sh "git checkout master"
+            sh "git config --global credential.helper store"
+
+            sh "jx step git credentials"
+            // so we can retrieve the version in later steps
+            sh "echo \$(jx-release-version) > VERSION"
+            sh "mvn versions:set -DnewVersion=\$(cat VERSION)"
+          }
+          dir ('./charts/rollarcus') {
+            container('maven') {
+              sh "make tag"
+            }
+          }
+          container('maven') {
+            sh 'mvn clean deploy'
+
+            sh 'export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml'
+
+
+            sh "jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)"
+          }
+        }
+      }
+      stage('Promote to Environments') {
+        when {
+          branch 'master'
+        }
+        steps {
+          dir ('./charts/rollarcus') {
+            container('maven') {
+              sh 'jx step changelog --version v\$(cat ../../VERSION)'
+
+              // release the helm chart
+              sh 'jx step helm release'
+
+              // promote through all 'Auto' promotion Environments
+              sh 'jx promote -b --all-auto --timeout 1h --version \$(cat ../../VERSION)'
+            }
+          }
+        }
+      }
+    }
+    post {
+        always {
+            cleanWs()
+        }
+        failure {
+            input """Pipeline failed. 
+We will keep the build pod around to help you diagnose any failures. 
+
+Select Proceed or Abort to terminate the build pod"""
+        }
+    }
+  }
diff --git a/app/pom.xml b/app/pom.xml
index 8bba67e..bd0b7f4 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>5.2.1-ROLLARCUS</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -676,6 +676,33 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
+                <version>3.0-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <id>tomcat-run</id>
+                        <goals>
+                            <goal>exec-war-only</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <path>roller</path>
+
+                            <!-- optional, needed only if you want to use a preconfigured server.xml file
+                            <serverXml>src/main/tomcatconf/server.xml</serverXml>
+                            -->
+
+                            <!-- optional values which can be configurable -->
+                            <attachArtifactClassifier>exec-war</attachArtifactClassifier>
+                            <attachArtifactClassifierType>jar</attachArtifactClassifierType>
+
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
 
         <testResources>
diff --git a/assembly-release/pom.xml b/assembly-release/pom.xml
index 8cc413a..82a9ed9 100644
--- a/assembly-release/pom.xml
+++ b/assembly-release/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>5.2.1-ROLLARCUS</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/charts/preview/Chart.yaml b/charts/preview/Chart.yaml
new file mode 100644
index 0000000..6b68431
--- /dev/null
+++ b/charts/preview/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+icon: https://raw.githubusercontent.com/jenkins-x/jenkins-x-platform/master/images/java.png
+name: preview
+version: 0.1.0-SNAPSHOT
diff --git a/charts/preview/Makefile b/charts/preview/Makefile
new file mode 100755
index 0000000..38afc91
--- /dev/null
+++ b/charts/preview/Makefile
@@ -0,0 +1,18 @@
+OS := $(shell uname)
+
+preview: 
+ifeq ($(OS),Darwin)
+	sed -i "" -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml
+	sed -i "" -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml
+	sed -i "" -e "s/tag: .*/tag: $(PREVIEW_VERSION)/" values.yaml
+else ifeq ($(OS),Linux)
+	sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml
+	sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml
+	sed -i -e "s|repository: .*|repository: $(DOCKER_REGISTRY)\/snoopdave\/rollarcus|" values.yaml
+	sed -i -e "s/tag: .*/tag: $(PREVIEW_VERSION)/" values.yaml
+else
+	echo "platfrom $(OS) not supported to release from"
+	exit -1
+endif
+	echo "  version: $(PREVIEW_VERSION)" >> requirements.yaml
+	jx step helm build
diff --git a/charts/preview/requirements.yaml b/charts/preview/requirements.yaml
new file mode 100755
index 0000000..172eb01
--- /dev/null
+++ b/charts/preview/requirements.yaml
@@ -0,0 +1,13 @@
+
+dependencies:
+- alias: expose
+  name: exposecontroller
+  repository: https://chartmuseum.build.cd.jenkins-x.io
+  version: 2.3.56
+- alias: cleanup
+  name: exposecontroller
+  repository: https://chartmuseum.build.cd.jenkins-x.io
+  version: 2.3.56
+- alias: preview
+  name: rollarcus
+  repository: file://../rollarcus
diff --git a/charts/preview/values.yaml b/charts/preview/values.yaml
new file mode 100755
index 0000000..b53ceaa
--- /dev/null
+++ b/charts/preview/values.yaml
@@ -0,0 +1,22 @@
+
+expose:
+  Annotations:
+    helm.sh/hook: post-install,post-upgrade
+    helm.sh/hook-delete-policy: hook-succeeded
+  config:
+    exposer: Ingress
+    http: true
+    tlsacme: false
+
+cleanup:
+  Args:
+    - --cleanup
+  Annotations:
+    helm.sh/hook: pre-delete
+    helm.sh/hook-delete-policy: hook-succeeded
+
+preview:
+  image:
+    repository:
+    tag:
+    pullPolicy: IfNotPresent
\ No newline at end of file
diff --git a/charts/rollarcus/.helmignore b/charts/rollarcus/.helmignore
new file mode 100755
index 0000000..f0c1319
--- /dev/null
+++ b/charts/rollarcus/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/charts/rollarcus/Chart.yaml b/charts/rollarcus/Chart.yaml
new file mode 100644
index 0000000..e502bda
--- /dev/null
+++ b/charts/rollarcus/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+icon: https://raw.githubusercontent.com/jenkins-x/jenkins-x-platform/master/images/java.png
+name: rollarcus
+version: 0.1.0-SNAPSHOT
diff --git a/charts/rollarcus/Makefile b/charts/rollarcus/Makefile
new file mode 100755
index 0000000..00ec1d9
--- /dev/null
+++ b/charts/rollarcus/Makefile
@@ -0,0 +1,48 @@
+CHART_REPO := http://jenkins-x-chartmuseum:8080
+CURRENT=$(pwd)
+NAME := rollarcus
+OS := $(shell uname)
+RELEASE_VERSION := $(shell cat ../../VERSION)
+
+build: clean
+	rm -rf requirements.lock
+	helm dependency build
+	helm lint
+
+install: clean build
+	helm install . --name ${NAME}
+
+upgrade: clean build
+	helm upgrade ${NAME} .
+
+delete:
+	helm delete --purge ${NAME}
+
+clean:
+	rm -rf charts
+	rm -rf ${NAME}*.tgz
+
+release: clean
+	helm dependency build
+	helm lint
+	helm init --client-only
+	helm package .
+	curl --fail -u $(CHARTMUSEUM_CREDS_USR):$(CHARTMUSEUM_CREDS_PSW) --data-binary "@$(NAME)-$(shell sed -n 's/^version: //p' Chart.yaml).tgz" $(CHART_REPO)/api/charts
+	rm -rf ${NAME}*.tgz%
+
+tag:
+ifeq ($(OS),Darwin)
+	sed -i "" -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml
+	sed -i "" -e "s/tag: .*/tag: $(RELEASE_VERSION)/" values.yaml
+else ifeq ($(OS),Linux)
+	sed -i -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml
+	sed -i -e "s|repository: .*|repository: $(DOCKER_REGISTRY)\/snoopdave\/rollarcus|" values.yaml
+	sed -i -e "s/tag: .*/tag: $(RELEASE_VERSION)/" values.yaml
+else
+	echo "platfrom $(OS) not supported to release from"
+	exit -1
+endif
+	git add --all
+	git commit -m "release $(RELEASE_VERSION)" --allow-empty # if first release then no verion update is performed
+	git tag -fa v$(RELEASE_VERSION) -m "Release version $(RELEASE_VERSION)"
+	git push origin v$(RELEASE_VERSION)
diff --git a/charts/rollarcus/README.md b/charts/rollarcus/README.md
new file mode 100755
index 0000000..7c39461
--- /dev/null
+++ b/charts/rollarcus/README.md
@@ -0,0 +1 @@
+# Java application
\ No newline at end of file
diff --git a/charts/rollarcus/templates/NOTES.txt b/charts/rollarcus/templates/NOTES.txt
new file mode 100755
index 0000000..97823be
--- /dev/null
+++ b/charts/rollarcus/templates/NOTES.txt
@@ -0,0 +1,4 @@
+
+Get the application URL by running these commands:
+
+kubectl get ingress {{ template "fullname" . }}
diff --git a/charts/rollarcus/templates/_helpers.tpl b/charts/rollarcus/templates/_helpers.tpl
new file mode 100755
index 0000000..f0d83d2
--- /dev/null
+++ b/charts/rollarcus/templates/_helpers.tpl
@@ -0,0 +1,16 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "fullname" -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/charts/rollarcus/templates/deployment.yaml b/charts/rollarcus/templates/deployment.yaml
new file mode 100755
index 0000000..a9b19a9
--- /dev/null
+++ b/charts/rollarcus/templates/deployment.yaml
@@ -0,0 +1,43 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: {{ template "fullname" . }}
+  labels:
+    draft: {{ default "draft-app" .Values.draft }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+spec:
+  replicas: {{ .Values.replicaCount }}
+  template:
+    metadata:
+      labels:
+        draft: {{ default "draft-app" .Values.draft }}
+        app: {{ template "fullname" . }}
+{{- if .Values.podAnnotations }}
+      annotations:
+{{ toYaml .Values.podAnnotations | indent 8 }}
+{{- end }}
+    spec:
+      containers:
+      - name: {{ .Chart.Name }}
+        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        ports:
+        - containerPort: {{ .Values.service.internalPort }}
+        livenessProbe:
+          httpGet:
+            path: {{ .Values.probePath }}
+            port: {{ .Values.service.internalPort }}
+          initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+          successThreshold: {{ .Values.livenessProbe.successThreshold }}
+          timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+        readinessProbe:
+          httpGet:
+            path: {{ .Values.probePath }}
+            port: {{ .Values.service.internalPort }}
+          periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+          successThreshold: {{ .Values.readinessProbe.successThreshold }}
+          timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+        resources:
+{{ toYaml .Values.resources | indent 12 }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
diff --git a/charts/rollarcus/templates/service.yaml b/charts/rollarcus/templates/service.yaml
new file mode 100755
index 0000000..8d27389
--- /dev/null
+++ b/charts/rollarcus/templates/service.yaml
@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Service
+metadata:
+{{- if .Values.service.name }}
+  name: {{ .Values.service.name }}
+{{- else }}
+  name: {{ template "fullname" . }}
+{{- end }}
+  labels:
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+{{- if .Values.service.annotations }}
+  annotations:
+{{ toYaml .Values.service.annotations | indent 4 }}
+{{- end }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+  - port: {{ .Values.service.externalPort }}
+    targetPort: {{ .Values.service.internalPort }}
+    protocol: TCP
+    name: http
+  selector:
+    app: {{ template "fullname" . }}
diff --git a/charts/rollarcus/values.yaml b/charts/rollarcus/values.yaml
new file mode 100755
index 0000000..73ea169
--- /dev/null
+++ b/charts/rollarcus/values.yaml
@@ -0,0 +1,34 @@
+# Default values for Maven projects.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+replicaCount: 1
+image:
+  repository: draft
+  tag: dev
+  pullPolicy: IfNotPresent
+service:
+  name: rollarcus
+  type: ClusterIP
+  externalPort: 80
+  internalPort: 8080
+  annotations:
+    fabric8.io/expose: "true"
+    fabric8.io/ingress.annotations: "kubernetes.io/ingress.class: nginx"
+resources:
+  limits:
+    cpu: 500m
+    memory: 512Mi
+  requests:
+    cpu: 400m
+    memory: 512Mi
+probePath: /actuator/health
+livenessProbe:
+  initialDelaySeconds: 60
+  periodSeconds: 10
+  successThreshold: 1
+  timeoutSeconds: 1
+readinessProbe:
+  periodSeconds: 10
+  successThreshold: 1
+  timeoutSeconds: 1
+terminationGracePeriodSeconds: 10
\ No newline at end of file
diff --git a/it-selenium/pom.xml b/it-selenium/pom.xml
index b155983..8d0c548 100644
--- a/it-selenium/pom.xml
+++ b/it-selenium/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>5.2.1-ROLLARCUS</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/it-selenium/src/test/resources/roller-jettyrun.properties b/it-selenium/src/test/resources/roller-jettyrun.properties
index e3fdd52..cc4578c 100644
--- a/it-selenium/src/test/resources/roller-jettyrun.properties
+++ b/it-selenium/src/test/resources/roller-jettyrun.properties
@@ -23,7 +23,7 @@
 passwds.encryption.enabled=false
 
 # use src copy of themes for read-only access
-themes.dir=target/roller-selenium-tests-6.0.0-SNAPSHOT/themes
+themes.dir=target/roller-selenium-tests-5.2.1-ROLLARCUS/themes
 
 # put work in work dir
 search.index.dir          =target/work/search-index
diff --git a/pom.xml b/pom.xml
index 6af923f..6f4ade8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.roller</groupId>
     <artifactId>roller-project</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>5.2.1-ROLLARCUS</version>
     <packaging>pom</packaging>
 
     <prerequisites>
@@ -47,7 +47,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <derby.version>10.11.1.1</derby.version>
-        <roller.version>6.0.0-SNAPSHOT</roller.version>
+        <roller.version>5.2.1-ROLLARCUS</roller.version>
     </properties>
 
     <modules>
@@ -93,7 +93,14 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-     </build>
+     
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.8.2</version></plugin>
+    </plugins>
+    </build>
 
     <dependencyManagement>
         <dependencies>
diff --git a/skaffold.yaml b/skaffold.yaml
new file mode 100644
index 0000000..ce243d2
--- /dev/null
+++ b/skaffold.yaml
@@ -0,0 +1,31 @@
+apiVersion: skaffold/v1alpha2
+kind: Config
+build:
+  tagPolicy:
+    envTemplate:
+      template: "{{.DOCKER_REGISTRY}}/snoopdave/rollarcus:{{.VERSION}}"
+  artifacts:
+  - imageName: changeme
+    workspace: .
+    docker: {}
+  local: {}
+deploy:
+  kubectl:
+    manifests:
+profiles:
+- name: dev
+  build:
+    tagPolicy:
+      envTemplate:
+        template: "{{.DOCKER_REGISTRY}}/snoopdave/rollarcus:{{.DIGEST_HEX}}"
+    artifacts:
+    - docker: {}
+    local: {}
+  deploy:
+    helm:
+      releases:
+      - name: rollarcus
+        chartPath: charts/rollarcus
+        setValueTemplates:
+          image.repository: "{{.DOCKER_REGISTRY}}/snoopdave/rollarcus"
+          image.tag: "{{.DIGEST_HEX}}"
diff --git a/watch.sh b/watch.sh
new file mode 100755
index 0000000..38e50af
--- /dev/null
+++ b/watch.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# watch the java files and continously deploy the service
+mvn clean install
+skaffold run -p dev
+reflex -r "\.java$" -- bash -c 'mvn install && skaffold run -p dev'