diff --git a/templates/jenkins-ci/0/rancher-compose.yml b/templates/jenkins-ci/0/rancher-compose.yml
index 01d7af2..43a5e51 100644
--- a/templates/jenkins-ci/0/rancher-compose.yml
+++ b/templates/jenkins-ci/0/rancher-compose.yml
@@ -18,13 +18,13 @@
       one entry per line.
     default: |
       credentials
-      greenballs
       git
-      junit
       git-client
+      github
       github-api
       github-oauth
-      github
+      greenballs
+      junit
       plain-credentials
       scm-api
       ssh-credentials
diff --git a/templates/jenkins-ci/1/docker-compose.yml b/templates/jenkins-ci/1/docker-compose.yml
new file mode 100644
index 0000000..680c54f
--- /dev/null
+++ b/templates/jenkins-ci/1/docker-compose.yml
@@ -0,0 +1,20 @@
+jenkins-primary:
+  image: "jenkins:1.651.3"
+  ports:
+    - "${PORT}:8080"
+  labels:
+    io.rancher.sidekicks: jenkins-plugins,jenkins-datavolume
+    io.rancher.container.hostname_override: container_name
+  volumes_from:
+    - jenkins-plugins
+    - jenkins-datavolume
+  entrypoint: /usr/share/jenkins/rancher/jenkins.sh
+jenkins-plugins:
+  image: rancher/jenkins-plugins:v0.1.1
+jenkins-datavolume:
+  image: "busybox"
+  volumes:
+    - /var/jenkins_home
+  labels:
+    io.rancher.container.start_once: true
+  entrypoint: ["chown", "-R", "1000:1000", "/var/jenkins_home"]
diff --git a/templates/jenkins-ci/1/rancher-compose.yml b/templates/jenkins-ci/1/rancher-compose.yml
new file mode 100644
index 0000000..1c37a5e
--- /dev/null
+++ b/templates/jenkins-ci/1/rancher-compose.yml
@@ -0,0 +1,36 @@
+.catalog:
+  name: Jenkins
+  version: 1.651.3-rancher1
+  description: |
+    Jenkins CI management server.
+  questions:
+  - variable: "PORT"
+    type: "int"
+    label: "Port Number"
+    description: "Which port should Jenkins listen on?"
+    default: 8080
+    required: true
+  - variable: "plugins"
+    type: "multiline"
+    label: "List of Plugins"
+    description: |
+      List of plugins in the format <plugin_name>[:<version>]
+      one entry per line.
+    default: |
+      credentials
+      git
+      git-client
+      github
+      github-api
+      github-oauth
+      greenballs
+      junit
+      plain-credentials
+      scm-api
+      ssh-credentials
+      ssh-slaves
+      swarm
+jenkins-primary:
+  metadata:
+    plugins: |
+      ${plugins}
diff --git a/templates/jenkins-ci/config.yml b/templates/jenkins-ci/config.yml
index d3eb457..164ae5e 100644
--- a/templates/jenkins-ci/config.yml
+++ b/templates/jenkins-ci/config.yml
@@ -1,5 +1,5 @@
 name: Jenkins
 description: |
   Jenkins CI server (LTS)
-version: 1.642.2-rancher1
+version: 1.651.3-rancher1
 category: Continuous Integration