diff --git a/.travis.yml b/.travis.yml
index 014434c0b..ce0ddbcfd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,31 +9,34 @@ addons:
       - docker-ce
 matrix:
   include:
-    - name: Zabbix agent
+#########################################
+####  Forked and fixed images
+#########################################
+    - name: Zabbix Agent
       script:
       - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
       - docker build --compress -t epicmorg/zabbix-agent:latest zabbix/agent
       - docker push epicmorg/zabbix-agent:latest
 
-    - name: Zabbix java gateway
+    - name: Zabbix Java Gateway
       script:
       - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
       - docker build --compress -t epicmorg/zabbix-java-gateway:latest zabbix/java-gateway
       - docker push epicmorg/zabbix-java-gateway:latest
 
-    - name: Zabbix server
+    - name: Zabbix Server with MySQL
       script:
       - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
       - docker build --compress -t epicmorg/zabbix-server-mysql:latest zabbix/server
       - docker push epicmorg/zabbix-server-mysql:latest
 
-    - name: Zabbix web
+    - name: Zabbix web Apache2 with MySQL
       script:
       - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
       - docker build --compress -t epicmorg/zabbix-web-apache-mysql:latest zabbix/web
       - docker push epicmorg/zabbix-web-apache-mysql:latest
 
-    - name: NextCloud
+    - name: NextCloud (latest)
       script:
       - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
       - docker build --compress -t epicmorg/nextcloud:latest nextcloud
@@ -49,89 +52,537 @@ matrix:
       - docker build --compress -t epicmorg/prod:latest epicmorg/prod
       - docker push epicmorg/prod:latest
       
-    - name: Base develop
+    - name: Base Develop
       script:
       - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
       - docker build --compress -t epicmorg/devel:latest epicmorg/devel
       - docker push epicmorg/devel:latest
 
-    - name: TeamCityAgent image
+    - name: TeamCity Agent
       script:
       - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
       - docker build --compress -t epicmorg/teamcity-agent:latest teamcity-agent
       - docker push epicmorg/teamcity-agent:latest
 
-    - name: Nginx image
+    - name: NGinx (latest)
       script:
       - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
       - docker build --compress -t epicmorg/balancer:latest balancer/latest
       - docker push epicmorg/balancer:latest
       
-    - name: Nginx-php image
+    - name: NGinx + PHP7.3
       script:
       - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
       - docker build --compress -t epicmorg/balancer:php balancer/php
       - docker push epicmorg/balancer:php
       
-    - name: Apache+PHP7 image
+    - name: Apache + PHP7.3
       script:
       - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
       - docker build --compress -t epicmorg/websites:latest websites/latest
       - docker push epicmorg/websites:latest
       
-    - name: Apache+PHP7.2 image
+    - name: Apache + PHP7.2
       script:
       - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
       - docker build --compress -t epicmorg/websites:php7.2 websites/php7.2
       - docker push epicmorg/websites:php7.2
-      
-    - name: Jira Latest image
-      script:
-      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-      - docker build --compress -t epicmorg/jira:latest atlassian/jira/latest
-      - docker push epicmorg/jira:latest
-      
-    - name: Jira 7.10.0 image
-      script:
-      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-      - docker build --compress -t epicmorg/jira:7.10.0 atlassian/jira/7.10.0
-      - docker push epicmorg/jira:7.10.0
-        
-    - name: Confluence Latest image
-      script:
-      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-      - docker build --compress -t epicmorg/confluence:latest atlassian/confluence/latest
-      - docker push epicmorg/confluence:latest
 
-    - name: Confluence 6.9.0 image
-      script:
-      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-      - docker build --compress -t epicmorg/confluence:6.9.0 atlassian/confluence/6.9.0
-      - docker push epicmorg/confluence:6.9.0
-
-    - name: Bitbucket Latest image
+    - name: Bitbucket (latest)
       script:
       - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
       - docker build --compress -t epicmorg/bitbucket:latest atlassian/bitbucket/latest
       - docker push epicmorg/bitbucket:latest
 
+    - name: Confluence (latest)
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:latest atlassian/confluence/latest
+      - docker push epicmorg/confluence:latest
+
+    - name: Jira (latest)
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:latest atlassian/jira/latest
+      - docker push epicmorg/jira:latest
+
+    - name: Jira 7.10.0
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:7.10.0 atlassian/jira/7.10.0
+      - docker push epicmorg/jira:7.10.0
+      
+    - name: Confluence 6.9.0
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.9.0 atlassian/confluence/6.9.0
+      - docker push epicmorg/confluence:6.9.0
 
 #########################################
-####  Our medium priority images
+####  Our LTS images
 #########################################
 
-    - name: Jira 7.13.3 image
+    - name: Jira 7.13.3
       script:
       - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
       - docker build --compress -t epicmorg/jira:7.13.3 atlassian/jira/7.13.3
       - docker push epicmorg/jira:7.13.3
 
-    - name: Confluence 6.13.4 image
+    - name: Confluence 6.13.4
       script:
       - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
       - docker build --compress -t epicmorg/confluence:6.9.0 atlassian/confluence/6.9.0
       - docker push epicmorg/confluence:6.13.4
 
+#########################################
+####  Our Bitbucket images
+#########################################
+    - name: Bitbucket 6.2.0
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/bitbucket:6.2.0 atlassian/bitbucket/6.2.0
+      - docker push epicmorg/bitbucket:6.2.0
+
+    - name: Bitbucket 6.2.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/bitbucket:6.2.1 atlassian/bitbucket/6.2.1
+      - docker push epicmorg/bitbucket:6.2.1
+
+    - name: Bitbucket 6.3.0
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/bitbucket:6.3.0 atlassian/bitbucket/6.3.0
+      - docker push epicmorg/bitbucket:6.3.0
+
+    - name: Bitbucket 6.3.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/bitbucket:6.3.1 atlassian/bitbucket/6.3.1
+      - docker push epicmorg/bitbucket:6.3.1
+
+    - name: Bitbucket 6.3.2
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/bitbucket:6.3.2 atlassian/bitbucket/6.3.2
+      - docker push epicmorg/bitbucket:6.3.2
+
+    - name: Bitbucket 6.4.0
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/bitbucket:6.4.0 atlassian/bitbucket/6.4.0
+      - docker push epicmorg/bitbucket:6.4.0
+
+    - name: Bitbucket 6.4.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/bitbucket:6.4.1 atlassian/bitbucket/6.4.1
+      - docker push epicmorg/bitbucket:6.4.1
+
+    - name: Bitbucket 6.5.0
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/bitbucket:6.5.0 atlassian/bitbucket/6.5.0
+      - docker push epicmorg/bitbucket:6.5.0
+
+    - name: Bitbucket 6.5.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/bitbucket:6.5.1 atlassian/bitbucket/6.5.1
+      - docker push epicmorg/bitbucket:6.5.1
+
+    - name: Bitbucket 6.5.2
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/bitbucket:6.5.2 atlassian/bitbucket/6.5.2
+      - docker push epicmorg/bitbucket:6.5.2
+
+    - name: Bitbucket 6.6.0
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/bitbucket:6.6.0 atlassian/bitbucket/6.6.0
+      - docker push epicmorg/bitbucket:6.6.0
+
+    - name: Bitbucket 6.6.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/bitbucket:6.6.1 atlassian/bitbucket/6.6.1
+      - docker push epicmorg/bitbucket:6.6.1
+
+    - name: Bitbucket 6.6.2
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/bitbucket:6.6.2 atlassian/bitbucket/6.6.2
+      - docker push epicmorg/bitbucket:6.6.2
+
+#########################################
+####  Our Confluence images
+#########################################
+    - name: Confluence 6.9.0
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.9.0 atlassian/confluence/6.9.0
+      - docker push epicmorg/confluence:6.9.0
+ 
+ 
+    - name: Confluence 6.9.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.9.1 atlassian/confluence/6.9.1
+      - docker push epicmorg/confluence:6.9.1
+ 
+    - name: Confluence 6.9.3
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.9.3 atlassian/confluence/6.9.3
+      - docker push epicmorg/confluence:6.9.3
+ 
+    - name: Confluence 6.10.0
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.10.0 atlassian/confluence/6.10.0
+      - docker push epicmorg/confluence:6.10.0
+ 
+    - name: Confluence 6.10.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.10.1 atlassian/confluence/6.10.1
+      - docker push epicmorg/confluence:6.10.1
+ 
+    - name: Confluence 6.10.2
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.10.2 atlassian/confluence/6.10.2
+      - docker push epicmorg/confluence:6.10.2
+ 
+    - name: Confluence 6.11.0
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.11.0 atlassian/confluence/6.11.0
+      - docker push epicmorg/confluence:6.11.0
+ 
+    - name: Confluence 6.11.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.11.1 atlassian/confluence/6.11.1
+      - docker push epicmorg/confluence:6.11.1
+ 
+    - name: Confluence 6.11.2
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.11.2 atlassian/confluence/6.11.2
+      - docker push epicmorg/confluence:6.11.2
+ 
+    - name: Confluence 6.12.0
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.12.0 atlassian/confluence/6.12.0
+      - docker push epicmorg/confluence:6.12.0
+ 
+    - name: Confluence 6.12.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.12.1 atlassian/confluence/6.12.1
+      - docker push epicmorg/confluence:6.12.1
+ 
+    - name: Confluence 6.12.2
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.12.2 atlassian/confluence/6.12.2
+      - docker push epicmorg/confluence:6.12.2
+ 
+    - name: Confluence 6.12.3
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.12.3 atlassian/confluence/6.12.3
+      - docker push epicmorg/confluence:6.12.3
+ 
+    - name: Confluence 6.12.4
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.12.4 atlassian/confluence/6.12.4
+      - docker push epicmorg/confluence:6.12.4
+ 
+    - name: Confluence 6.13.0
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.13.0 atlassian/confluence/6.13.0
+      - docker push epicmorg/confluence:6.13.0
+ 
+    - name: Confluence 6.13.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.13.1 atlassian/confluence/6.13.1
+      - docker push epicmorg/confluence:6.13.1
+ 
+    - name: Confluence 6.13.2
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.13.2 atlassian/confluence/6.13.2
+      - docker push epicmorg/confluence:6.13.2
+ 
+    - name: Confluence 6.13.3
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.13.3 atlassian/confluence/6.13.3
+      - docker push epicmorg/confluence:6.13.3
+ 
+    - name: Confluence 6.13.4
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.13.4 atlassian/confluence/6.13.4
+      - docker push epicmorg/confluence:6.13.4
+ 
+    - name: Confluence 6.14.0
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.14.0 atlassian/confluence/6.14.0
+      - docker push epicmorg/confluence:6.14.0
+ 
+    - name: Confluence 6.14.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.14.1 atlassian/confluence/6.14.1
+      - docker push epicmorg/confluence:6.14.1
+ 
+    - name: Confluence 6.14.2
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.14.2 atlassian/confluence/6.14.2
+      - docker push epicmorg/confluence:6.14.2
+ 
+    - name: Confluence 6.14.3
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.14.3 atlassian/confluence/6.14.3
+      - docker push epicmorg/confluence:6.14.3
+ 
+    - name: Confluence 6.15.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.15.1 atlassian/confluence/6.15.1
+      - docker push epicmorg/confluence:6.15.1
+ 
+    - name: Confluence 6.15.2
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.15.2 atlassian/confluence/6.15.2
+      - docker push epicmorg/confluence:6.15.2
+
+    - name: Confluence 6.15.4
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.15.4 atlassian/confluence/6.15.4
+      - docker push epicmorg/confluence:6.15.4
+
+    - name: Confluence 6.15.6
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.15.6 atlassian/confluence/6.15.6
+      - docker push epicmorg/confluence:6.15.6
+
+    - name: Confluence 6.15.7
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.15.7 atlassian/confluence/6.15.7
+      - docker push epicmorg/confluence:6.15.7
+
+    - name: Confluence 6.15.8
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.15.8 atlassian/confluence/6.15.8
+      - docker push epicmorg/confluence:6.15.8
+
+    - name: Confluence 6.15.9
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:6.15.9 atlassian/confluence/6.15.9
+      - docker push epicmorg/confluence:6.15.9
+
+    - name: Confluence 7.0.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/confluence:7.0.1 atlassian/confluence/7.0.1
+      - docker push epicmorg/confluence:7.0.1
+
+
+#########################################
+####  Our Jira images
+#########################################
+    - name: Jira 7.10.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:7.10.1 atlassian/jira/7.10.1
+      - docker push epicmorg/jira:7.10.1
+
+    - name: Jira 7.10.2
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:7.10.2 atlassian/jira/7.10.2
+      - docker push epicmorg/jira:7.10.2
+
+    - name: Jira 7.11.0
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:7.11.0 atlassian/jira/7.11.0
+      - docker push epicmorg/jira:7.11.0
+
+    - name: Jira 7.11.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:7.11.1 atlassian/jira/7.11.1
+      - docker push epicmorg/jira:7.11.1
+
+    - name: Jira 7.11.2
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:7.11.2 atlassian/jira/7.11.2
+      - docker push epicmorg/jira:7.11.2
+
+    - name: Jira 7.12.0
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:7.12.0 atlassian/jira/7.12.0
+      - docker push epicmorg/jira:7.12.0
+
+    - name: Jira 7.12.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:7.12.1 atlassian/jira/7.12.1
+      - docker push epicmorg/jira:7.12.1
+
+    - name: Jira 7.12.2
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:7.12.2 atlassian/jira/7.12.2
+      - docker push epicmorg/jira:7.12.2
+
+    - name: Jira 7.12.3
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:7.12.3 atlassian/jira/7.12.3
+      - docker push epicmorg/jira:7.12.3
+
+    - name: Jira 7.13.0
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:7.13.0 atlassian/jira/7.13.0
+      - docker push epicmorg/jira:7.13.0
+
+    - name: Jira 7.13.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:7.13.1 atlassian/jira/7.13.1
+      - docker push epicmorg/jira:7.13.1
+
+    - name: Jira 7.13.2
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:7.13.2 atlassian/jira/7.13.2
+      - docker push epicmorg/jira:7.13.2
+
+    - name: Jira 8.0.0
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:8.0.0 atlassian/jira/8.0.0
+      - docker push epicmorg/jira:8.0.0
+
+    - name: Jira 8.0.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:8.0.1 atlassian/jira/8.0.1
+      - docker push epicmorg/jira:8.0.1
+
+    - name: Jira 8.0.2
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:8.0.2 atlassian/jira/8.0.2
+      - docker push epicmorg/jira:8.0.2
+
+    - name: Jira 8.1.0
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:8.1.0 atlassian/jira/8.1.0
+      - docker push epicmorg/jira:8.1.0
+
+    - name: Jira 8.1.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:8.1.1 atlassian/jira/8.1.1
+      - docker push epicmorg/jira:8.1.1
+
+    - name: Jira 8.2.0
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:8.2.0 atlassian/jira/8.2.0
+      - docker push epicmorg/jira:8.2.0
+
+    - name: Jira 8.2.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:8.2.1 atlassian/jira/8.2.1
+      - docker push epicmorg/jira:8.2.1
+
+    - name: Jira 8.2.2
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:8.2.2 atlassian/jira/8.2.2
+      - docker push epicmorg/jira:8.2.2
+
+    - name: Jira 8.2.3
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:8.2.3 atlassian/jira/8.2.3
+      - docker push epicmorg/jira:8.2.3
+
+    - name: Jira 8.2.4
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:8.2.4 atlassian/jira/8.2.4
+      - docker push epicmorg/jira:8.2.4
+
+    - name: Jira 8.3.0
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:8.3.0 atlassian/jira/8.3.0
+      - docker push epicmorg/jira:8.3.0
+
+    - name: Jira 8.3.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:8.3.1 atlassian/jira/8.3.1
+      - docker push epicmorg/jira:8.3.1
+
+    - name: Jira 8.3.2
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:8.3.2 atlassian/jira/8.3.2
+      - docker push epicmorg/jira:8.3.2
+
+    - name: Jira 8.3.3
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:8.3.3 atlassian/jira/8.3.3
+      - docker push epicmorg/jira:8.3.3
+
+    - name: Jira 8.3.4
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:8.3.4 atlassian/jira/8.3.4
+      - docker push epicmorg/jira:8.3.4
+
+    - name: Jira 8.4.0 
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:8.4.0 atlassian/jira/8.4.0
+      - docker push epicmorg/jira:8.4.0
+
+    - name: Jira 8.4.1
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/jira:8.4.1 atlassian/jira/8.4.1
+      - docker push epicmorg/jira:8.4.1
+
 #########################################
 ####  Our minor priority images
 #########################################