From 9555530c36898aa3bc3dc11bc6f7945779403f98 Mon Sep 17 00:00:00 2001
From: Anatolii Zimovskii <azimovskii@saber3d.ru>
Date: Sat, 7 May 2022 03:11:26 +0300
Subject: [PATCH] pre-release

---
 CHANGELOG.md                                  |  1 +
 Makefile                                      | 66 ++++++-------
 .../atlassian/bitbucket/6/6.0.0/Dockerfile    |  2 +-
 .../bitbucket/6/6.0.0/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.0.1/Dockerfile    |  2 +-
 .../bitbucket/6/6.0.1/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.0.10/Dockerfile   |  2 +-
 .../bitbucket/6/6.0.10/Dockerfile.jdk11       |  2 +-
 .../atlassian/bitbucket/6/6.0.11/Dockerfile   |  2 +-
 .../bitbucket/6/6.0.11/Dockerfile.jdk11       |  2 +-
 .../atlassian/bitbucket/6/6.0.2/Dockerfile    |  2 +-
 .../bitbucket/6/6.0.2/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.0.3/Dockerfile    |  2 +-
 .../bitbucket/6/6.0.3/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.0.4/Dockerfile    |  2 +-
 .../bitbucket/6/6.0.4/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.0.5/Dockerfile    |  2 +-
 .../bitbucket/6/6.0.5/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.0.6/Dockerfile    |  2 +-
 .../bitbucket/6/6.0.6/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.0.7/Dockerfile    |  2 +-
 .../bitbucket/6/6.0.7/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.0.9/Dockerfile    |  2 +-
 .../bitbucket/6/6.0.9/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.1.0/Dockerfile    |  2 +-
 .../bitbucket/6/6.1.0/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.1.1/Dockerfile    |  2 +-
 .../bitbucket/6/6.1.1/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.1.2/Dockerfile    |  2 +-
 .../bitbucket/6/6.1.2/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.1.3/Dockerfile    |  2 +-
 .../bitbucket/6/6.1.3/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.1.4/Dockerfile    |  2 +-
 .../bitbucket/6/6.1.4/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.1.5/Dockerfile    |  2 +-
 .../bitbucket/6/6.1.5/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.1.6/Dockerfile    |  2 +-
 .../bitbucket/6/6.1.6/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.1.7/Dockerfile    |  2 +-
 .../bitbucket/6/6.1.7/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.1.8/Dockerfile    |  2 +-
 .../bitbucket/6/6.1.8/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.1.9/Dockerfile    |  2 +-
 .../bitbucket/6/6.1.9/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.10.0/Dockerfile   |  2 +-
 .../bitbucket/6/6.10.0/Dockerfile.jdk11       |  2 +-
 .../atlassian/bitbucket/6/6.10.1/Dockerfile   |  2 +-
 .../bitbucket/6/6.10.1/Dockerfile.jdk11       |  2 +-
 .../atlassian/bitbucket/6/6.10.2/Dockerfile   |  2 +-
 .../bitbucket/6/6.10.2/Dockerfile.jdk11       |  2 +-
 .../atlassian/bitbucket/6/6.2.0/Dockerfile    |  2 +-
 .../bitbucket/6/6.2.0/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.2.1/Dockerfile    |  2 +-
 .../bitbucket/6/6.2.1/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.2.2/Dockerfile    |  2 +-
 .../bitbucket/6/6.2.2/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.2.3/Dockerfile    |  2 +-
 .../bitbucket/6/6.2.3/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.2.4/Dockerfile    |  2 +-
 .../bitbucket/6/6.2.4/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.2.5/Dockerfile    |  2 +-
 .../bitbucket/6/6.2.5/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.2.6/Dockerfile    |  2 +-
 .../bitbucket/6/6.2.6/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.2.7/Dockerfile    |  2 +-
 .../bitbucket/6/6.2.7/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.3.0/Dockerfile    |  2 +-
 .../bitbucket/6/6.3.0/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.3.1/Dockerfile    |  2 +-
 .../bitbucket/6/6.3.1/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.3.2/Dockerfile    |  2 +-
 .../bitbucket/6/6.3.2/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.3.3/Dockerfile    |  2 +-
 .../bitbucket/6/6.3.3/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.3.4/Dockerfile    |  2 +-
 .../bitbucket/6/6.3.4/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.3.5/Dockerfile    |  2 +-
 .../bitbucket/6/6.3.5/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.3.6/Dockerfile    |  2 +-
 .../bitbucket/6/6.3.6/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.4.0/Dockerfile    |  2 +-
 .../bitbucket/6/6.4.0/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.4.1/Dockerfile    |  2 +-
 .../bitbucket/6/6.4.1/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.4.2/Dockerfile    |  2 +-
 .../bitbucket/6/6.4.2/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.4.3/Dockerfile    |  2 +-
 .../bitbucket/6/6.4.3/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.4.4/Dockerfile    |  2 +-
 .../bitbucket/6/6.4.4/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.5.0/Dockerfile    |  2 +-
 .../bitbucket/6/6.5.0/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.5.1/Dockerfile    |  2 +-
 .../bitbucket/6/6.5.1/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.5.2/Dockerfile    |  2 +-
 .../bitbucket/6/6.5.2/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.5.3/Dockerfile    |  2 +-
 .../bitbucket/6/6.5.3/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.6.0/Dockerfile    |  2 +-
 .../bitbucket/6/6.6.0/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.6.1/Dockerfile    |  2 +-
 .../bitbucket/6/6.6.1/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.6.2/Dockerfile    |  2 +-
 .../bitbucket/6/6.6.2/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.6.3/Dockerfile    |  2 +-
 .../bitbucket/6/6.6.3/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.6.4/Dockerfile    |  2 +-
 .../bitbucket/6/6.6.4/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.7.0/Dockerfile    |  2 +-
 .../bitbucket/6/6.7.0/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.7.1/Dockerfile    |  2 +-
 .../bitbucket/6/6.7.1/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.7.2/Dockerfile    |  2 +-
 .../bitbucket/6/6.7.2/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.7.3/Dockerfile    |  2 +-
 .../bitbucket/6/6.7.3/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.7.4/Dockerfile    |  2 +-
 .../bitbucket/6/6.7.4/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.8.0/Dockerfile    |  2 +-
 .../bitbucket/6/6.8.0/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.8.1/Dockerfile    |  2 +-
 .../bitbucket/6/6.8.1/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.8.2/Dockerfile    |  2 +-
 .../bitbucket/6/6.8.2/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.8.3/Dockerfile    |  2 +-
 .../bitbucket/6/6.8.3/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.9.0/Dockerfile    |  2 +-
 .../bitbucket/6/6.9.0/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.9.1/Dockerfile    |  2 +-
 .../bitbucket/6/6.9.1/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/6/6.9.2/Dockerfile    |  2 +-
 .../bitbucket/6/6.9.2/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/7/7.0.0/Dockerfile    |  2 +-
 .../bitbucket/7/7.0.0/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/7/7.0.1/Dockerfile    |  2 +-
 .../bitbucket/7/7.0.1/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/7/7.0.2/Dockerfile    |  2 +-
 .../bitbucket/7/7.0.2/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/7/7.0.3/Dockerfile    |  2 +-
 .../bitbucket/7/7.0.3/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/7/7.1.0/Dockerfile    |  2 +-
 .../bitbucket/7/7.1.0/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/7/7.1.1/Dockerfile    |  2 +-
 .../bitbucket/7/7.1.1/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/7/7.1.2/Dockerfile    |  2 +-
 .../bitbucket/7/7.1.2/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/7/7.1.3/Dockerfile    |  2 +-
 .../bitbucket/7/7.1.3/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/7/7.2.0/Dockerfile    |  2 +-
 .../bitbucket/7/7.2.0/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/7/7.2.1/Dockerfile    |  2 +-
 .../bitbucket/7/7.2.1/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/7/7.2.2/Dockerfile    |  2 +-
 .../bitbucket/7/7.2.2/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/7/7.2.3/Dockerfile    |  2 +-
 .../bitbucket/7/7.2.3/Dockerfile.jdk11        |  2 +-
 .../atlassian/bitbucket/latest/Dockerfile     |  2 +-
 .../bitbucket/latest/Dockerfile.jdk11         |  2 +-
 .../atlassian/confluence/5/5.5/Dockerfile     |  2 +-
 .../atlassian/confluence/5/5.9.14/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.0.1/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.0.2/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.0.3/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.0.4/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.0.5/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.0.6/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.0.7/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.1.0/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.1.1/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.1.2/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.1.3/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.1.4/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.10.0/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.10.1/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.10.2/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.10.3/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.11.0/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.11.1/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.11.2/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.12.0/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.12.1/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.12.2/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.12.3/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.12.4/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.13.0/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.13.1/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.13.10/Dockerfile |  2 +-
 .../atlassian/confluence/6/6.13.11/Dockerfile |  2 +-
 .../atlassian/confluence/6/6.13.12/Dockerfile |  2 +-
 .../atlassian/confluence/6/6.13.13/Dockerfile |  2 +-
 .../atlassian/confluence/6/6.13.15/Dockerfile |  2 +-
 .../atlassian/confluence/6/6.13.17/Dockerfile |  2 +-
 .../atlassian/confluence/6/6.13.18/Dockerfile |  2 +-
 .../atlassian/confluence/6/6.13.19/Dockerfile |  2 +-
 .../atlassian/confluence/6/6.13.2/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.13.20/Dockerfile |  2 +-
 .../atlassian/confluence/6/6.13.21/Dockerfile |  2 +-
 .../atlassian/confluence/6/6.13.3/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.13.4/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.13.5/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.13.6/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.13.7/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.13.8/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.13.9/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.14.0/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.14.1/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.14.2/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.14.3/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.15.1/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.15.10/Dockerfile |  2 +-
 .../atlassian/confluence/6/6.15.2/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.15.4/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.15.6/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.15.7/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.15.8/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.15.9/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.2.0/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.2.1/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.2.2/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.2.3/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.2.4/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.3.1/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.3.2/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.3.3/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.3.4/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.4.0/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.4.1/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.4.2/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.4.3/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.5.0/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.5.1/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.5.2/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.5.3/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.6.0/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.6.1/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.6.10/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.6.11/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.6.12/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.6.13/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.6.14/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.6.15/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.6.16/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.6.17/Dockerfile  |  2 +-
 .../atlassian/confluence/6/6.6.2/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.6.3/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.6.4/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.6.5/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.6.6/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.6.7/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.6.8/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.6.9/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.7.0/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.7.1/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.7.2/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.7.3/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.8.0/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.8.1/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.8.2/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.8.3/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.8.5/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.9.0/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.9.1/Dockerfile   |  2 +-
 .../atlassian/confluence/6/6.9.3/Dockerfile   |  2 +-
 .../atlassian/confluence/7/7.0.1/Dockerfile   |  2 +-
 .../atlassian/confluence/7/7.0.2/Dockerfile   |  2 +-
 .../atlassian/confluence/7/7.0.3/Dockerfile   |  2 +-
 .../atlassian/confluence/7/7.0.4/Dockerfile   |  2 +-
 .../atlassian/confluence/7/7.0.5/Dockerfile   |  2 +-
 .../atlassian/confluence/7/7.1.0/Dockerfile   |  2 +-
 .../confluence/7/7.1.0/Dockerfile.jdk11       |  2 +-
 .../atlassian/confluence/7/7.1.1/Dockerfile   |  2 +-
 .../confluence/7/7.1.1/Dockerfile.jdk11       |  2 +-
 .../atlassian/confluence/7/7.1.2/Dockerfile   |  2 +-
 .../confluence/7/7.1.2/Dockerfile.jdk11       |  2 +-
 .../atlassian/confluence/7/7.2.0/Dockerfile   |  2 +-
 .../confluence/7/7.2.0/Dockerfile.jdk11       |  2 +-
 .../atlassian/confluence/7/7.2.1/Dockerfile   |  2 +-
 .../confluence/7/7.2.1/Dockerfile.jdk11       |  2 +-
 .../atlassian/confluence/7/7.2.2/Dockerfile   |  2 +-
 .../confluence/7/7.2.2/Dockerfile.jdk11       |  2 +-
 .../atlassian/confluence/7/7.3.1/Dockerfile   |  2 +-
 .../confluence/7/7.3.1/Dockerfile.jdk11       |  2 +-
 .../atlassian/confluence/7/7.3.2/Dockerfile   |  2 +-
 .../confluence/7/7.3.2/Dockerfile.jdk11       |  2 +-
 .../atlassian/confluence/7/7.3.3/Dockerfile   |  2 +-
 .../confluence/7/7.3.3/Dockerfile.jdk11       |  2 +-
 .../atlassian/confluence/7/7.3.4/Dockerfile   |  2 +-
 .../confluence/7/7.3.4/Dockerfile.jdk11       |  2 +-
 .../atlassian/confluence/7/7.3.5/Dockerfile   |  2 +-
 .../confluence/7/7.3.5/Dockerfile.jdk11       |  2 +-
 .../atlassian/confluence/7/7.4.0/Dockerfile   |  2 +-
 .../confluence/7/7.4.0/Dockerfile.jdk11       |  2 +-
 .../atlassian/confluence/7/7.5.0/Dockerfile   |  2 +-
 .../confluence/7/7.5.0/Dockerfile.jdk11       |  2 +-
 .../atlassian/confluence/latest/Dockerfile    |  2 +-
 .../confluence/latest/Dockerfile.jdk11        |  2 +-
 .../confluence/templates/5/Dockerfile         |  2 +-
 .../confluence/templates/6/Dockerfile         |  2 +-
 .../atlassian/crucible/1/1.0.3/Dockerfile     |  2 +-
 .../atlassian/crucible/1/1.0.4/Dockerfile     |  2 +-
 .../atlassian/crucible/1/1.0/Dockerfile       |  2 +-
 .../atlassian/crucible/1/1.1.1/Dockerfile     |  2 +-
 .../atlassian/crucible/1/1.1.2/Dockerfile     |  2 +-
 .../atlassian/crucible/1/1.1.3/Dockerfile     |  2 +-
 .../atlassian/crucible/1/1.1.4/Dockerfile     |  2 +-
 .../atlassian/crucible/1/1.1/Dockerfile       |  2 +-
 .../atlassian/crucible/1/1.2.1/Dockerfile     |  2 +-
 .../atlassian/crucible/1/1.2.2/Dockerfile     |  2 +-
 .../atlassian/crucible/1/1.2.3/Dockerfile     |  2 +-
 .../atlassian/crucible/1/1.2/Dockerfile       |  2 +-
 .../atlassian/crucible/1/1.5.1/Dockerfile     |  2 +-
 .../atlassian/crucible/1/1.5.2/Dockerfile     |  2 +-
 .../atlassian/crucible/1/1.5.3/Dockerfile     |  2 +-
 .../atlassian/crucible/1/1.5.4/Dockerfile     |  2 +-
 .../atlassian/crucible/1/1.5/Dockerfile       |  2 +-
 .../atlassian/crucible/1/1.6.0/Dockerfile     |  2 +-
 .../crucible/1/1.6.0Beta1/Dockerfile          |  2 +-
 .../crucible/1/1.6.0Beta2/Dockerfile          |  2 +-
 .../atlassian/crucible/1/1.6.1/Dockerfile     |  2 +-
 .../atlassian/crucible/1/1.6.2.1/Dockerfile   |  2 +-
 .../atlassian/crucible/1/1.6.2/Dockerfile     |  2 +-
 .../atlassian/crucible/1/1.6.3/Dockerfile     |  2 +-
 .../atlassian/crucible/1/1.6.4/Dockerfile     |  2 +-
 .../atlassian/crucible/1/1.6.5.a/Dockerfile   |  2 +-
 .../atlassian/crucible/1/1.6.5/Dockerfile     |  2 +-
 .../atlassian/crucible/1/1.6.5a/Dockerfile    |  2 +-
 .../atlassian/crucible/1/1.6.6/Dockerfile     |  2 +-
 .../atlassian/crucible/templates/1/Dockerfile |  2 +-
 .../fisheye-crucible/2/2.0.0.B3/Dockerfile    |  2 +-
 .../fisheye-crucible/2/2.0.0.RC1/Dockerfile   |  2 +-
 .../fisheye-crucible/2/2.0.0.RC2/Dockerfile   |  2 +-
 .../fisheye-crucible/2/2.0.0.RC3/Dockerfile   |  2 +-
 .../fisheye-crucible/2/2.0.0/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.0.1/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.0.2/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.0.3/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.0.4/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.0.5/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.0.6/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.1.0.M2cc/Dockerfile  |  2 +-
 .../fisheye-crucible/2/2.1.0.RC1/Dockerfile   |  2 +-
 .../fisheye-crucible/2/2.1.0/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.1.1/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.1.2/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.1.3/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.1.4/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.10.0/Dockerfile      |  2 +-
 .../fisheye-crucible/2/2.10.1/Dockerfile      |  2 +-
 .../fisheye-crucible/2/2.10.2/Dockerfile      |  2 +-
 .../fisheye-crucible/2/2.10.3/Dockerfile      |  2 +-
 .../fisheye-crucible/2/2.10.4/Dockerfile      |  2 +-
 .../fisheye-crucible/2/2.10.5/Dockerfile      |  2 +-
 .../fisheye-crucible/2/2.10.6/Dockerfile      |  2 +-
 .../fisheye-crucible/2/2.10.7/Dockerfile      |  2 +-
 .../fisheye-crucible/2/2.10.8/Dockerfile      |  2 +-
 .../fisheye-crucible/2/2.2.0/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.2.1/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.2.3/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.3.0/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.3.1/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.3.2/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.3.3/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.3.4/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.3.5/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.3.6/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.3.7/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.3.8/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.4.0/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.4.1/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.4.2/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.4.3/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.4.4/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.4.5/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.4.6/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.5.0/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.5.1/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.5.2/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.5.3/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.5.4/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.5.5/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.5.6/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.5.7/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.5.8/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.5.9/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.6.0/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.6.1/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.6.2/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.6.3/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.6.4/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.6.5/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.6.6/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.6.7/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.6.8/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.6.9/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.7.0-EAP-1/Dockerfile |  2 +-
 .../fisheye-crucible/2/2.7.0-EAP-2/Dockerfile |  2 +-
 .../fisheye-crucible/2/2.7.0/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.7.1/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.7.10/Dockerfile      |  2 +-
 .../fisheye-crucible/2/2.7.11/Dockerfile      |  2 +-
 .../fisheye-crucible/2/2.7.12/Dockerfile      |  2 +-
 .../fisheye-crucible/2/2.7.13/Dockerfile      |  2 +-
 .../fisheye-crucible/2/2.7.14/Dockerfile      |  2 +-
 .../fisheye-crucible/2/2.7.15/Dockerfile      |  2 +-
 .../fisheye-crucible/2/2.7.2/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.7.3/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.7.4/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.7.5/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.7.6/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.7.7/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.7.8/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.7.9/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.8.0-m1/Dockerfile    |  2 +-
 .../fisheye-crucible/2/2.8.0/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.8.1/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.8.2/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.9.0/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.9.1/Dockerfile       |  2 +-
 .../fisheye-crucible/2/2.9.2/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.0.0/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.0.1/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.0.2/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.0.3/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.0.4/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.1.0/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.1.1/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.1.2/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.1.3/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.1.4/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.1.5/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.1.6/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.1.7/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.10.1/Dockerfile      |  2 +-
 .../fisheye-crucible/3/3.10.2/Dockerfile      |  2 +-
 .../fisheye-crucible/3/3.10.3/Dockerfile      |  2 +-
 .../fisheye-crucible/3/3.10.4/Dockerfile      |  2 +-
 .../fisheye-crucible/3/3.2.0/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.2.1/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.2.2/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.2.3/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.2.4/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.2.5/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.3.0/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.3.1/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.3.2/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.3.3/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.3.4/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.4.0/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.4.3/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.4.4/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.4.5/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.4.6/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.4.7/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.5.0/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.5.1/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.5.2/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.5.3/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.5.4/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.5.5/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.6.0/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.6.1/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.6.2/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.6.3/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.6.4/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.7.0/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.7.1/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.8.0/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.8.1/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.9.0/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.9.1/Dockerfile       |  2 +-
 .../fisheye-crucible/3/3.9.2/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.0.2/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.0.3/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.0.4/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.1.0/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.1.1/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.1.2/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.1.3/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.2.0/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.2.1/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.2.2/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.2.3/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.3.0/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.3.1/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.3.2/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.3.3/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.4.0/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.4.1/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.4.2/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.4.3/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.4.5/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.4.6/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.4.7/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.5.0/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.5.1/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.5.2/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.5.3/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.5.4/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.6.0/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.6.1/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.7.0/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.7.1/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.7.2/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.7.3/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.8.0/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.8.1/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.8.2/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.8.3/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.8.4/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.8.5/Dockerfile       |  2 +-
 .../fisheye-crucible/4/4.8.6/Dockerfile       |  2 +-
 .../fisheye-crucible/latest/Dockerfile        |  2 +-
 .../fisheye-crucible/templates/2/Dockerfile   |  2 +-
 .../fisheye-crucible/templates/3/Dockerfile   |  2 +-
 .../fisheye-crucible/templates/4/Dockerfile   |  2 +-
 .../atlassian/fisheye/1/1.0.1a/Dockerfile     |  2 +-
 .../atlassian/fisheye/1/1.1.3/Dockerfile      |  2 +-
 .../atlassian/fisheye/1/1.2.5/Dockerfile      |  2 +-
 .../atlassian/fisheye/1/1.3.3/Dockerfile      |  2 +-
 .../atlassian/fisheye/1/1.3.4/Dockerfile      |  2 +-
 .../atlassian/fisheye/1/1.3.5/Dockerfile      |  2 +-
 .../atlassian/fisheye/1/1.3.6/Dockerfile      |  2 +-
 .../atlassian/fisheye/1/1.3.7/Dockerfile      |  2 +-
 .../atlassian/fisheye/1/1.3.8/Dockerfile      |  2 +-
 .../atlassian/fisheye/1/1.4.1/Dockerfile      |  2 +-
 .../atlassian/fisheye/1/1.4.2/Dockerfile      |  2 +-
 .../atlassian/fisheye/1/1.4.3/Dockerfile      |  2 +-
 .../atlassian/fisheye/1/1.4/Dockerfile        |  2 +-
 .../atlassian/fisheye/1/1.5.1/Dockerfile      |  2 +-
 .../atlassian/fisheye/1/1.5.2/Dockerfile      |  2 +-
 .../atlassian/fisheye/1/1.5.3/Dockerfile      |  2 +-
 .../atlassian/fisheye/1/1.5.4/Dockerfile      |  2 +-
 .../atlassian/fisheye/1/1.5/Dockerfile        |  2 +-
 .../atlassian/fisheye/1/1.6.0/Dockerfile      |  2 +-
 .../atlassian/fisheye/1/1.6.0Beta1/Dockerfile |  2 +-
 .../atlassian/fisheye/1/1.6.0Beta2/Dockerfile |  2 +-
 .../atlassian/fisheye/1/1.6.1/Dockerfile      |  2 +-
 .../atlassian/fisheye/1/1.6.3/Dockerfile      |  2 +-
 .../atlassian/fisheye/1/1.6.4/Dockerfile      |  2 +-
 .../atlassian/fisheye/1/1.6.5.a/Dockerfile    |  2 +-
 .../atlassian/fisheye/1/1.6.5/Dockerfile      |  2 +-
 .../atlassian/fisheye/1/1.6.5a/Dockerfile     |  2 +-
 .../atlassian/fisheye/1/1.6.6/Dockerfile      |  2 +-
 .../atlassian/fisheye/templates/1/Dockerfile  |  2 +-
 .../atlassian/jira/4/4.1.1/Dockerfile         |  2 +-
 .../atlassian/jira/4/4.1.2/Dockerfile         |  2 +-
 .../atlassian/jira/4/4.2.1/Dockerfile         |  2 +-
 .../atlassian/jira/4/4.2.2/Dockerfile         |  2 +-
 .../atlassian/jira/4/4.2.3/Dockerfile         |  2 +-
 .../atlassian/jira/4/4.2.4/Dockerfile         |  2 +-
 .../ecosystem/atlassian/jira/4/4.2/Dockerfile |  2 +-
 .../atlassian/jira/4/4.3.1/Dockerfile         |  2 +-
 .../atlassian/jira/4/4.3.2/Dockerfile         |  2 +-
 .../atlassian/jira/4/4.3.3/Dockerfile         |  2 +-
 .../atlassian/jira/4/4.3.4/Dockerfile         |  2 +-
 .../ecosystem/atlassian/jira/4/4.3/Dockerfile |  2 +-
 .../atlassian/jira/4/4.4.1/Dockerfile         |  2 +-
 .../atlassian/jira/4/4.4.3/Dockerfile         |  2 +-
 .../atlassian/jira/4/4.4.4/Dockerfile         |  2 +-
 .../atlassian/jira/4/4.4.5/Dockerfile         |  2 +-
 .../ecosystem/atlassian/jira/4/4.4/Dockerfile |  2 +-
 .../atlassian/jira/5/5.0.1/Dockerfile         |  2 +-
 .../atlassian/jira/5/5.0.2/Dockerfile         |  2 +-
 .../atlassian/jira/5/5.0.3/Dockerfile         |  2 +-
 .../atlassian/jira/5/5.0.4/Dockerfile         |  2 +-
 .../atlassian/jira/5/5.0.5/Dockerfile         |  2 +-
 .../atlassian/jira/5/5.0.6/Dockerfile         |  2 +-
 .../atlassian/jira/5/5.0.7/Dockerfile         |  2 +-
 .../ecosystem/atlassian/jira/5/5.0/Dockerfile |  2 +-
 .../atlassian/jira/5/5.1.1/Dockerfile         |  2 +-
 .../atlassian/jira/5/5.1.2/Dockerfile         |  2 +-
 .../atlassian/jira/5/5.1.3/Dockerfile         |  2 +-
 .../atlassian/jira/5/5.1.4/Dockerfile         |  2 +-
 .../atlassian/jira/5/5.1.5/Dockerfile         |  2 +-
 .../atlassian/jira/5/5.1.6/Dockerfile         |  2 +-
 .../atlassian/jira/5/5.1.7/Dockerfile         |  2 +-
 .../atlassian/jira/5/5.1.8/Dockerfile         |  2 +-
 .../ecosystem/atlassian/jira/5/5.1/Dockerfile |  2 +-
 .../atlassian/jira/5/5.2.1/Dockerfile         |  2 +-
 .../atlassian/jira/5/5.2.10/Dockerfile        |  2 +-
 .../atlassian/jira/5/5.2.11/Dockerfile        |  2 +-
 .../atlassian/jira/5/5.2.2/Dockerfile         |  2 +-
 .../atlassian/jira/5/5.2.3/Dockerfile         |  2 +-
 .../atlassian/jira/5/5.2.4.1/Dockerfile       |  2 +-
 .../atlassian/jira/5/5.2.4/Dockerfile         |  2 +-
 .../atlassian/jira/5/5.2.5/Dockerfile         |  2 +-
 .../atlassian/jira/5/5.2.6/Dockerfile         |  2 +-
 .../atlassian/jira/5/5.2.7/Dockerfile         |  2 +-
 .../atlassian/jira/5/5.2.8/Dockerfile         |  2 +-
 .../atlassian/jira/5/5.2.9/Dockerfile         |  2 +-
 .../ecosystem/atlassian/jira/5/5.2/Dockerfile |  2 +-
 .../atlassian/jira/6/6.0.1/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.0.2/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.0.3/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.0.4/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.0.5/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.0.6/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.0.7/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.0.8/Dockerfile         |  2 +-
 .../ecosystem/atlassian/jira/6/6.0/Dockerfile |  2 +-
 .../atlassian/jira/6/6.1.1/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.1.2/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.1.3/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.1.4/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.1.5/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.1.6/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.1.7/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.1.8/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.1.9/Dockerfile         |  2 +-
 .../ecosystem/atlassian/jira/6/6.1/Dockerfile |  2 +-
 .../atlassian/jira/6/6.2.1/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.2.2/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.2.3/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.2.4/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.2.5/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.2.6/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.2.7/Dockerfile         |  2 +-
 .../ecosystem/atlassian/jira/6/6.2/Dockerfile |  2 +-
 .../atlassian/jira/6/6.3.1/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.3.10/Dockerfile        |  2 +-
 .../atlassian/jira/6/6.3.11/Dockerfile        |  2 +-
 .../atlassian/jira/6/6.3.12/Dockerfile        |  2 +-
 .../atlassian/jira/6/6.3.13/Dockerfile        |  2 +-
 .../atlassian/jira/6/6.3.14/Dockerfile        |  2 +-
 .../atlassian/jira/6/6.3.15/Dockerfile        |  2 +-
 .../atlassian/jira/6/6.3.3/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.3.4/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.3.5/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.3.6/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.3.7/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.3.8/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.3.9/Dockerfile         |  2 +-
 .../ecosystem/atlassian/jira/6/6.3/Dockerfile |  2 +-
 .../atlassian/jira/6/6.4.1/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.4.10/Dockerfile        |  2 +-
 .../atlassian/jira/6/6.4.11/Dockerfile        |  2 +-
 .../atlassian/jira/6/6.4.12/Dockerfile        |  2 +-
 .../atlassian/jira/6/6.4.13/Dockerfile        |  2 +-
 .../atlassian/jira/6/6.4.14/Dockerfile        |  2 +-
 .../atlassian/jira/6/6.4.2/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.4.3/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.4.4/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.4.5/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.4.6/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.4.7/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.4.8/Dockerfile         |  2 +-
 .../atlassian/jira/6/6.4.9/Dockerfile         |  2 +-
 .../ecosystem/atlassian/jira/6/6.4/Dockerfile |  2 +-
 .../atlassian/jira/7/7.0.0/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.0.10/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.0.11/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.0.2/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.0.4/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.0.5/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.0.9/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.1.0-m01/Dockerfile     |  2 +-
 .../atlassian/jira/7/7.1.0/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.1.1/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.1.10/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.1.2/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.1.4/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.1.6/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.1.7/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.1.8/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.1.9/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.10.0/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.10.1/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.10.2/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.11.0/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.11.1/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.11.2/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.12.0/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.12.1/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.12.3/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.13.0/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.13.1/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.13.11/Dockerfile       |  2 +-
 .../atlassian/jira/7/7.13.12/Dockerfile       |  2 +-
 .../atlassian/jira/7/7.13.13/Dockerfile       |  2 +-
 .../atlassian/jira/7/7.13.14/Dockerfile       |  2 +-
 .../atlassian/jira/7/7.13.15/Dockerfile       |  2 +-
 .../atlassian/jira/7/7.13.16/Dockerfile       |  2 +-
 .../atlassian/jira/7/7.13.17/Dockerfile       |  2 +-
 .../atlassian/jira/7/7.13.18/Dockerfile       |  2 +-
 .../atlassian/jira/7/7.13.2/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.13.3/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.13.4/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.13.5/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.13.6/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.13.8/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.13.9/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.2.0/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.2.1/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.2.10/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.2.11/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.2.12/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.2.13/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.2.14/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.2.15/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.2.2/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.2.3/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.2.4/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.2.6/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.2.7/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.2.8/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.2.9/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.3.0/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.3.1/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.3.2/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.3.3/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.3.4/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.3.5/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.3.6/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.3.7/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.3.8/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.3.9/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.4.0/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.4.1/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.4.2/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.4.3/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.4.4/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.4.5/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.4.6/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.5.0/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.5.1/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.5.2/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.5.3/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.5.4/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.6.0/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.6.1/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.6.10/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.6.11/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.6.12/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.6.13/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.6.14/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.6.15/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.6.16/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.6.17/Dockerfile        |  2 +-
 .../atlassian/jira/7/7.6.2/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.6.3/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.6.4/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.6.6/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.6.7/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.6.8/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.6.9/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.7.0/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.7.1/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.7.2/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.7.4/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.8.0/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.8.1/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.8.2/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.8.4/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.9.0/Dockerfile         |  2 +-
 .../atlassian/jira/7/7.9.2/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.0.0/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.0.2/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.0.3/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.1.0/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.1.1/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.1.2/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.1.3/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.10.0/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.10.0/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.10.1/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.10.1/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.11.0/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.11.0/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.11.1/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.11.1/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.12.0/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.12.0/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.12.1/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.12.1/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.12.2/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.12.2/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.12.3/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.12.3/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.13.0/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.13.0/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.13.1/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.13.1/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.13.10/Dockerfile       |  2 +-
 .../atlassian/jira/8/8.13.10/Dockerfile.jdk11 |  2 +-
 .../atlassian/jira/8/8.13.11/Dockerfile       |  2 +-
 .../atlassian/jira/8/8.13.11/Dockerfile.jdk11 |  2 +-
 .../atlassian/jira/8/8.13.12/Dockerfile       |  2 +-
 .../atlassian/jira/8/8.13.12/Dockerfile.jdk11 |  2 +-
 .../atlassian/jira/8/8.13.13/Dockerfile       |  2 +-
 .../atlassian/jira/8/8.13.13/Dockerfile.jdk11 |  2 +-
 .../atlassian/jira/8/8.13.2/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.13.2/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.13.3/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.13.3/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.13.4/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.13.4/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.13.5/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.13.5/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.13.6/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.13.6/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.13.7/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.13.7/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.13.8/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.13.8/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.13.9/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.13.9/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.14.0/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.14.0/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.14.1/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.14.1/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.15.0/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.15.0/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.15.1/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.15.1/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.16.0/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.16.0/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.16.1/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.16.1/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.16.2/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.16.2/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.17.0/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.17.0/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.17.1/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.17.1/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.18.1/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.18.1/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.18.2/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.18.2/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.19.0/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.19.0/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.19.1/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.19.1/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.2.0/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.2.0/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.2.1/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.2.1/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.2.2/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.2.2/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.2.3/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.2.3/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.2.4/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.2.4/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.2.5/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.2.5/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.2.6/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.2.6/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.20.0/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.20.0/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.20.1/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.20.1/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.21.0/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.21.0/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.22.0/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.22.0/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.22.1/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.22.1/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.3.0/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.3.0/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.3.1/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.3.1/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.3.2/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.3.2/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.3.3/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.3.3/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.3.4/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.3.4/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.3.5/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.3.5/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.4.0/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.4.0/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.4.1/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.4.1/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.4.2/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.4.2/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.4.3/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.4.3/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.5.0/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.5.0/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.5.1/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.5.1/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.5.10/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.5.10/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.5.11/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.5.11/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.5.12/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.5.12/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.5.13/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.5.13/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.5.14/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.5.14/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.5.15/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.5.15/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.5.16/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.5.16/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.5.17/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.5.17/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.5.18/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.5.18/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.5.19/Dockerfile        |  2 +-
 .../atlassian/jira/8/8.5.19/Dockerfile.jdk11  |  2 +-
 .../atlassian/jira/8/8.5.2/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.5.2/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.5.3/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.5.3/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.5.4/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.5.4/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.5.5/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.5.5/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.5.6/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.5.6/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.5.7/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.5.7/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.5.8/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.5.8/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.5.9/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.5.9/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.6.0/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.6.0/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.6.1/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.6.1/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.7.0/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.7.0/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.7.1/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.7.1/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.8.0/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.8.0/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.8.1/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.8.1/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.9.0/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.9.0/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/8/8.9.1/Dockerfile         |  2 +-
 .../atlassian/jira/8/8.9.1/Dockerfile.jdk11   |  2 +-
 .../atlassian/jira/latest/Dockerfile          |  2 +-
 .../atlassian/jira/latest/Dockerfile.jdk11    |  2 +-
 .../atlassian/jira/templates/2/Dockerfile     |  2 +-
 .../atlassian/jira/templates/3/Dockerfile     |  2 +-
 .../atlassian/jira/templates/4/Dockerfile     |  2 +-
 .../atlassian/jira/templates/5/Dockerfile     |  2 +-
 .../atlassian/jira/templates/6/Dockerfile     |  2 +-
 .../atlassian/jira/templates/7/Dockerfile     |  2 +-
 .../atlassian/jira/templates/8/Dockerfile     |  2 +-
 .../jira/templates/8/Dockerfile.jdk11         |  2 +-
 .../debian/08-jessie/jdk11/Dockerfile.develop | 26 ++++++
 .../debian/08-jessie/jdk11/docker-compose.yml |  5 +
 .../debian/08-jessie/jdk12/Dockerfile.develop | 26 ++++++
 .../debian/08-jessie/jdk12/docker-compose.yml |  5 +
 .../debian/08-jessie/jdk13/Dockerfile.develop | 26 ++++++
 .../debian/08-jessie/jdk13/docker-compose.yml |  5 +
 .../debian/08-jessie/jdk14/Dockerfile.develop | 26 ++++++
 .../debian/08-jessie/jdk14/docker-compose.yml |  5 +
 .../debian/08-jessie/jdk15/Dockerfile.develop | 26 ++++++
 .../debian/08-jessie/jdk15/docker-compose.yml |  5 +
 .../debian/08-jessie/jdk16/Dockerfile.develop | 26 ++++++
 .../debian/08-jessie/jdk16/docker-compose.yml |  5 +
 .../debian/08-jessie/jdk17/Dockerfile.develop | 26 ++++++
 .../debian/08-jessie/jdk17/docker-compose.yml |  5 +
 .../debian/08-jessie/jdk18/Dockerfile         |  2 +-
 .../debian/08-jessie/jdk18/Dockerfile.develop | 26 ++++++
 .../debian/08-jessie/jdk18/docker-compose.yml |  5 +
 .../debian/08-jessie/jdk6/Dockerfile.develop  | 22 +++++
 .../debian/08-jessie/jdk6/docker-compose.yml  |  5 +
 .../debian/08-jessie/jdk7/Dockerfile.develop  | 22 +++++
 .../debian/08-jessie/jdk7/docker-compose.yml  |  5 +
 .../debian/08-jessie/jdk8/Dockerfile.develop  | 23 +++++
 .../debian/08-jessie/jdk8/docker-compose.yml  |  5 +
 .../09-stretch/jdk11/Dockerfile.develop       | 26 ++++++
 .../09-stretch/jdk11/docker-compose.yml       |  8 +-
 .../09-stretch/jdk12/Dockerfile.develop       | 26 ++++++
 .../09-stretch/jdk12/docker-compose.yml       |  5 +
 .../09-stretch/jdk13/Dockerfile.develop       | 26 ++++++
 .../09-stretch/jdk13/docker-compose.yml       |  5 +
 .../09-stretch/jdk14/Dockerfile.develop       | 26 ++++++
 .../09-stretch/jdk14/docker-compose.yml       |  5 +
 .../09-stretch/jdk15/Dockerfile.develop       | 26 ++++++
 .../09-stretch/jdk15/docker-compose.yml       |  5 +
 .../09-stretch/jdk16/Dockerfile.develop       | 26 ++++++
 .../09-stretch/jdk16/docker-compose.yml       |  5 +
 .../09-stretch/jdk17/Dockerfile.develop       | 26 ++++++
 .../09-stretch/jdk17/docker-compose.yml       |  5 +
 .../debian/09-stretch/jdk18/Dockerfile        |  2 +-
 .../09-stretch/jdk18/Dockerfile.develop       | 26 ++++++
 .../09-stretch/jdk18/docker-compose.yml       |  5 +
 .../debian/09-stretch/jdk6/Dockerfile.develop | 22 +++++
 .../debian/09-stretch/jdk6/docker-compose.yml |  5 +
 .../debian/09-stretch/jdk7/Dockerfile.develop | 22 +++++
 .../debian/09-stretch/jdk7/docker-compose.yml |  5 +
 .../debian/09-stretch/jdk8/Dockerfile.develop | 23 +++++
 .../debian/09-stretch/jdk8/docker-compose.yml |  7 +-
 .../debian/10-buster/jdk11/Dockerfile.develop | 26 ++++++
 .../debian/10-buster/jdk11/docker-compose.yml |  6 +-
 .../debian/10-buster/jdk12/Dockerfile.develop | 26 ++++++
 .../debian/10-buster/jdk12/docker-compose.yml |  5 +
 .../debian/10-buster/jdk13/Dockerfile.develop | 26 ++++++
 .../debian/10-buster/jdk13/docker-compose.yml |  5 +
 .../debian/10-buster/jdk14/Dockerfile.develop | 26 ++++++
 .../debian/10-buster/jdk14/docker-compose.yml |  5 +
 .../debian/10-buster/jdk15/Dockerfile.develop | 26 ++++++
 .../debian/10-buster/jdk15/docker-compose.yml |  5 +
 .../debian/10-buster/jdk16/Dockerfile.develop | 26 ++++++
 .../debian/10-buster/jdk16/docker-compose.yml |  5 +
 .../debian/10-buster/jdk17/Dockerfile.develop | 26 ++++++
 .../debian/10-buster/jdk17/docker-compose.yml |  5 +
 .../debian/10-buster/jdk18/Dockerfile         |  2 +-
 .../debian/10-buster/jdk18/Dockerfile.develop | 26 ++++++
 .../debian/10-buster/jdk18/docker-compose.yml |  5 +
 .../debian/10-buster/jdk6/Dockerfile.develop  | 22 +++++
 .../debian/10-buster/jdk6/docker-compose.yml  |  5 +
 .../debian/10-buster/jdk7/Dockerfile.develop  | 22 +++++
 .../debian/10-buster/jdk7/docker-compose.yml  |  5 +
 .../debian/10-buster/jdk8/Dockerfile.develop  | 23 +++++
 .../debian/10-buster/jdk8/docker-compose.yml  |  7 +-
 .../11-bullseye/jdk11/Dockerfile.develop      | 26 ++++++
 .../11-bullseye/jdk11/docker-compose.yml      |  6 +-
 .../11-bullseye/jdk12/Dockerfile.develop      | 26 ++++++
 .../11-bullseye/jdk12/docker-compose.yml      |  5 +
 .../11-bullseye/jdk13/Dockerfile.develop      | 26 ++++++
 .../11-bullseye/jdk13/docker-compose.yml      |  5 +
 .../11-bullseye/jdk14/Dockerfile.develop      | 26 ++++++
 .../11-bullseye/jdk14/docker-compose.yml      |  5 +
 .../11-bullseye/jdk15/Dockerfile.develop      | 26 ++++++
 .../11-bullseye/jdk15/docker-compose.yml      |  5 +
 .../11-bullseye/jdk16/Dockerfile.develop      | 26 ++++++
 .../11-bullseye/jdk16/docker-compose.yml      |  5 +
 .../11-bullseye/jdk17/Dockerfile.develop      | 26 ++++++
 .../11-bullseye/jdk17/docker-compose.yml      |  5 +
 .../debian/11-bullseye/jdk18/Dockerfile       |  2 +-
 .../11-bullseye/jdk18/Dockerfile.develop      | 26 ++++++
 .../11-bullseye/jdk18/docker-compose.yml      |  5 +
 .../debian/11-bullseye/jdk6/Dockerfile        |  2 +-
 .../11-bullseye/jdk6/Dockerfile.develop       | 22 +++++
 .../11-bullseye/jdk6/docker-compose.yml       |  7 +-
 .../11-bullseye/jdk7/Dockerfile.develop       | 22 +++++
 .../11-bullseye/jdk7/docker-compose.yml       |  5 +
 .../11-bullseye/jdk8/Dockerfile.develop       | 23 +++++
 .../11-bullseye/jdk8/docker-compose.yml       |  7 +-
 .../12-bookworm/jdk11/Dockerfile.develop      | 26 ++++++
 .../12-bookworm/jdk11/docker-compose.yml      |  6 +-
 .../12-bookworm/jdk12/Dockerfile.develop      | 26 ++++++
 .../12-bookworm/jdk12/docker-compose.yml      |  5 +
 .../12-bookworm/jdk13/Dockerfile.develop      | 26 ++++++
 .../12-bookworm/jdk13/docker-compose.yml      |  5 +
 .../12-bookworm/jdk14/Dockerfile.develop      | 26 ++++++
 .../12-bookworm/jdk14/docker-compose.yml      |  5 +
 .../12-bookworm/jdk15/Dockerfile.develop      | 26 ++++++
 .../12-bookworm/jdk15/docker-compose.yml      |  5 +
 .../12-bookworm/jdk16/Dockerfile.develop      | 26 ++++++
 .../12-bookworm/jdk16/docker-compose.yml      |  5 +
 .../12-bookworm/jdk17/Dockerfile.develop      | 26 ++++++
 .../12-bookworm/jdk17/docker-compose.yml      |  5 +
 .../debian/12-bookworm/jdk18/Dockerfile       |  2 +-
 .../12-bookworm/jdk18/Dockerfile.develop      | 26 ++++++
 .../12-bookworm/jdk18/docker-compose.yml      |  5 +
 .../debian/12-bookworm/jdk6/Dockerfile        |  2 +-
 .../12-bookworm/jdk6/Dockerfile.develop       | 22 +++++
 .../12-bookworm/jdk6/docker-compose.yml       |  7 +-
 .../12-bookworm/jdk7/Dockerfile.develop       | 22 +++++
 .../12-bookworm/jdk7/docker-compose.yml       |  5 +
 .../12-bookworm/jdk8/Dockerfile.develop       | 23 +++++
 .../12-bookworm/jdk8/docker-compose.yml       |  7 +-
 linux/ecosystem/nginx/1.14.2/main/Dockerfile  |  2 +-
 linux/ecosystem/nginx/1.15.12/main/Dockerfile |  2 +-
 linux/ecosystem/nginx/1.16.1/main/Dockerfile  |  2 +-
 linux/ecosystem/nginx/1.17.10/main/Dockerfile |  2 +-
 linux/ecosystem/nginx/1.18.0/main/Dockerfile  |  2 +-
 linux/ecosystem/nginx/1.19.10/main/Dockerfile |  2 +-
 linux/ecosystem/nginx/1.20.1/main/Dockerfile  |  2 +-
 linux/ecosystem/nginx/1.21.3/main/Dockerfile  |  2 +-
 linux/ecosystem/nginx/latest/main/Dockerfile  |  2 +-
 .../nginx/latest/quic/Dockerfile.experimental |  2 +-
 linux/ecosystem/nodejs/current/Dockerfile     |  2 +-
 linux/ecosystem/nodejs/lts/Dockerfile         |  2 +-
 linux/ecosystem/nodejs/node12/Dockerfile      |  2 +-
 linux/ecosystem/nodejs/node14/Dockerfile      |  2 +-
 linux/ecosystem/nodejs/node15/Dockerfile      |  2 +-
 linux/ecosystem/nodejs/node16/Dockerfile      |  2 +-
 linux/ecosystem/nodejs/node17/Dockerfile      |  2 +-
 linux/ecosystem/nodejs/node18/Dockerfile      | 34 +++++++
 linux/ecosystem/nodejs/node18/Makefile        | 19 ++++
 linux/ecosystem/nodejs/node18/README.md       | 93 +++++++++++++++++++
 .../nodejs/node18/docker-compose.yml          |  6 ++
 linux/ecosystem/php/latest/Dockerfile         |  2 +-
 linux/ecosystem/php/php7.4/Dockerfile         |  2 +-
 linux/ecosystem/php/php8.0/Dockerfile         |  2 +-
 .../php/php8.1-p4-not-ready/Dockerfile        |  2 +-
 linux/ecosystem/postgres/10/Dockerfile        |  2 +-
 linux/ecosystem/postgres/11/Dockerfile        |  2 +-
 linux/ecosystem/postgres/12/Dockerfile        |  2 +-
 linux/ecosystem/postgres/13/Dockerfile        |  2 +-
 linux/ecosystem/postgres/14/Dockerfile        |  2 +-
 linux/ecosystem/postgres/8.2/Dockerfile       |  2 +-
 linux/ecosystem/postgres/8.3/Dockerfile       |  2 +-
 linux/ecosystem/postgres/8.4/Dockerfile       |  2 +-
 linux/ecosystem/postgres/9.0/Dockerfile       |  2 +-
 linux/ecosystem/postgres/9.1/Dockerfile       |  2 +-
 linux/ecosystem/postgres/9.2/Dockerfile       |  2 +-
 linux/ecosystem/postgres/9.3/Dockerfile       |  2 +-
 linux/ecosystem/postgres/9.4/Dockerfile       |  2 +-
 linux/ecosystem/postgres/9.5/Dockerfile       |  2 +-
 linux/ecosystem/postgres/9.6/Dockerfile       |  2 +-
 linux/ecosystem/postgres/latest/Dockerfile    |  2 +-
 linux/ecosystem/qbittorrent/latest/Dockerfile |  2 +-
 linux/ecosystem/qbittorrent/stable/Dockerfile |  2 +-
 .../teamcity/agent/latest/Dockerfile          |  2 +-
 .../teamcity/agent/node18/Dockerfile          | 38 ++++++++
 .../ecosystem/teamcity/agent/node18/Makefile  | 19 ++++
 .../ecosystem/teamcity/agent/node18/README.md | 93 +++++++++++++++++++
 .../teamcity/agent/node18/docker-compose.yml  |  6 ++
 linux/ecosystem/torrserver/Dockerfile         |  2 +-
 1108 files changed, 2988 insertions(+), 1031 deletions(-)
 create mode 100644 linux/ecosystem/epicmorg/debian/08-jessie/jdk11/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/08-jessie/jdk12/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/08-jessie/jdk13/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/08-jessie/jdk14/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/08-jessie/jdk15/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/08-jessie/jdk16/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/08-jessie/jdk17/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/08-jessie/jdk18/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/08-jessie/jdk6/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/08-jessie/jdk7/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/08-jessie/jdk8/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/09-stretch/jdk11/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/09-stretch/jdk12/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/09-stretch/jdk13/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/09-stretch/jdk14/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/09-stretch/jdk15/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/09-stretch/jdk16/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/09-stretch/jdk17/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/09-stretch/jdk18/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/09-stretch/jdk6/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/09-stretch/jdk7/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/09-stretch/jdk8/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/10-buster/jdk11/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/10-buster/jdk12/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/10-buster/jdk13/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/10-buster/jdk14/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/10-buster/jdk15/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/10-buster/jdk16/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/10-buster/jdk17/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/10-buster/jdk18/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/10-buster/jdk6/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/10-buster/jdk7/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/10-buster/jdk8/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/11-bullseye/jdk11/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/11-bullseye/jdk12/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/11-bullseye/jdk13/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/11-bullseye/jdk14/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/11-bullseye/jdk15/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/11-bullseye/jdk16/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/11-bullseye/jdk17/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/11-bullseye/jdk18/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/11-bullseye/jdk6/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/11-bullseye/jdk7/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/11-bullseye/jdk8/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk6/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk7/Dockerfile.develop
 create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/Dockerfile.develop
 create mode 100644 linux/ecosystem/nodejs/node18/Dockerfile
 create mode 100644 linux/ecosystem/nodejs/node18/Makefile
 create mode 100644 linux/ecosystem/nodejs/node18/README.md
 create mode 100644 linux/ecosystem/nodejs/node18/docker-compose.yml
 create mode 100644 linux/ecosystem/teamcity/agent/node18/Dockerfile
 create mode 100644 linux/ecosystem/teamcity/agent/node18/Makefile
 create mode 100644 linux/ecosystem/teamcity/agent/node18/README.md
 create mode 100644 linux/ecosystem/teamcity/agent/node18/docker-compose.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 542d0af2e..d85c22b05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 * `april, may` - :x: `BREAKING CHANGES` :x:
 	* deprecating `epicmorg/prod`, `epicmorg/edge`, `epicmorg/develop` images.
 	* legacy images are replaced by new base images. see `epicmorg/debian` section.
+	* added `nodejs18`
 * `february, march`
 	* new `nextcloud` images, updated `atlassian` images.
 	* new `nodejs` iamges.
diff --git a/Makefile b/Makefile
index 4a7da1bfc..92d2d8170 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-VERSION             =  "2022.03.21"
+VERSION             =  "2022.05.27"
 AUTHOR              =  "EpicMorg"
-MODIFIED            =  "AlexZ"
+MODIFIED            =  "STAM"
 DOCKER_SCAN_SUGGEST = false
 
 all: app
@@ -75,35 +75,35 @@ advanced-redash-images:
 	cd `pwd`/linux/advanced/redash				&& pwd && make
 
 advanced-zabbix-images:
-	cd `pwd`/linux/advanced/zabbix/agent		  && pwd && make
-	cd `pwd`/linux/advanced/zabbix/java-gateway   && pwd && make
-	cd `pwd`/linux/advanced/zabbix/proxy		  && pwd && make
-	cd `pwd`/linux/advanced/zabbix/server		 && pwd && make
-	cd `pwd`/linux/advanced/zabbix/web			&& pwd && make
+	cd `pwd`/linux/advanced/zabbix/agent		  && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/zabbix/java-gateway   && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/zabbix/proxy		  && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/zabbix/server		 && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/zabbix/web			&& pwd && make build && make deploy
 
 advanced-nextcloud-images:
-	cd `pwd`/linux/advanced/nextcloud/pure/14		  && pwd && make
-	cd `pwd`/linux/advanced/nextcloud/pure/15		  && pwd && make
-	cd `pwd`/linux/advanced/nextcloud/pure/16		  && pwd && make
-	cd `pwd`/linux/advanced/nextcloud/pure/17		  && pwd && make
-	cd `pwd`/linux/advanced/nextcloud/pure/18		  && pwd && make
-	cd `pwd`/linux/advanced/nextcloud/pure/19		  && pwd && make
-	cd `pwd`/linux/advanced/nextcloud/pure/20		  && pwd && make
-	cd `pwd`/linux/advanced/nextcloud/pure/21		  && pwd && make
-	cd `pwd`/linux/advanced/nextcloud/pure/22		  && pwd && make
-	cd `pwd`/linux/advanced/nextcloud/pure/23		  && pwd && make
+	cd `pwd`/linux/advanced/nextcloud/pure/14		  && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/nextcloud/pure/15		  && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/nextcloud/pure/16		  && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/nextcloud/pure/17		  && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/nextcloud/pure/18		  && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/nextcloud/pure/19		  && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/nextcloud/pure/20		  && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/nextcloud/pure/21		  && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/nextcloud/pure/22		  && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/nextcloud/pure/23		  && pwd && make build && make deploy
 
 advanced-nextcloud-patched-images:
-	cd `pwd`/linux/advanced/nextcloud/patched/14		  && pwd && make
-	cd `pwd`/linux/advanced/nextcloud/patched/15		  && pwd && make
-	cd `pwd`/linux/advanced/nextcloud/patched/16		  && pwd && make
-	cd `pwd`/linux/advanced/nextcloud/patched/17		  && pwd && make
-	cd `pwd`/linux/advanced/nextcloud/patched/18		  && pwd && make
-	cd `pwd`/linux/advanced/nextcloud/patched/19		  && pwd && make
-	cd `pwd`/linux/advanced/nextcloud/patched/20		  && pwd && make
-	cd `pwd`/linux/advanced/nextcloud/patched/21		  && pwd && make
-	cd `pwd`/linux/advanced/nextcloud/patched/22		  && pwd && make
-	cd `pwd`/linux/advanced/nextcloud/patched/23		  && pwd && make
+	cd `pwd`/linux/advanced/nextcloud/patched/14		  && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/nextcloud/patched/15		  && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/nextcloud/patched/16		  && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/nextcloud/patched/17		  && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/nextcloud/patched/18		  && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/nextcloud/patched/19		  && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/nextcloud/patched/20		  && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/nextcloud/patched/21		  && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/nextcloud/patched/22		  && pwd && make build && make deploy
+	cd `pwd`/linux/advanced/nextcloud/patched/23		  && pwd && make build && make deploy
 
 ecosystem-images:
 	make bundle-base-images
@@ -129,6 +129,7 @@ ecosystem-debian-images:
 ecosystem-debian-jessie-images:
 	cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/slim    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/main    && pwd && make build && make deploy
+	cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/develop    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk6    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk7    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk8    && pwd && make build && make deploy
@@ -140,11 +141,11 @@ ecosystem-debian-jessie-images:
 	cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk16    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk17    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk18    && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/develop    && pwd && make build && make deploy
 
 ecosystem-debian-stretch-images:
 	cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/slim    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/main    && pwd && make build && make deploy
+	cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/develop    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk6    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk7    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk8    && pwd && make build && make deploy
@@ -156,11 +157,11 @@ ecosystem-debian-stretch-images:
 	cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk16    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk17    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk18    && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/develop    && pwd && make build && make deploy
 
 ecosystem-debian-buster-images:
 	cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/slim    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/main    && pwd && make build && make deploy
+	cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/develop    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk6    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk7    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk8    && pwd && make build && make deploy
@@ -172,11 +173,11 @@ ecosystem-debian-buster-images:
 	cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk16    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk17    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk18    && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/develop    && pwd && make build && make deploy
 
 ecosystem-debian-bullseye-images:
 	cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/slim    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/main    && pwd && make build && make deploy
+	cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/develop    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/jdk6    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/jdk7    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/jdk8    && pwd && make build && make deploy
@@ -188,11 +189,11 @@ ecosystem-debian-bullseye-images:
 	cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/jdk16    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/jdk17    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/jdk18    && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/develop    && pwd && make build && make deploy
 
 ecosystem-debian-bookworm-images:
 	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/slim    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/main    && pwd && make build && make deploy
+	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/develop    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk6    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk7    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8    && pwd && make build && make deploy
@@ -204,7 +205,6 @@ ecosystem-debian-bookworm-images:
 	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17    && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18    && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/develop    && pwd && make build && make deploy
 
 ecosystem-php-images:
 	cd `pwd`/linux/ecosystem/php/latest             && pwd && make build && make deploy
@@ -242,6 +242,7 @@ ecosystem-nodejs-images:
 	cd `pwd`/linux/ecosystem/nodejs/node15         && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/nodejs/node16         && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/nodejs/node17         && pwd && make build && make deploy
+	cd `pwd`/linux/ecosystem/nodejs/node18         && pwd && make build && make deploy
 
 ecosystem-vk2discord-images: 
 	cd `pwd`/linux/ecosystem/vk2discord     && pwd && make build && make deploy
@@ -279,6 +280,7 @@ ecosystem-teamcity-agent-images:
 	cd `pwd`/linux/ecosystem/teamcity/agent/node15         && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/teamcity/agent/node16         && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/teamcity/agent/node17         && pwd && make build && make deploy
+	cd `pwd`/linux/ecosystem/teamcity/agent/node18         && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/teamcity/agent/php7.2         && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/teamcity/agent/php7.3         && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/teamcity/agent/php7.4         && pwd && make build && make deploy
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.0/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.0.0/Dockerfile
index c0937af82..21f0039bb 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.0/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.0.0/Dockerfile.jdk11
index e2d740f96..72941c657 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.1/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.0.1/Dockerfile
index 22944df50..71cb8093b 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.1/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.0.1/Dockerfile.jdk11
index 062d04b0a..9f858b5cb 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.10/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.0.10/Dockerfile
index ed470780b..732ae0e69 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.10/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.10/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.10/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.0.10/Dockerfile.jdk11
index 7e46dc3d5..e75db0eac 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.10/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.10/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.11/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.0.11/Dockerfile
index 162b6da0c..8eb7d7ce3 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.11/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.11/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.11/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.0.11/Dockerfile.jdk11
index ff9ce227c..fd28a2459 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.11/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.11/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.2/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.0.2/Dockerfile
index 1e019fed0..ac02b4232 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.2/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.0.2/Dockerfile.jdk11
index b2787c46d..83058a7f0 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.3/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.0.3/Dockerfile
index 6b24afb58..1c8642d8d 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.3/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.0.3/Dockerfile.jdk11
index b344ab06c..f247d2ee8 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.3/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.3/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.4/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.0.4/Dockerfile
index 9b97933bb..8881505c8 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.4/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.4/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.0.4/Dockerfile.jdk11
index caefc5aff..ee3d72de6 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.4/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.4/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.5/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.0.5/Dockerfile
index 364a70c89..c4084af94 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.5/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.5/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.0.5/Dockerfile.jdk11
index 38859b28e..584ec0050 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.5/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.5/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.6/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.0.6/Dockerfile
index 062d48a5a..80fb3c3a1 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.6/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.6/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.0.6/Dockerfile.jdk11
index 6dcc7175d..2ff4d7b56 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.6/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.6/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.7/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.0.7/Dockerfile
index da0774d02..7e40511d4 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.7/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.7/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.0.7/Dockerfile.jdk11
index c51b46a3f..85f3191fe 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.7/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.7/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.9/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.0.9/Dockerfile
index 1635b2060..b3c18a3c8 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.9/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.0.9/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.0.9/Dockerfile.jdk11
index 96aa8d176..e8e9b2841 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.0.9/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.0.9/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.1.0/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.1.0/Dockerfile
index 2fd77161a..ed4f3853b 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.1.0/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.1.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.1.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.1.0/Dockerfile.jdk11
index 3d877d7dc..cb5d76e31 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.1.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.1.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.1.1/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.1.1/Dockerfile
index 8d13a007e..92c1de3b2 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.1.1/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.1.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.1.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.1.1/Dockerfile.jdk11
index 7cd3f13f1..8758ce26a 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.1.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.1.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.1.2/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.1.2/Dockerfile
index 45f5d4afe..24253c128 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.1.2/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.1.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.1.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.1.2/Dockerfile.jdk11
index 34a9a0c08..365012751 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.1.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.1.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.1.3/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.1.3/Dockerfile
index 4ee74f3b9..bd6cfee40 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.1.3/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.1.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.1.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.1.3/Dockerfile.jdk11
index 43807d731..7c9f56672 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.1.3/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.1.3/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.1.4/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.1.4/Dockerfile
index cfb7a9fc9..c0722fb06 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.1.4/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.1.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.1.4/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.1.4/Dockerfile.jdk11
index e4a2add7e..b9f14e338 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.1.4/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.1.4/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.1.5/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.1.5/Dockerfile
index 2e51f4fed..48b24556a 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.1.5/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.1.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.1.5/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.1.5/Dockerfile.jdk11
index 40ca9f3d1..eed5dd12b 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.1.5/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.1.5/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.1.6/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.1.6/Dockerfile
index fe50047e6..08ed246f0 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.1.6/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.1.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.1.6/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.1.6/Dockerfile.jdk11
index f136b0930..7df528c6c 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.1.6/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.1.6/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.1.7/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.1.7/Dockerfile
index a7bd4961a..f4651f091 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.1.7/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.1.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.1.7/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.1.7/Dockerfile.jdk11
index e1d78352a..90525125f 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.1.7/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.1.7/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.1.8/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.1.8/Dockerfile
index 92aa34b0f..f6c2c2c3b 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.1.8/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.1.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.1.8/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.1.8/Dockerfile.jdk11
index 29317a8ad..4b4ca5209 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.1.8/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.1.8/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.1.9/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.1.9/Dockerfile
index 4ed773870..b5a00e23f 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.1.9/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.1.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.1.9/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.1.9/Dockerfile.jdk11
index c30f7a6ee..dfcb6e84d 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.1.9/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.1.9/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.10.0/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.10.0/Dockerfile
index e4dd232d7..4eb53c29a 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.10.0/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.10.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.10.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.10.0/Dockerfile.jdk11
index 053caa0ff..a95f6e966 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.10.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.10.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.10.1/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.10.1/Dockerfile
index 8fd58368a..7fc3f73e6 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.10.1/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.10.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.10.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.10.1/Dockerfile.jdk11
index 8e21d9b2b..6bfee3625 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.10.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.10.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.10.2/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.10.2/Dockerfile
index 44c19d9e5..710246e1a 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.10.2/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.10.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.10.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.10.2/Dockerfile.jdk11
index 1c13c7079..4ed2c11c9 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.10.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.10.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.2.0/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.2.0/Dockerfile
index 8cb993329..73dcb1220 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.2.0/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.2.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.2.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.2.0/Dockerfile.jdk11
index b54e88165..c97177c32 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.2.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.2.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.2.1/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.2.1/Dockerfile
index de725b5d0..d98d2824d 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.2.1/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.2.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.2.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.2.1/Dockerfile.jdk11
index e75ca5e43..1347d7d3e 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.2.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.2.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.2.2/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.2.2/Dockerfile
index e406d5892..f2108d82c 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.2.2/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.2.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.2.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.2.2/Dockerfile.jdk11
index b6a53aa0a..2f1702de7 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.2.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.2.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.2.3/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.2.3/Dockerfile
index 2c1967231..a7a2d6035 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.2.3/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.2.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.2.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.2.3/Dockerfile.jdk11
index ca22f13d7..a41136042 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.2.3/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.2.3/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.2.4/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.2.4/Dockerfile
index 49e813fb2..630c0dc38 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.2.4/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.2.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.2.4/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.2.4/Dockerfile.jdk11
index 2b6bc29f3..07f511c8c 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.2.4/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.2.4/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.2.5/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.2.5/Dockerfile
index f7efdd14a..0554e4ccb 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.2.5/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.2.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.2.5/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.2.5/Dockerfile.jdk11
index 5ebb396e4..111a1f51c 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.2.5/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.2.5/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.2.6/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.2.6/Dockerfile
index 74f08fab5..4bef498d5 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.2.6/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.2.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.2.6/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.2.6/Dockerfile.jdk11
index 8530e21ae..8ae7ebd03 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.2.6/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.2.6/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.2.7/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.2.7/Dockerfile
index 6543d37cb..5edf25dec 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.2.7/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.2.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.2.7/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.2.7/Dockerfile.jdk11
index 8ebe06e9a..cc90f58ab 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.2.7/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.2.7/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.3.0/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.3.0/Dockerfile
index 9e6c47d4c..63ab59bf4 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.3.0/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.3.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.3.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.3.0/Dockerfile.jdk11
index 8f9acef31..42d32e1a0 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.3.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.3.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.3.1/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.3.1/Dockerfile
index bcb7b8f4e..c16887e64 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.3.1/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.3.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.3.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.3.1/Dockerfile.jdk11
index 346601dd1..bb079292e 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.3.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.3.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.3.2/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.3.2/Dockerfile
index 64078dd02..7715bba99 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.3.2/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.3.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.3.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.3.2/Dockerfile.jdk11
index 7b26a0df2..cdfef3b7d 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.3.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.3.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.3.3/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.3.3/Dockerfile
index 8e9d26dce..6dbcf89a1 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.3.3/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.3.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.3.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.3.3/Dockerfile.jdk11
index 5e4e3cc83..e6688c326 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.3.3/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.3.3/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.3.4/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.3.4/Dockerfile
index babcd3d9f..689079314 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.3.4/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.3.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.3.4/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.3.4/Dockerfile.jdk11
index 9ca261f0d..a69cfeffd 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.3.4/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.3.4/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.3.5/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.3.5/Dockerfile
index c3f35d451..23f145cd6 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.3.5/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.3.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.3.5/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.3.5/Dockerfile.jdk11
index cdfc1eca5..9dea6e51a 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.3.5/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.3.5/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.3.6/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.3.6/Dockerfile
index 23786a79d..1894d6c62 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.3.6/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.3.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.3.6/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.3.6/Dockerfile.jdk11
index 0c69fb20f..0b9ca5744 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.3.6/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.3.6/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.4.0/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.4.0/Dockerfile
index a1ab398b5..89a4b8539 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.4.0/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.4.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.4.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.4.0/Dockerfile.jdk11
index 1e0821e46..a93e4918b 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.4.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.4.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.4.1/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.4.1/Dockerfile
index b55dae250..f388019f3 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.4.1/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.4.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.4.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.4.1/Dockerfile.jdk11
index 6b25e0704..422c7917d 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.4.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.4.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.4.2/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.4.2/Dockerfile
index 5daadb343..451a04451 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.4.2/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.4.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.4.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.4.2/Dockerfile.jdk11
index d8caaa055..9f9e22109 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.4.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.4.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.4.3/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.4.3/Dockerfile
index d5b59ddd1..dce76ddec 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.4.3/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.4.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.4.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.4.3/Dockerfile.jdk11
index b9af28c9a..55b397437 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.4.3/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.4.3/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.4.4/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.4.4/Dockerfile
index d49f0ba50..e7bb1257f 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.4.4/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.4.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.4.4/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.4.4/Dockerfile.jdk11
index 048852cdc..bb803322b 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.4.4/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.4.4/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.5.0/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.5.0/Dockerfile
index a311e75f4..05f8e0944 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.5.0/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.5.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.5.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.5.0/Dockerfile.jdk11
index 75c4d0dc3..a76a97978 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.5.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.5.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.5.1/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.5.1/Dockerfile
index d9b555a36..9ce98282d 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.5.1/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.5.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.5.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.5.1/Dockerfile.jdk11
index 93a21cf28..51f6b7955 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.5.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.5.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.5.2/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.5.2/Dockerfile
index 4c53c5e1b..4ffa81bf4 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.5.2/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.5.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.5.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.5.2/Dockerfile.jdk11
index 3b08acf93..ec1f31aa3 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.5.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.5.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.5.3/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.5.3/Dockerfile
index b480f2fd9..eb7e97ed9 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.5.3/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.5.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.5.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.5.3/Dockerfile.jdk11
index 7c4247ef6..d2151aaa4 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.5.3/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.5.3/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.6.0/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.6.0/Dockerfile
index 0a0869ca8..ca3630574 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.6.0/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.6.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.6.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.6.0/Dockerfile.jdk11
index 599124d29..099c360d3 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.6.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.6.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.6.1/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.6.1/Dockerfile
index c19ed0be9..2245b5cdc 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.6.1/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.6.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.6.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.6.1/Dockerfile.jdk11
index c459bc9a4..ec5268500 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.6.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.6.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.6.2/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.6.2/Dockerfile
index bc91d8570..0695389d5 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.6.2/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.6.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.6.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.6.2/Dockerfile.jdk11
index e0db4fc35..722161b19 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.6.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.6.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.6.3/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.6.3/Dockerfile
index 28adc3c67..c8f2f8088 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.6.3/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.6.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.6.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.6.3/Dockerfile.jdk11
index 03bd57405..c61171a71 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.6.3/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.6.3/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.6.4/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.6.4/Dockerfile
index 27d461c4e..63b4f8f17 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.6.4/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.6.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.6.4/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.6.4/Dockerfile.jdk11
index a36d3a615..68a67cd57 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.6.4/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.6.4/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.7.0/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.7.0/Dockerfile
index d71281ff0..3d469053b 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.7.0/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.7.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.7.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.7.0/Dockerfile.jdk11
index 7e422c1eb..7836d0ec7 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.7.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.7.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.7.1/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.7.1/Dockerfile
index 6b4075026..8b858bf9d 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.7.1/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.7.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.7.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.7.1/Dockerfile.jdk11
index cd2d58f0b..13bf2d4dd 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.7.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.7.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.7.2/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.7.2/Dockerfile
index 29eadf9f8..9716c7ddf 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.7.2/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.7.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.7.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.7.2/Dockerfile.jdk11
index eb4e08c46..c4be41672 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.7.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.7.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.7.3/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.7.3/Dockerfile
index 56502b88f..dfe9ab3c3 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.7.3/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.7.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.7.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.7.3/Dockerfile.jdk11
index fd9f18206..3d6bd5248 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.7.3/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.7.3/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.7.4/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.7.4/Dockerfile
index f646d7576..1ac3e3841 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.7.4/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.7.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.7.4/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.7.4/Dockerfile.jdk11
index d6ff1c622..ca02717a7 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.7.4/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.7.4/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.8.0/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.8.0/Dockerfile
index e9cee63e8..c7aec6a7c 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.8.0/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.8.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.8.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.8.0/Dockerfile.jdk11
index 2106400bf..b26860950 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.8.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.8.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.8.1/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.8.1/Dockerfile
index 54425164b..7b8ce43db 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.8.1/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.8.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.8.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.8.1/Dockerfile.jdk11
index 239ce3eaa..ab58b591b 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.8.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.8.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.8.2/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.8.2/Dockerfile
index 7d45cb9de..c4c5b8e1f 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.8.2/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.8.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.8.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.8.2/Dockerfile.jdk11
index c10291b6a..8953a4a09 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.8.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.8.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.8.3/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.8.3/Dockerfile
index b9d03b6ce..87a3f93af 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.8.3/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.8.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.8.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.8.3/Dockerfile.jdk11
index ae62f4eb1..9cd7d744f 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.8.3/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.8.3/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.9.0/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.9.0/Dockerfile
index 0a8d4a17f..27be4f5ea 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.9.0/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.9.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.9.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.9.0/Dockerfile.jdk11
index a3e364a29..65f6e7ef8 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.9.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.9.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.9.1/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.9.1/Dockerfile
index d50d90e16..c2fb725e4 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.9.1/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.9.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.9.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.9.1/Dockerfile.jdk11
index aec1fd5d7..1c1f0f7c4 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.9.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.9.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.9.2/Dockerfile b/linux/ecosystem/atlassian/bitbucket/6/6.9.2/Dockerfile
index 488187a00..063994ee4 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.9.2/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.9.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/6/6.9.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/6/6.9.2/Dockerfile.jdk11
index df3430f74..f04e6c916 100644
--- a/linux/ecosystem/atlassian/bitbucket/6/6.9.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/6/6.9.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.0.0/Dockerfile b/linux/ecosystem/atlassian/bitbucket/7/7.0.0/Dockerfile
index eaf4a2e08..7bead06a3 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.0.0/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.0.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.0.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/7/7.0.0/Dockerfile.jdk11
index c31f6d203..d285452f6 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.0.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.0.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.0.1/Dockerfile b/linux/ecosystem/atlassian/bitbucket/7/7.0.1/Dockerfile
index 84e221dbf..e2a369779 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.0.1/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.0.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.0.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/7/7.0.1/Dockerfile.jdk11
index 101f6727e..0a81e28bb 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.0.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.0.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.0.2/Dockerfile b/linux/ecosystem/atlassian/bitbucket/7/7.0.2/Dockerfile
index d8ba2b3c0..3724961af 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.0.2/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.0.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.0.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/7/7.0.2/Dockerfile.jdk11
index 863c766b1..cf0955963 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.0.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.0.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.0.3/Dockerfile b/linux/ecosystem/atlassian/bitbucket/7/7.0.3/Dockerfile
index 3c01e5ee0..efb5cf7b1 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.0.3/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.0.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.0.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/7/7.0.3/Dockerfile.jdk11
index e50329cad..80f4d8c90 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.0.3/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.0.3/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.1.0/Dockerfile b/linux/ecosystem/atlassian/bitbucket/7/7.1.0/Dockerfile
index 779fd2b46..20cdd40a6 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.1.0/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.1.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.1.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/7/7.1.0/Dockerfile.jdk11
index d5a707da6..2e3ba39ae 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.1.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.1.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.1.1/Dockerfile b/linux/ecosystem/atlassian/bitbucket/7/7.1.1/Dockerfile
index ca2aee3a5..6bf52806a 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.1.1/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.1.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.1.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/7/7.1.1/Dockerfile.jdk11
index cd50b6e5b..8de142955 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.1.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.1.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.1.2/Dockerfile b/linux/ecosystem/atlassian/bitbucket/7/7.1.2/Dockerfile
index 8dcc7da39..e8c2f0373 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.1.2/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.1.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.1.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/7/7.1.2/Dockerfile.jdk11
index 0b8982544..5328fc5d7 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.1.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.1.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.1.3/Dockerfile b/linux/ecosystem/atlassian/bitbucket/7/7.1.3/Dockerfile
index d9327bf88..14aad458b 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.1.3/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.1.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.1.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/7/7.1.3/Dockerfile.jdk11
index 4b17a9cab..2f1b8aa1b 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.1.3/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.1.3/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.2.0/Dockerfile b/linux/ecosystem/atlassian/bitbucket/7/7.2.0/Dockerfile
index 0da86472c..bec094eb3 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.2.0/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.2.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.2.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/7/7.2.0/Dockerfile.jdk11
index 2aa01e3bd..17e79e9f9 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.2.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.2.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.2.1/Dockerfile b/linux/ecosystem/atlassian/bitbucket/7/7.2.1/Dockerfile
index 7dda40e3b..44eda3e43 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.2.1/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.2.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.2.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/7/7.2.1/Dockerfile.jdk11
index 4ee98cf38..cc5414f34 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.2.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.2.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.2.2/Dockerfile b/linux/ecosystem/atlassian/bitbucket/7/7.2.2/Dockerfile
index 3b4de2849..d624c3a07 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.2.2/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.2.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.2.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/7/7.2.2/Dockerfile.jdk11
index 4fdff6c1a..3c08c9852 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.2.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.2.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.2.3/Dockerfile b/linux/ecosystem/atlassian/bitbucket/7/7.2.3/Dockerfile
index ab109cf5b..5f562c994 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.2.3/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.2.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/7/7.2.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/7/7.2.3/Dockerfile.jdk11
index 6a249b672..3d2ce5a28 100644
--- a/linux/ecosystem/atlassian/bitbucket/7/7.2.3/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/7/7.2.3/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile b/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile
index 44aef9d02..166150635 100644
--- a/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile
+++ b/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile.jdk11
index 6d2335cb0..df9b0ad99 100644
--- a/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/edge:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/5/5.5/Dockerfile b/linux/ecosystem/atlassian/confluence/5/5.5/Dockerfile
index 628090a4c..b31053bf3 100644
--- a/linux/ecosystem/atlassian/confluence/5/5.5/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/5/5.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/5/5.9.14/Dockerfile b/linux/ecosystem/atlassian/confluence/5/5.9.14/Dockerfile
index 99729e251..000a92821 100644
--- a/linux/ecosystem/atlassian/confluence/5/5.9.14/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/5/5.9.14/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.0.1/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.0.1/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.0.1/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.0.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.0.2/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.0.2/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.0.2/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.0.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.0.3/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.0.3/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.0.3/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.0.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.0.4/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.0.4/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.0.4/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.0.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.0.5/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.0.5/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.0.5/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.0.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.0.6/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.0.6/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.0.6/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.0.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.0.7/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.0.7/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.0.7/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.0.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.1.0/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.1.0/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.1.0/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.1.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.1.1/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.1.1/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.1.1/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.1.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.1.2/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.1.2/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.1.2/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.1.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.1.3/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.1.3/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.1.3/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.1.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.1.4/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.1.4/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.1.4/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.1.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.10.0/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.10.0/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.10.0/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.10.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.10.1/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.10.1/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.10.1/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.10.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.10.2/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.10.2/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.10.2/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.10.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.10.3/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.10.3/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.10.3/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.10.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.11.0/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.11.0/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.11.0/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.11.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.11.1/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.11.1/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.11.1/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.11.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.11.2/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.11.2/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.11.2/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.11.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.12.0/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.12.0/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.12.0/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.12.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.12.1/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.12.1/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.12.1/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.12.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.12.2/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.12.2/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.12.2/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.12.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.12.3/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.12.3/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.12.3/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.12.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.12.4/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.12.4/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.12.4/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.12.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.13.0/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.13.0/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.13.0/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.13.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.13.1/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.13.1/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.13.1/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.13.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.13.10/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.13.10/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.13.10/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.13.10/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.13.11/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.13.11/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.13.11/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.13.11/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.13.12/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.13.12/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.13.12/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.13.12/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.13.13/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.13.13/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.13.13/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.13.13/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.13.15/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.13.15/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.13.15/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.13.15/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.13.17/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.13.17/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.13.17/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.13.17/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.13.18/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.13.18/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.13.18/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.13.18/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.13.19/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.13.19/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.13.19/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.13.19/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.13.2/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.13.2/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.13.2/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.13.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.13.20/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.13.20/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.13.20/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.13.20/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.13.21/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.13.21/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.13.21/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.13.21/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.13.3/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.13.3/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.13.3/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.13.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.13.4/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.13.4/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.13.4/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.13.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.13.5/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.13.5/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.13.5/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.13.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.13.6/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.13.6/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.13.6/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.13.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.13.7/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.13.7/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.13.7/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.13.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.13.8/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.13.8/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.13.8/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.13.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.13.9/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.13.9/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.13.9/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.13.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.14.0/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.14.0/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.14.0/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.14.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.14.1/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.14.1/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.14.1/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.14.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.14.2/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.14.2/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.14.2/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.14.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.14.3/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.14.3/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.14.3/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.14.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.15.1/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.15.1/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.15.1/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.15.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.15.10/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.15.10/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.15.10/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.15.10/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.15.2/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.15.2/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.15.2/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.15.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.15.4/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.15.4/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.15.4/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.15.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.15.6/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.15.6/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.15.6/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.15.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.15.7/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.15.7/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.15.7/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.15.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.15.8/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.15.8/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.15.8/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.15.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.15.9/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.15.9/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.15.9/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.15.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.2.0/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.2.0/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.2.0/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.2.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.2.1/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.2.1/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.2.1/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.2.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.2.2/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.2.2/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.2.2/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.2.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.2.3/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.2.3/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.2.3/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.2.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.2.4/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.2.4/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.2.4/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.2.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.3.1/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.3.1/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.3.1/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.3.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.3.2/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.3.2/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.3.2/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.3.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.3.3/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.3.3/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.3.3/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.3.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.3.4/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.3.4/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.3.4/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.3.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.4.0/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.4.0/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.4.0/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.4.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.4.1/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.4.1/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.4.1/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.4.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.4.2/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.4.2/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.4.2/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.4.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.4.3/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.4.3/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.4.3/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.4.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.5.0/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.5.0/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.5.0/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.5.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.5.1/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.5.1/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.5.1/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.5.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.5.2/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.5.2/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.5.2/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.5.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.5.3/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.5.3/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.5.3/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.5.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.6.0/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.6.0/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.6.0/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.6.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.6.1/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.6.1/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.6.1/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.6.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.6.10/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.6.10/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.6.10/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.6.10/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.6.11/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.6.11/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.6.11/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.6.11/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.6.12/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.6.12/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.6.12/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.6.12/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.6.13/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.6.13/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.6.13/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.6.13/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.6.14/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.6.14/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.6.14/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.6.14/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.6.15/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.6.15/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.6.15/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.6.15/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.6.16/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.6.16/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.6.16/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.6.16/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.6.17/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.6.17/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.6.17/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.6.17/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.6.2/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.6.2/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.6.2/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.6.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.6.3/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.6.3/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.6.3/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.6.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.6.4/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.6.4/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.6.4/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.6.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.6.5/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.6.5/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.6.5/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.6.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.6.6/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.6.6/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.6.6/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.6.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.6.7/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.6.7/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.6.7/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.6.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.6.8/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.6.8/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.6.8/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.6.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.6.9/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.6.9/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.6.9/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.6.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.7.0/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.7.0/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.7.0/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.7.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.7.1/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.7.1/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.7.1/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.7.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.7.2/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.7.2/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.7.2/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.7.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.7.3/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.7.3/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.7.3/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.7.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.8.0/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.8.0/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.8.0/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.8.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.8.1/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.8.1/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.8.1/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.8.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.8.2/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.8.2/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.8.2/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.8.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.8.3/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.8.3/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.8.3/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.8.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.8.5/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.8.5/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.8.5/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.8.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.9.0/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.9.0/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.9.0/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.9.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.9.1/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.9.1/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.9.1/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.9.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/6/6.9.3/Dockerfile b/linux/ecosystem/atlassian/confluence/6/6.9.3/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/6/6.9.3/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/6/6.9.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.0.1/Dockerfile b/linux/ecosystem/atlassian/confluence/7/7.0.1/Dockerfile
index b1790ded0..59d795ef9 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.0.1/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/7/7.0.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.0.2/Dockerfile b/linux/ecosystem/atlassian/confluence/7/7.0.2/Dockerfile
index 00313c49f..4a2b778ed 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.0.2/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/7/7.0.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.0.3/Dockerfile b/linux/ecosystem/atlassian/confluence/7/7.0.3/Dockerfile
index 7968f2513..a70d74726 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.0.3/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/7/7.0.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.0.4/Dockerfile b/linux/ecosystem/atlassian/confluence/7/7.0.4/Dockerfile
index 8f6e2b2ca..39afa3760 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.0.4/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/7/7.0.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.0.5/Dockerfile b/linux/ecosystem/atlassian/confluence/7/7.0.5/Dockerfile
index e122788e8..0ef9433a5 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.0.5/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/7/7.0.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.1.0/Dockerfile b/linux/ecosystem/atlassian/confluence/7/7.1.0/Dockerfile
index 56ca2c723..e8abd6d1a 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.1.0/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/7/7.1.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.1.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/confluence/7/7.1.0/Dockerfile.jdk11
index 66b1b2b9a..40e46275b 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.1.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/confluence/7/7.1.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.1.1/Dockerfile b/linux/ecosystem/atlassian/confluence/7/7.1.1/Dockerfile
index 1679524bd..1068f0147 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.1.1/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/7/7.1.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.1.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/confluence/7/7.1.1/Dockerfile.jdk11
index 3cc9ae29e..7b2ac85c1 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.1.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/confluence/7/7.1.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.1.2/Dockerfile b/linux/ecosystem/atlassian/confluence/7/7.1.2/Dockerfile
index 0e8a2b0a2..005c79eeb 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.1.2/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/7/7.1.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.1.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/confluence/7/7.1.2/Dockerfile.jdk11
index d8dd674c6..207e33fda 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.1.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/confluence/7/7.1.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.2.0/Dockerfile b/linux/ecosystem/atlassian/confluence/7/7.2.0/Dockerfile
index 54a8caac8..63b4e2c6e 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.2.0/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/7/7.2.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.2.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/confluence/7/7.2.0/Dockerfile.jdk11
index 4f7c7881c..b4a40cb13 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.2.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/confluence/7/7.2.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.2.1/Dockerfile b/linux/ecosystem/atlassian/confluence/7/7.2.1/Dockerfile
index 107b68b3b..5cd16752f 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.2.1/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/7/7.2.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.2.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/confluence/7/7.2.1/Dockerfile.jdk11
index 3aee00b73..f2dbf821c 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.2.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/confluence/7/7.2.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.2.2/Dockerfile b/linux/ecosystem/atlassian/confluence/7/7.2.2/Dockerfile
index 3c8e9dc8c..2d2931673 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.2.2/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/7/7.2.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.2.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/confluence/7/7.2.2/Dockerfile.jdk11
index 3c0c85ec4..042946827 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.2.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/confluence/7/7.2.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.3.1/Dockerfile b/linux/ecosystem/atlassian/confluence/7/7.3.1/Dockerfile
index d280c8881..540fd7dd4 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.3.1/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/7/7.3.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.3.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/confluence/7/7.3.1/Dockerfile.jdk11
index 9d285abb0..7e8ccc782 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.3.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/confluence/7/7.3.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.3.2/Dockerfile b/linux/ecosystem/atlassian/confluence/7/7.3.2/Dockerfile
index 984dfc340..8437e250b 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.3.2/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/7/7.3.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.3.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/confluence/7/7.3.2/Dockerfile.jdk11
index b0b9673de..833bbe441 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.3.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/confluence/7/7.3.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.3.3/Dockerfile b/linux/ecosystem/atlassian/confluence/7/7.3.3/Dockerfile
index 9e98e6ccb..41d52558b 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.3.3/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/7/7.3.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.3.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/confluence/7/7.3.3/Dockerfile.jdk11
index 3ff7b2e6f..a15c2a9fe 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.3.3/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/confluence/7/7.3.3/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.3.4/Dockerfile b/linux/ecosystem/atlassian/confluence/7/7.3.4/Dockerfile
index 05e9b5f81..d28d53877 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.3.4/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/7/7.3.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.3.4/Dockerfile.jdk11 b/linux/ecosystem/atlassian/confluence/7/7.3.4/Dockerfile.jdk11
index 99cf4c33a..177f8a6bd 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.3.4/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/confluence/7/7.3.4/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.3.5/Dockerfile b/linux/ecosystem/atlassian/confluence/7/7.3.5/Dockerfile
index eec2d65bd..d5e98a713 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.3.5/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/7/7.3.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.3.5/Dockerfile.jdk11 b/linux/ecosystem/atlassian/confluence/7/7.3.5/Dockerfile.jdk11
index c615ab4d2..51a58987d 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.3.5/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/confluence/7/7.3.5/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.4.0/Dockerfile b/linux/ecosystem/atlassian/confluence/7/7.4.0/Dockerfile
index d30b4fc8e..591ad4037 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.4.0/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/7/7.4.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.4.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/confluence/7/7.4.0/Dockerfile.jdk11
index 654cdd386..39194e8f8 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.4.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/confluence/7/7.4.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.5.0/Dockerfile b/linux/ecosystem/atlassian/confluence/7/7.5.0/Dockerfile
index b68d4a706..dc5b2068e 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.5.0/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/7/7.5.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/7/7.5.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/confluence/7/7.5.0/Dockerfile.jdk11
index c1ae4667a..2673d1913 100644
--- a/linux/ecosystem/atlassian/confluence/7/7.5.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/confluence/7/7.5.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/latest/Dockerfile b/linux/ecosystem/atlassian/confluence/latest/Dockerfile
index bbae4427b..fd8bd1695 100644
--- a/linux/ecosystem/atlassian/confluence/latest/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk11 b/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk11
index c2c86c5f2..3054c2f2e 100644
--- a/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/templates/5/Dockerfile b/linux/ecosystem/atlassian/confluence/templates/5/Dockerfile
index 948204891..bbdb11a3a 100644
--- a/linux/ecosystem/atlassian/confluence/templates/5/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/templates/5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/confluence/templates/6/Dockerfile b/linux/ecosystem/atlassian/confluence/templates/6/Dockerfile
index f3e6e40c1..00d09c314 100644
--- a/linux/ecosystem/atlassian/confluence/templates/6/Dockerfile
+++ b/linux/ecosystem/atlassian/confluence/templates/6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.0.3/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.0.3/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.0.3/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.0.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.0.4/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.0.4/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.0.4/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.0.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.0/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.0/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.0/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.1.1/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.1.1/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.1.1/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.1.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.1.2/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.1.2/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.1.2/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.1.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.1.3/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.1.3/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.1.3/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.1.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.1.4/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.1.4/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.1.4/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.1.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.1/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.1/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.1/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.2.1/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.2.1/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.2.1/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.2.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.2.2/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.2.2/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.2.2/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.2.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.2.3/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.2.3/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.2.3/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.2.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.2/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.2/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.2/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.5.1/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.5.1/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.5.1/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.5.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.5.2/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.5.2/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.5.2/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.5.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.5.3/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.5.3/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.5.3/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.5.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.5.4/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.5.4/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.5.4/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.5.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.5/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.5/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.5/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.6.0/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.6.0/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.6.0/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.6.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.6.0Beta1/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.6.0Beta1/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.6.0Beta1/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.6.0Beta1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.6.0Beta2/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.6.0Beta2/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.6.0Beta2/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.6.0Beta2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.6.1/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.6.1/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.6.1/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.6.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.6.2.1/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.6.2.1/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.6.2.1/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.6.2.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.6.2/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.6.2/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.6.2/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.6.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.6.3/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.6.3/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.6.3/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.6.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.6.4/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.6.4/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.6.4/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.6.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.6.5.a/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.6.5.a/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.6.5.a/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.6.5.a/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.6.5/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.6.5/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.6.5/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.6.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.6.5a/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.6.5a/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.6.5a/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.6.5a/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/1/1.6.6/Dockerfile b/linux/ecosystem/atlassian/crucible/1/1.6.6/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/1/1.6.6/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/1/1.6.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/crucible/templates/1/Dockerfile b/linux/ecosystem/atlassian/crucible/templates/1/Dockerfile
index 3efd74f1a..5ea200154 100644
--- a/linux/ecosystem/atlassian/crucible/templates/1/Dockerfile
+++ b/linux/ecosystem/atlassian/crucible/templates/1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.0.B3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.0.B3/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.0.B3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.0.B3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.0.RC1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.0.RC1/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.0.RC1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.0.RC1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.0.RC2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.0.RC2/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.0.RC2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.0.RC2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.0.RC3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.0.RC3/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.0.RC3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.0.RC3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.0/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.1/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.2/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.3/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.4/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.4/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.5/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.5/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.5/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.6/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.6/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.6/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.0.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.0.M2cc/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.0.M2cc/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.0.M2cc/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.0.M2cc/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.0.RC1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.0.RC1/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.0.RC1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.0.RC1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.0/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.1/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.2/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.3/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.4/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.4/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.1.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.0/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.1/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.2/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.3/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.4/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.4/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.5/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.5/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.5/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.6/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.6/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.6/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.7/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.7/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.7/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.8/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.8/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.8/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.10.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.2.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.2.0/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.2.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.2.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.2.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.2.1/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.2.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.2.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.2.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.2.3/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.2.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.2.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.0/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.1/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.2/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.3/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.4/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.4/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.5/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.5/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.5/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.6/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.6/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.6/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.7/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.7/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.7/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.8/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.8/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.8/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.3.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.0/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.1/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.2/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.3/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.4/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.4/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.5/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.5/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.5/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.6/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.6/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.6/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.4.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.0/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.1/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.2/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.3/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.4/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.4/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.5/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.5/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.5/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.6/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.6/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.6/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.7/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.7/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.7/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.8/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.8/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.8/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.9/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.9/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.9/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.5.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.0/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.1/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.2/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.3/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.4/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.4/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.5/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.5/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.5/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.6/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.6/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.6/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.7/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.7/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.7/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.8/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.8/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.8/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.9/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.9/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.9/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.6.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.0-EAP-1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.0-EAP-1/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.0-EAP-1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.0-EAP-1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.0-EAP-2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.0-EAP-2/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.0-EAP-2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.0-EAP-2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.0/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.1/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.10/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.10/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.10/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.10/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.11/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.11/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.11/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.11/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.12/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.12/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.12/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.12/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.13/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.13/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.13/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.13/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.14/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.14/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.14/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.14/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.15/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.15/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.15/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.15/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.2/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.3/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.4/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.4/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.5/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.5/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.5/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.6/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.6/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.6/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.7/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.7/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.7/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.8/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.8/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.8/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.9/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.9/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.9/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.7.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.8.0-m1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.8.0-m1/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.8.0-m1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.8.0-m1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.8.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.8.0/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.8.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.8.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.8.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.8.1/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.8.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.8.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.8.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.8.2/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.8.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.8.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.9.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.9.0/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.9.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.9.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.9.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.9.1/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.9.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.9.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/2/2.9.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/2/2.9.2/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/2/2.9.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/2/2.9.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.0.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.0.0/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.0.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.0.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.0.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.0.1/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.0.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.0.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.0.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.0.2/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.0.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.0.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.0.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.0.3/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.0.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.0.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.0.4/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.0.4/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.0.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.0.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.0/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.1/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.2/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.3/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.4/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.4/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.5/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.5/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.5/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.6/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.6/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.6/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.7/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.7/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.7/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.1.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.10.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.10.1/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.10.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.10.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.10.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.10.2/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.10.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.10.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.10.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.10.3/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.10.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.10.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.10.4/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.10.4/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.10.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.10.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.0/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.1/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.2/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.3/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.4/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.4/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.5/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.5/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.5/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.2.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.3.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.3.0/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.3.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.3.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.3.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.3.1/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.3.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.3.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.3.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.3.2/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.3.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.3.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.3.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.3.3/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.3.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.3.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.3.4/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.3.4/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.3.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.3.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.0/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.3/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.4/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.4/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.5/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.5/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.5/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.6/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.6/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.6/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.7/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.7/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.7/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.4.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.0/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.1/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.2/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.3/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.4/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.4/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.5/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.5/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.5/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.5.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.6.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.6.0/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.6.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.6.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.6.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.6.1/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.6.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.6.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.6.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.6.2/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.6.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.6.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.6.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.6.3/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.6.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.6.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.6.4/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.6.4/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.6.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.6.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.7.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.7.0/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.7.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.7.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.7.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.7.1/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.7.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.7.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.8.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.8.0/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.8.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.8.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.8.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.8.1/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.8.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.8.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.9.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.9.0/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.9.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.9.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.9.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.9.1/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.9.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.9.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/3/3.9.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/3/3.9.2/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/3/3.9.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/3/3.9.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.0.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.0.2/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.0.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.0.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.0.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.0.3/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.0.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.0.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.0.4/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.0.4/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.0.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.0.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.1.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.1.0/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.1.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.1.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.1.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.1.1/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.1.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.1.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.1.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.1.2/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.1.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.1.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.1.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.1.3/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.1.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.1.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.2.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.2.0/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.2.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.2.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.2.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.2.1/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.2.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.2.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.2.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.2.2/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.2.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.2.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.2.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.2.3/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.2.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.2.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.3.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.3.0/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.3.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.3.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.3.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.3.1/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.3.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.3.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.3.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.3.2/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.3.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.3.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.3.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.3.3/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.3.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.3.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.0/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.1/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.2/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.3/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.5/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.5/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.5/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.6/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.6/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.6/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.7/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.7/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.7/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.4.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.5.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.5.0/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.5.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.5.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.5.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.5.1/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.5.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.5.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.5.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.5.2/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.5.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.5.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.5.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.5.3/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.5.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.5.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.5.4/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.5.4/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.5.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.5.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.6.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.6.0/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.6.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.6.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.6.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.6.1/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.6.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.6.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.7.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.7.0/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.7.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.7.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.7.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.7.1/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.7.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.7.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.7.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.7.2/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.7.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.7.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.7.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.7.3/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.7.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.7.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.0/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.0/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.1/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.1/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.2/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.3/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.4/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.4/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.5/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.5/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.5/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.6/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.6/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.6/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/4/4.8.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/latest/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/latest/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/latest/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/templates/2/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/templates/2/Dockerfile
index 4eec725a4..8ef6e3647 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/templates/2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/templates/2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/templates/3/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/templates/3/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/templates/3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/templates/3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye-crucible/templates/4/Dockerfile b/linux/ecosystem/atlassian/fisheye-crucible/templates/4/Dockerfile
index 4426bcb90..1583b2d1f 100644
--- a/linux/ecosystem/atlassian/fisheye-crucible/templates/4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye-crucible/templates/4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.0.1a/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.0.1a/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.0.1a/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.0.1a/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.1.3/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.1.3/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.1.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.1.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.2.5/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.2.5/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.2.5/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.2.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.3.3/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.3.3/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.3.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.3.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.3.4/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.3.4/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.3.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.3.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.3.5/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.3.5/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.3.5/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.3.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.3.6/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.3.6/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.3.6/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.3.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.3.7/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.3.7/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.3.7/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.3.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.3.8/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.3.8/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.3.8/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.3.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.4.1/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.4.1/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.4.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.4.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.4.2/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.4.2/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.4.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.4.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.4.3/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.4.3/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.4.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.4.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.4/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.4/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.5.1/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.5.1/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.5.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.5.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.5.2/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.5.2/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.5.2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.5.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.5.3/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.5.3/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.5.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.5.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.5.4/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.5.4/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.5.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.5.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.5/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.5/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.5/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.6.0/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.6.0/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.6.0/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.6.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.6.0Beta1/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.6.0Beta1/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.6.0Beta1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.6.0Beta1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.6.0Beta2/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.6.0Beta2/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.6.0Beta2/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.6.0Beta2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.6.1/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.6.1/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.6.1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.6.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.6.3/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.6.3/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.6.3/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.6.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.6.4/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.6.4/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.6.4/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.6.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.6.5.a/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.6.5.a/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.6.5.a/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.6.5.a/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.6.5/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.6.5/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.6.5/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.6.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.6.5a/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.6.5a/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.6.5a/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.6.5a/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/1/1.6.6/Dockerfile b/linux/ecosystem/atlassian/fisheye/1/1.6.6/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/1/1.6.6/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/1/1.6.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/fisheye/templates/1/Dockerfile b/linux/ecosystem/atlassian/fisheye/templates/1/Dockerfile
index 426636d79..221112cdf 100644
--- a/linux/ecosystem/atlassian/fisheye/templates/1/Dockerfile
+++ b/linux/ecosystem/atlassian/fisheye/templates/1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/4/4.1.1/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.1.1/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/4/4.1.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/4/4.1.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/4/4.1.2/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.1.2/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/4/4.1.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/4/4.1.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/4/4.2.1/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.2.1/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/4/4.2.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/4/4.2.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/4/4.2.2/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.2.2/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/4/4.2.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/4/4.2.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/4/4.2.3/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.2.3/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/4/4.2.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/4/4.2.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/4/4.2.4/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.2.4/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/4/4.2.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/4/4.2.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/4/4.2/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.2/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/4/4.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/4/4.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/4/4.3.1/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.3.1/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/4/4.3.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/4/4.3.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/4/4.3.2/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.3.2/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/4/4.3.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/4/4.3.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/4/4.3.3/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.3.3/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/4/4.3.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/4/4.3.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/4/4.3.4/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.3.4/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/4/4.3.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/4/4.3.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/4/4.3/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.3/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/4/4.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/4/4.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/4/4.4.1/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.4.1/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/4/4.4.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/4/4.4.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/4/4.4.3/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.4.3/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/4/4.4.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/4/4.4.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/4/4.4.4/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.4.4/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/4/4.4.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/4/4.4.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/4/4.4.5/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.4.5/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/4/4.4.5/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/4/4.4.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/4/4.4/Dockerfile b/linux/ecosystem/atlassian/jira/4/4.4/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/4/4.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/4/4.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.0.1/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.0.1/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.0.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.0.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.0.2/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.0.2/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.0.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.0.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.0.3/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.0.3/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.0.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.0.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.0.4/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.0.4/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.0.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.0.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.0.5/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.0.5/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.0.5/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.0.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.0.6/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.0.6/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.0.6/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.0.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.0.7/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.0.7/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.0.7/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.0.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.0/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.0/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.1.1/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.1.1/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.1.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.1.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.1.2/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.1.2/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.1.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.1.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.1.3/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.1.3/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.1.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.1.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.1.4/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.1.4/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.1.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.1.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.1.5/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.1.5/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.1.5/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.1.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.1.6/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.1.6/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.1.6/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.1.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.1.7/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.1.7/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.1.7/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.1.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.1.8/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.1.8/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.1.8/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.1.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.1/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.1/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.2.1/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.1/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.2.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.2.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.2.10/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.10/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.2.10/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.2.10/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.2.11/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.11/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.2.11/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.2.11/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.2.2/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.2/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.2.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.2.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.2.3/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.3/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.2.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.2.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.2.4.1/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.4.1/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.2.4.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.2.4.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.2.4/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.4/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.2.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.2.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.2.5/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.5/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.2.5/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.2.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.2.6/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.6/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.2.6/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.2.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.2.7/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.7/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.2.7/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.2.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.2.8/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.8/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.2.8/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.2.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.2.9/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2.9/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.2.9/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.2.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/5/5.2/Dockerfile b/linux/ecosystem/atlassian/jira/5/5.2/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/5/5.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/5/5.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.0.1/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.0.1/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.0.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.0.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.0.2/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.0.2/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.0.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.0.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.0.3/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.0.3/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.0.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.0.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.0.4/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.0.4/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.0.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.0.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.0.5/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.0.5/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.0.5/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.0.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.0.6/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.0.6/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.0.6/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.0.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.0.7/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.0.7/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.0.7/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.0.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.0.8/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.0.8/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.0.8/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.0.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.0/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.0/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.1.1/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.1.1/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.1.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.1.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.1.2/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.1.2/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.1.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.1.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.1.3/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.1.3/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.1.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.1.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.1.4/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.1.4/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.1.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.1.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.1.5/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.1.5/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.1.5/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.1.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.1.6/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.1.6/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.1.6/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.1.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.1.7/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.1.7/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.1.7/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.1.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.1.8/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.1.8/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.1.8/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.1.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.1.9/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.1.9/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.1.9/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.1.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.1/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.1/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.2.1/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.2.1/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.2.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.2.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.2.2/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.2.2/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.2.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.2.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.2.3/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.2.3/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.2.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.2.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.2.4/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.2.4/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.2.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.2.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.2.5/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.2.5/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.2.5/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.2.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.2.6/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.2.6/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.2.6/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.2.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.2.7/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.2.7/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.2.7/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.2.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.2/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.2/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.3.1/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.1/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.3.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.3.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.3.10/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.10/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.3.10/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.3.10/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.3.11/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.11/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.3.11/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.3.11/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.3.12/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.12/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.3.12/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.3.12/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.3.13/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.13/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.3.13/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.3.13/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.3.14/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.14/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.3.14/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.3.14/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.3.15/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.15/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.3.15/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.3.15/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.3.3/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.3/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.3.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.3.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.3.4/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.4/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.3.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.3.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.3.5/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.5/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.3.5/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.3.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.3.6/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.6/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.3.6/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.3.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.3.7/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.7/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.3.7/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.3.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.3.8/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.8/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.3.8/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.3.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.3.9/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3.9/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.3.9/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.3.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.3/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.3/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.4.1/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.1/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.4.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.4.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.4.10/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.10/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.4.10/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.4.10/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.4.11/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.11/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.4.11/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.4.11/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.4.12/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.12/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.4.12/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.4.12/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.4.13/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.13/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.4.13/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.4.13/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.4.14/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.14/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.4.14/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.4.14/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.4.2/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.2/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.4.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.4.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.4.3/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.3/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.4.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.4.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.4.4/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.4/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.4.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.4.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.4.5/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.5/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.4.5/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.4.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.4.6/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.6/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.4.6/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.4.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.4.7/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.7/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.4.7/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.4.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.4.8/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.8/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.4.8/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.4.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.4.9/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4.9/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.4.9/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.4.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/6/6.4/Dockerfile b/linux/ecosystem/atlassian/jira/6/6.4/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/6/6.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/6/6.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.0.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.0.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.0.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.0.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.0.10/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.0.10/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.0.10/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.0.10/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.0.11/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.0.11/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.0.11/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.0.11/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.0.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.0.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.0.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.0.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.0.4/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.0.4/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.0.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.0.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.0.5/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.0.5/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.0.5/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.0.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.0.9/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.0.9/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.0.9/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.0.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.1.0-m01/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.1.0-m01/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.1.0-m01/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.1.0-m01/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.1.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.1.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.1.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.1.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.1.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.1.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.1.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.1.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.1.10/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.1.10/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.1.10/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.1.10/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.1.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.1.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.1.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.1.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.1.4/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.1.4/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.1.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.1.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.1.6/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.1.6/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.1.6/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.1.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.1.7/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.1.7/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.1.7/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.1.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.1.8/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.1.8/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.1.8/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.1.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.1.9/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.1.9/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.1.9/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.1.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.10.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.10.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.10.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.10.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.10.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.10.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.10.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.10.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.10.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.10.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.10.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.10.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.11.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.11.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.11.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.11.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.11.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.11.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.11.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.11.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.11.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.11.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.11.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.11.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.12.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.12.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.12.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.12.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.12.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.12.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.12.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.12.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.12.3/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.12.3/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.12.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.12.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.13.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.13.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.13.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.13.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.13.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.13.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.13.11/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.11/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.13.11/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.13.11/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.13.12/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.12/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.13.12/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.13.12/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.13.13/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.13/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.13.13/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.13.13/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.13.14/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.14/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.13.14/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.13.14/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.13.15/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.15/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.13.15/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.13.15/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.13.16/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.16/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.13.16/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.13.16/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.13.17/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.17/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.13.17/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.13.17/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.13.18/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.18/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.13.18/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.13.18/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.13.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.13.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.13.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.13.3/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.3/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.13.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.13.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.13.4/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.4/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.13.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.13.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.13.5/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.5/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.13.5/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.13.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.13.6/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.6/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.13.6/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.13.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.13.8/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.8/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.13.8/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.13.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.13.9/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.13.9/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.13.9/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.13.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.2.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.2.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.2.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.2.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.2.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.2.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.2.10/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.10/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.2.10/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.2.10/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.2.11/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.11/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.2.11/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.2.11/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.2.12/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.12/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.2.12/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.2.12/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.2.13/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.13/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.2.13/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.2.13/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.2.14/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.14/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.2.14/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.2.14/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.2.15/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.15/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.2.15/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.2.15/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.2.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.2.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.2.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.2.3/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.3/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.2.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.2.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.2.4/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.4/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.2.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.2.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.2.6/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.6/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.2.6/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.2.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.2.7/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.7/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.2.7/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.2.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.2.8/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.8/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.2.8/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.2.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.2.9/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.2.9/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.2.9/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.2.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.3.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.3.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.3.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.3.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.3.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.3.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.3.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.3.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.3.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.3.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.3.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.3.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.3.3/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.3.3/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.3.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.3.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.3.4/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.3.4/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.3.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.3.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.3.5/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.3.5/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.3.5/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.3.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.3.6/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.3.6/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.3.6/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.3.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.3.7/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.3.7/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.3.7/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.3.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.3.8/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.3.8/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.3.8/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.3.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.3.9/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.3.9/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.3.9/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.3.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.4.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.4.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.4.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.4.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.4.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.4.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.4.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.4.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.4.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.4.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.4.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.4.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.4.3/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.4.3/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.4.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.4.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.4.4/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.4.4/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.4.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.4.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.4.5/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.4.5/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.4.5/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.4.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.4.6/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.4.6/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.4.6/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.4.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.5.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.5.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.5.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.5.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.5.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.5.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.5.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.5.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.5.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.5.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.5.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.5.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.5.3/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.5.3/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.5.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.5.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.5.4/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.5.4/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.5.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.5.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.6.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.6.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.6.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.6.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.6.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.6.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.6.10/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.10/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.6.10/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.6.10/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.6.11/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.11/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.6.11/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.6.11/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.6.12/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.12/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.6.12/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.6.12/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.6.13/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.13/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.6.13/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.6.13/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.6.14/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.14/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.6.14/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.6.14/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.6.15/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.15/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.6.15/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.6.15/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.6.16/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.16/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.6.16/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.6.16/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.6.17/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.17/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.6.17/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.6.17/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.6.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.6.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.6.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.6.3/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.3/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.6.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.6.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.6.4/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.4/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.6.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.6.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.6.6/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.6/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.6.6/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.6.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.6.7/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.7/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.6.7/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.6.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.6.8/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.8/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.6.8/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.6.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.6.9/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.6.9/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.6.9/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.6.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.7.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.7.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.7.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.7.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.7.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.7.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.7.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.7.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.7.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.7.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.7.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.7.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.7.4/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.7.4/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.7.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.7.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.8.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.8.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.8.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.8.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.8.1/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.8.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.8.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.8.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.8.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.8.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.8.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.8.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.8.4/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.8.4/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.8.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.8.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.9.0/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.9.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.9.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.9.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/7/7.9.2/Dockerfile b/linux/ecosystem/atlassian/jira/7/7.9.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/7/7.9.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/7/7.9.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.0.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.0.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.0.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.0.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.0.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.0.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.0.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.0.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.0.3/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.0.3/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.0.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.0.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.1.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.1.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.1.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.1.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.1.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.1.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.1.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.1.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.1.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.1.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.1.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.1.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.1.3/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.1.3/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.1.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.1.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.10.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.10.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.10.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.10.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.10.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.10.0/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.10.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.10.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.10.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.10.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.10.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.10.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.10.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.10.1/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.10.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.10.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.11.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.11.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.11.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.11.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.11.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.11.0/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.11.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.11.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.11.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.11.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.11.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.11.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.11.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.11.1/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.11.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.11.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.12.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.12.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.12.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.12.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.12.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.12.0/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.12.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.12.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.12.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.12.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.12.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.12.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.12.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.12.1/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.12.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.12.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.12.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.12.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.12.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.12.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.12.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.12.2/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.12.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.12.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.12.3/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.12.3/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.12.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.12.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.12.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.12.3/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.12.3/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.12.3/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.13.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.0/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.13.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.13.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.1/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.13.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.10/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.10/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.10/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.13.10/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.10/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.10/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.10/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.13.10/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.11/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.11/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.11/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.13.11/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.11/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.11/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.11/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.13.11/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.12/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.12/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.12/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.13.12/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.12/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.12/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.12/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.13.12/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.13/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.13/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.13/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.13.13/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.13/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.13/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.13/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.13.13/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.13.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.2/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.13.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.3/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.3/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.13.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.3/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.3/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.13.3/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.4/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.4/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.13.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.4/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.4/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.4/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.13.4/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.5/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.5/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.5/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.13.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.5/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.5/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.5/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.13.5/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.6/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.6/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.6/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.13.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.6/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.6/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.6/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.13.6/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.7/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.7/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.7/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.13.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.7/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.7/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.7/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.13.7/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.8/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.8/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.8/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.13.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.8/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.8/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.8/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.13.8/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.9/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.13.9/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.9/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.13.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.13.9/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.13.9/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.13.9/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.13.9/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.14.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.14.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.14.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.14.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.14.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.14.0/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.14.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.14.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.14.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.14.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.14.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.14.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.14.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.14.1/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.14.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.14.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.15.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.15.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.15.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.15.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.15.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.15.0/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.15.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.15.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.15.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.15.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.15.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.15.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.15.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.15.1/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.15.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.15.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.16.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.16.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.16.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.16.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.16.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.16.0/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.16.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.16.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.16.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.16.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.16.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.16.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.16.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.16.1/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.16.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.16.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.16.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.16.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.16.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.16.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.16.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.16.2/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.16.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.16.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.17.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.17.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.17.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.17.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.17.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.17.0/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.17.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.17.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.17.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.17.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.17.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.17.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.17.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.17.1/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.17.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.17.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.18.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.18.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.18.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.18.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.18.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.18.1/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.18.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.18.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.18.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.18.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.18.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.18.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.18.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.18.2/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.18.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.18.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.19.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.19.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.19.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.19.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.19.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.19.0/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.19.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.19.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.19.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.19.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.19.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.19.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.19.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.19.1/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.19.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.19.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.2.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.2.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.2.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.2.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.2.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.2.0/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.2.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.2.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.2.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.2.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.2.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.2.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.2.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.2.1/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.2.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.2.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.2.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.2.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.2.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.2.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.2.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.2.2/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.2.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.2.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.2.3/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.2.3/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.2.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.2.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.2.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.2.3/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.2.3/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.2.3/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.2.4/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.2.4/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.2.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.2.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.2.4/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.2.4/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.2.4/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.2.4/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.2.5/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.2.5/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.2.5/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.2.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.2.5/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.2.5/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.2.5/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.2.5/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.2.6/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.2.6/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.2.6/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.2.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.2.6/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.2.6/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.2.6/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.2.6/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.20.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.20.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.20.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.20.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.0/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.20.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.20.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.21.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.21.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.21.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.21.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.21.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.21.0/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.21.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.21.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.22.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.22.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.22.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.22.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.22.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.22.0/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.22.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.22.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.22.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.22.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.22.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.22.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.22.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.22.1/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.22.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.22.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.3.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.3.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.3.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.3.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.3.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.3.0/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.3.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.3.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.3.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.3.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.3.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.3.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.3.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.3.1/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.3.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.3.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.3.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.3.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.3.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.3.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.3.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.3.2/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.3.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.3.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.3.3/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.3.3/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.3.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.3.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.3.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.3.3/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.3.3/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.3.3/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.3.4/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.3.4/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.3.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.3.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.3.4/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.3.4/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.3.4/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.3.4/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.3.5/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.3.5/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.3.5/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.3.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.3.5/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.3.5/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.3.5/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.3.5/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.4.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.4.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.4.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.4.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.4.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.4.0/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.4.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.4.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.4.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.4.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.4.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.4.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.4.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.4.1/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.4.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.4.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.4.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.4.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.4.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.4.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.4.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.4.2/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.4.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.4.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.4.3/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.4.3/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.4.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.4.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.4.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.4.3/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.4.3/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.4.3/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.5.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.0/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.5.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.5.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.1/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.5.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.10/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.10/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.10/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.5.10/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.10/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.10/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.10/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.5.10/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.11/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.11/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.11/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.5.11/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.11/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.11/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.11/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.5.11/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.12/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.12/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.12/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.5.12/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.12/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.12/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.12/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.5.12/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.13/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.13/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.13/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.5.13/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.13/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.13/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.13/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.5.13/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.14/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.14/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.14/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.5.14/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.14/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.14/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.14/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.5.14/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.15/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.15/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.15/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.5.15/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.15/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.15/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.15/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.5.15/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.16/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.16/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.16/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.5.16/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.16/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.16/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.16/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.5.16/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.17/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.17/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.17/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.5.17/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.17/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.17/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.17/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.5.17/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.18/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.18/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.18/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.5.18/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.18/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.18/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.18/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.5.18/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.19/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.19/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.19/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.5.19/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.19/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.19/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.19/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.5.19/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.2/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.2/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.5.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.2/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.2/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.2/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.5.2/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.3/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.3/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.5.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.3/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.3/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.3/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.5.3/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.4/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.4/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.5.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.4/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.4/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.4/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.5.4/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.5/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.5/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.5/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.5.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.5/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.5/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.5/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.5.5/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.6/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.6/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.6/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.5.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.6/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.6/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.6/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.5.6/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.7/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.7/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.7/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.5.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.7/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.7/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.7/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.5.7/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.8/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.8/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.8/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.5.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.8/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.8/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.8/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.5.8/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.9/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.5.9/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.9/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.5.9/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.5.9/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.5.9/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.5.9/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.5.9/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.6.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.6.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.6.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.6.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.6.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.6.0/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.6.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.6.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.6.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.6.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.6.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.6.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.6.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.6.1/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.6.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.6.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.7.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.7.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.7.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.7.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.7.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.7.0/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.7.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.7.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.7.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.7.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.7.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.7.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.7.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.7.1/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.7.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.7.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.8.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.8.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.8.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.8.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.8.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.8.0/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.8.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.8.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.8.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.8.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.8.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.8.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.8.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.8.1/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.8.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.8.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.9.0/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.9.0/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.9.0/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.9.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.9.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.9.0/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.9.0/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.9.0/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.9.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.9.1/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/8/8.9.1/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/8/8.9.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/8/8.9.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.9.1/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/8/8.9.1/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/8/8.9.1/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/latest/Dockerfile b/linux/ecosystem/atlassian/jira/latest/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/latest/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/latest/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/latest/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/latest/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/latest/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/templates/2/Dockerfile b/linux/ecosystem/atlassian/jira/templates/2/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/templates/2/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/templates/2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/templates/3/Dockerfile b/linux/ecosystem/atlassian/jira/templates/3/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/templates/3/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/templates/3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/templates/4/Dockerfile b/linux/ecosystem/atlassian/jira/templates/4/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/templates/4/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/templates/4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/templates/5/Dockerfile b/linux/ecosystem/atlassian/jira/templates/5/Dockerfile
index 4817a899d..7395c7552 100644
--- a/linux/ecosystem/atlassian/jira/templates/5/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/templates/5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk6
+FROM epicmorg/debian:bullseye-jdk6
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/templates/6/Dockerfile b/linux/ecosystem/atlassian/jira/templates/6/Dockerfile
index 2a1d2a7df..8a5d219c6 100644
--- a/linux/ecosystem/atlassian/jira/templates/6/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/templates/6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk7
+FROM epicmorg/debian:bullseye-jdk7
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/templates/7/Dockerfile b/linux/ecosystem/atlassian/jira/templates/7/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/templates/7/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/templates/7/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/templates/8/Dockerfile b/linux/ecosystem/atlassian/jira/templates/8/Dockerfile
index eeec7c1d8..0bb89734c 100644
--- a/linux/ecosystem/atlassian/jira/templates/8/Dockerfile
+++ b/linux/ecosystem/atlassian/jira/templates/8/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk8
+FROM epicmorg/debian:bullseye-jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/atlassian/jira/templates/8/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/templates/8/Dockerfile.jdk11
index a98a20e49..8719b8c56 100644
--- a/linux/ecosystem/atlassian/jira/templates/8/Dockerfile.jdk11
+++ b/linux/ecosystem/atlassian/jira/templates/8/Dockerfile.jdk11
@@ -1,4 +1,4 @@
-FROM epicmorg/prod:jdk11
+FROM epicmorg/debian:bullseye-jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk11/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk11/Dockerfile.develop
new file mode 100644
index 000000000..4704955cf
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk11/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:jessie-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java11
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ jessie main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-11-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/lib && \    
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk11/docker-compose.yml b/linux/ecosystem/epicmorg/debian/08-jessie/jdk11/docker-compose.yml
index 36cc157a1..bd14fb691 100644
--- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk11/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk11/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:jessie-jdk11"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:jessie-develop-jdk11"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk12/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk12/Dockerfile.develop
new file mode 100644
index 000000000..0a320ded3
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk12/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:jessie-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java12
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ jessie main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-12-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk12/docker-compose.yml b/linux/ecosystem/epicmorg/debian/08-jessie/jdk12/docker-compose.yml
index bf7951c82..43195432d 100644
--- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk12/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk12/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:jessie-jdk12"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:jessie-develop-jdk12"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk13/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk13/Dockerfile.develop
new file mode 100644
index 000000000..5bd0d3b06
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk13/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:jessie-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java13
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ jessie main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-13-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk13/docker-compose.yml b/linux/ecosystem/epicmorg/debian/08-jessie/jdk13/docker-compose.yml
index 687e31c62..ca632de70 100644
--- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk13/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk13/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:jessie-jdk13"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:jessie-develop-jdk13"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk14/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk14/Dockerfile.develop
new file mode 100644
index 000000000..2d0492e1d
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk14/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:jessie-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java14
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ jessie main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-14-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk14/docker-compose.yml b/linux/ecosystem/epicmorg/debian/08-jessie/jdk14/docker-compose.yml
index 84d3b6e29..e9b447291 100644
--- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk14/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk14/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:jessie-jdk14"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:jessie-develop-jdk14"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk15/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk15/Dockerfile.develop
new file mode 100644
index 000000000..12ae045e1
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk15/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:jessie-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java15
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ jessie main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-15-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk15/docker-compose.yml b/linux/ecosystem/epicmorg/debian/08-jessie/jdk15/docker-compose.yml
index 601e4e286..3148701b8 100644
--- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk15/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk15/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:jessie-jdk15"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:jessie-develop-jdk15"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk16/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk16/Dockerfile.develop
new file mode 100644
index 000000000..87de68913
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk16/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:jessie-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java16
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ stretch main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-16-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk16/docker-compose.yml b/linux/ecosystem/epicmorg/debian/08-jessie/jdk16/docker-compose.yml
index 7c59407aa..01d2e7c36 100644
--- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk16/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk16/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:jessie-jdk16"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:jessie-develop-jdk16"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk17/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk17/Dockerfile.develop
new file mode 100644
index 000000000..ccd94b6a3
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk17/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:jessie-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java17
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
+    echo 'deb https://packages.adoptium.net/artifactory/deb stretch main' > /etc/apt/sources.list.d/temurin-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated temurin-17-jdk && \
+    mkdir /usr/lib/jvm/temurin-17-jdk-amd64/jre && \
+    ln -s /usr/lib/jvm/temurin-17-jdk-amd64/bin/ /usr/lib/jvm/temurin-17-jdk-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/temurin-17-jdk-amd64/lib/ /usr/lib/jvm/temurin-17-jdk-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk17/docker-compose.yml b/linux/ecosystem/epicmorg/debian/08-jessie/jdk17/docker-compose.yml
index 2893861b9..618b4cc76 100644
--- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk17/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk17/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:jessie-jdk17"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:jessie-develop-jdk17"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk18/Dockerfile b/linux/ecosystem/epicmorg/debian/08-jessie/jdk18/Dockerfile
index d34224b97..b44085d82 100644
--- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk18/Dockerfile
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk18/Dockerfile
@@ -3,7 +3,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
 ##################################################################
-#                   installing java16
+#                   installing java18
 ##################################################################
 RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
     echo 'deb https://packages.adoptium.net/artifactory/deb stretch main' > /etc/apt/sources.list.d/temurin-official.list && \
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk18/Dockerfile.develop
new file mode 100644
index 000000000..dec8406e2
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk18/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:jessie-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java18
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
+    echo 'deb https://packages.adoptium.net/artifactory/deb stretch main' > /etc/apt/sources.list.d/temurin-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated temurin-18-jdk && \
+    mkdir /usr/lib/jvm/temurin-18-jdk-amd64/jre && \
+    ln -s /usr/lib/jvm/temurin-18-jdk-amd64/bin/ /usr/lib/jvm/temurin-18-jdk-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/temurin-18-jdk-amd64/lib/ /usr/lib/jvm/temurin-18-jdk-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk18/docker-compose.yml b/linux/ecosystem/epicmorg/debian/08-jessie/jdk18/docker-compose.yml
index b81ce327a..2be6cc5f6 100644
--- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk18/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk18/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:jessie-jdk18"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:jessie-develop-jdk18"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk6/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk6/Dockerfile.develop
new file mode 100644
index 000000000..1ad66ca4a
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk6/Dockerfile.develop
@@ -0,0 +1,22 @@
+FROM epicmorg/debian:jessie-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java6
+##################################################################
+RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key add - && \
+    echo 'deb http://repos.azulsystems.com/debian stable main' > /etc/apt/sources.list.d/zulu.list && \
+    apt-get update -y && \
+    apt-get install -y --allow-unauthenticated zulu-6 && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk6/docker-compose.yml b/linux/ecosystem/epicmorg/debian/08-jessie/jdk6/docker-compose.yml
index df3de3302..47452ff80 100644
--- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk6/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk6/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:jessie-jdk6"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:jessie-develop-jdk6"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk7/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk7/Dockerfile.develop
new file mode 100644
index 000000000..2afd71277
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk7/Dockerfile.develop
@@ -0,0 +1,22 @@
+FROM epicmorg/debian:jessie-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java7
+##################################################################
+RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key add - && \
+    echo 'deb http://repos.azulsystems.com/debian stable main' > /etc/apt/sources.list.d/zulu.list && \
+    apt-get update -y && \
+    apt-get install -y --allow-unauthenticated zulu-7 && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk7/docker-compose.yml b/linux/ecosystem/epicmorg/debian/08-jessie/jdk7/docker-compose.yml
index ebaa1d9fe..254f56ef5 100644
--- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk7/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk7/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:jessie-jdk7"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:jessie-develop-jdk7"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk8/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/08-jessie/jdk8/Dockerfile.develop
new file mode 100644
index 000000000..e94c3ed80
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk8/Dockerfile.develop
@@ -0,0 +1,23 @@
+FROM epicmorg/debian:jessie-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java8
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ jessie main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-8-hotspot && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk8/docker-compose.yml b/linux/ecosystem/epicmorg/debian/08-jessie/jdk8/docker-compose.yml
index 14c358761..8f6a2b445 100644
--- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk8/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk8/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:jessie-jdk8"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:jessie-develop-jdk8"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/Dockerfile.develop
new file mode 100644
index 000000000..1c45c2223
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:stretch-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java11
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
+    echo 'deb https://packages.adoptium.net/artifactory/deb stretch main' > /etc/apt/sources.list.d/temurin-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated temurin-11-jdk && \
+    mkdir /usr/lib/jvm/temurin-11-jdk-amd64/jre && \
+    ln -s /usr/lib/jvm/temurin-11-jdk-amd64/bin/ /usr/lib/jvm/temurin-11-jdk-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/temurin-11-jdk-amd64/lib/ /usr/lib/jvm/temurin-11-jdk-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/docker-compose.yml b/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/docker-compose.yml
index 8532e44ea..4ee306c42 100644
--- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/docker-compose.yml
@@ -4,9 +4,13 @@ services:
     image: "epicmorg/debian:stretch-jdk11"
     build:
       context: .
-  app-old:
+  app-develop:
+    image: "epicmorg/debian:stretch-develop-jdk11"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
+  app-adopted:
     image: "epicmorg/debian:stretch-jdk11-adopted"
     build:
       context: .
       dockerfile: ./Dockerfile.adopted
-
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk12/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk12/Dockerfile.develop
new file mode 100644
index 000000000..d7a3603b1
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk12/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:stretch-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java12
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ stretch main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-12-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk12/docker-compose.yml b/linux/ecosystem/epicmorg/debian/09-stretch/jdk12/docker-compose.yml
index 9bbde482b..558c240cd 100644
--- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk12/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk12/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:stretch-jdk12"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:stretch-develop-jdk12"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk13/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk13/Dockerfile.develop
new file mode 100644
index 000000000..f3f5ed645
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk13/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:stretch-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java13
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ stretch main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-13-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk13/docker-compose.yml b/linux/ecosystem/epicmorg/debian/09-stretch/jdk13/docker-compose.yml
index d453f301e..2922b0172 100644
--- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk13/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk13/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:stretch-jdk13"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:stretch-develop-jdk13"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk14/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk14/Dockerfile.develop
new file mode 100644
index 000000000..f95cf30b8
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk14/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:stretch-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java14
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ stretch main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-14-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk14/docker-compose.yml b/linux/ecosystem/epicmorg/debian/09-stretch/jdk14/docker-compose.yml
index d8ff18173..6d24fb97b 100644
--- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk14/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk14/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:stretch-jdk14"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:stretch-develop-jdk14"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk15/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk15/Dockerfile.develop
new file mode 100644
index 000000000..89f30d699
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk15/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:stretch-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java15
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ stretch main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-15-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk15/docker-compose.yml b/linux/ecosystem/epicmorg/debian/09-stretch/jdk15/docker-compose.yml
index 5fdf8d977..486600ff8 100644
--- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk15/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk15/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:stretch-jdk15"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:stretch-develop-jdk15"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk16/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk16/Dockerfile.develop
new file mode 100644
index 000000000..c871c6619
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk16/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:stretch-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java16
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ stretch main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-16-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk16/docker-compose.yml b/linux/ecosystem/epicmorg/debian/09-stretch/jdk16/docker-compose.yml
index 8bdd47265..232c23f58 100644
--- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk16/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk16/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:stretch-jdk16"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:stretch-develop-jdk16"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk17/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk17/Dockerfile.develop
new file mode 100644
index 000000000..5a6d4c1cd
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk17/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:stretch-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java17
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
+    echo 'deb https://packages.adoptium.net/artifactory/deb stretch main' > /etc/apt/sources.list.d/temurin-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated temurin-17-jdk && \
+    mkdir /usr/lib/jvm/temurin-17-jdk-amd64/jre && \
+    ln -s /usr/lib/jvm/temurin-17-jdk-amd64/bin/ /usr/lib/jvm/temurin-17-jdk-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/temurin-17-jdk-amd64/lib/ /usr/lib/jvm/temurin-17-jdk-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk17/docker-compose.yml b/linux/ecosystem/epicmorg/debian/09-stretch/jdk17/docker-compose.yml
index ce7c1d860..b917b86d6 100644
--- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk17/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk17/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:stretch-jdk17"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:stretch-develop-jdk17"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk18/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/jdk18/Dockerfile
index a9f2d46c6..f867a76d1 100644
--- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk18/Dockerfile
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk18/Dockerfile
@@ -3,7 +3,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
 ##################################################################
-#                   installing java16
+#                   installing java18
 ##################################################################
 RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
     echo 'deb https://packages.adoptium.net/artifactory/deb stretch main' > /etc/apt/sources.list.d/temurin-official.list && \
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk18/Dockerfile.develop
new file mode 100644
index 000000000..377cc9f26
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk18/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:stretch-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java18
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
+    echo 'deb https://packages.adoptium.net/artifactory/deb stretch main' > /etc/apt/sources.list.d/temurin-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated temurin-18-jdk && \
+    mkdir /usr/lib/jvm/temurin-18-jdk-amd64/jre && \
+    ln -s /usr/lib/jvm/temurin-18-jdk-amd64/bin/ /usr/lib/jvm/temurin-18-jdk-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/temurin-18-jdk-amd64/lib/ /usr/lib/jvm/temurin-18-jdk-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk18/docker-compose.yml b/linux/ecosystem/epicmorg/debian/09-stretch/jdk18/docker-compose.yml
index a721877b1..12d851eba 100644
--- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk18/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk18/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:stretch-jdk18"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:stretch-develop-jdk18"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk6/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk6/Dockerfile.develop
new file mode 100644
index 000000000..10f37b224
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk6/Dockerfile.develop
@@ -0,0 +1,22 @@
+FROM epicmorg/debian:stretch-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java6
+##################################################################
+RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key add - && \
+    echo 'deb http://repos.azulsystems.com/debian stable main' > /etc/apt/sources.list.d/zulu.list && \
+    apt-get update -y && \
+    apt-get install -y --allow-unauthenticated zulu-6 && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk6/docker-compose.yml b/linux/ecosystem/epicmorg/debian/09-stretch/jdk6/docker-compose.yml
index dde60f673..24bffb6fb 100644
--- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk6/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk6/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:stretch-jdk6"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:stretch-develop-jdk6"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk7/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk7/Dockerfile.develop
new file mode 100644
index 000000000..b265fcc1e
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk7/Dockerfile.develop
@@ -0,0 +1,22 @@
+FROM epicmorg/debian:stretch-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java7
+##################################################################
+RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key add - && \
+    echo 'deb http://repos.azulsystems.com/debian stable main' > /etc/apt/sources.list.d/zulu.list && \
+    apt-get update -y && \
+    apt-get install -y --allow-unauthenticated zulu-7 && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk7/docker-compose.yml b/linux/ecosystem/epicmorg/debian/09-stretch/jdk7/docker-compose.yml
index 620ddb64d..49427eac8 100644
--- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk7/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk7/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:stretch-jdk7"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:stretch-develop-jdk7"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/Dockerfile.develop
new file mode 100644
index 000000000..25b7f190f
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/Dockerfile.develop
@@ -0,0 +1,23 @@
+FROM epicmorg/debian:stretch-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java8
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
+    echo 'deb https://packages.adoptium.net/artifactory/deb stretch main' > /etc/apt/sources.list.d/temurin-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated temurin-8-jdk && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/docker-compose.yml b/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/docker-compose.yml
index 682e05166..ca535014b 100644
--- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/docker-compose.yml
@@ -4,7 +4,12 @@ services:
     image: "epicmorg/debian:stretch-jdk8"
     build:
       context: .
-  app-old:
+  app-develop:
+    image: "epicmorg/debian:stretch-develop-jdk8"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
+  app-adopted:
     image: "epicmorg/debian:stretch-jdk8-adopted"
     build:
       context: .
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk11/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk11/Dockerfile.develop
new file mode 100644
index 000000000..914efed90
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk11/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:buster-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java11
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
+    echo 'deb https://packages.adoptium.net/artifactory/deb buster main' > /etc/apt/sources.list.d/temurin-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated temurin-11-jdk && \
+    mkdir /usr/lib/jvm/temurin-11-jdk-amd64/jre && \
+    ln -s /usr/lib/jvm/temurin-11-jdk-amd64/bin/ /usr/lib/jvm/temurin-11-jdk-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/temurin-11-jdk-amd64/lib/ /usr/lib/jvm/temurin-11-jdk-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk11/docker-compose.yml b/linux/ecosystem/epicmorg/debian/10-buster/jdk11/docker-compose.yml
index bfb09bb7c..d69cfa305 100644
--- a/linux/ecosystem/epicmorg/debian/10-buster/jdk11/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk11/docker-compose.yml
@@ -9,4 +9,8 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile.adopted
-
+  app-develop:
+    image: "epicmorg/debian:buster-develop-jdk11"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
\ No newline at end of file
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk12/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk12/Dockerfile.develop
new file mode 100644
index 000000000..f7a303db7
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk12/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:buster-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java12
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-12-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk12/docker-compose.yml b/linux/ecosystem/epicmorg/debian/10-buster/jdk12/docker-compose.yml
index 97f731e01..edfc240a8 100644
--- a/linux/ecosystem/epicmorg/debian/10-buster/jdk12/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk12/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:buster-jdk12"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:buster-develop-jdk12"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
\ No newline at end of file
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk13/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk13/Dockerfile.develop
new file mode 100644
index 000000000..bd5960496
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk13/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:buster-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java13
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-13-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk13/docker-compose.yml b/linux/ecosystem/epicmorg/debian/10-buster/jdk13/docker-compose.yml
index 00d4a329f..2682c22e2 100644
--- a/linux/ecosystem/epicmorg/debian/10-buster/jdk13/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk13/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:buster-jdk13"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:buster-develop-jdk13"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk14/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk14/Dockerfile.develop
new file mode 100644
index 000000000..8f29106eb
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk14/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:buster-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java14
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-14-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk14/docker-compose.yml b/linux/ecosystem/epicmorg/debian/10-buster/jdk14/docker-compose.yml
index 570b764e5..9b1416863 100644
--- a/linux/ecosystem/epicmorg/debian/10-buster/jdk14/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk14/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:buster-jdk14"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:buster-develop-jdk14"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk15/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk15/Dockerfile.develop
new file mode 100644
index 000000000..554c4e58d
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk15/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:buster-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java15
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-15-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk15/docker-compose.yml b/linux/ecosystem/epicmorg/debian/10-buster/jdk15/docker-compose.yml
index 9edb2c980..9fde6ae08 100644
--- a/linux/ecosystem/epicmorg/debian/10-buster/jdk15/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk15/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:buster-jdk15"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:buster-develop-jdk15"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk16/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk16/Dockerfile.develop
new file mode 100644
index 000000000..d9ba099d5
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk16/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:buster-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java16
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-16-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk16/docker-compose.yml b/linux/ecosystem/epicmorg/debian/10-buster/jdk16/docker-compose.yml
index 9692f8eff..bd84d543e 100644
--- a/linux/ecosystem/epicmorg/debian/10-buster/jdk16/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk16/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:buster-jdk16"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:buster-develop-jdk16"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk17/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk17/Dockerfile.develop
new file mode 100644
index 000000000..c001e1aca
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk17/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:buster-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java17
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
+    echo 'deb https://packages.adoptium.net/artifactory/deb buster main' > /etc/apt/sources.list.d/temurin-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated temurin-17-jdk && \
+    mkdir /usr/lib/jvm/temurin-17-jdk-amd64/jre && \
+    ln -s /usr/lib/jvm/temurin-17-jdk-amd64/bin/ /usr/lib/jvm/temurin-17-jdk-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/temurin-17-jdk-amd64/lib/ /usr/lib/jvm/temurin-17-jdk-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk17/docker-compose.yml b/linux/ecosystem/epicmorg/debian/10-buster/jdk17/docker-compose.yml
index ca7c901b4..b33565720 100644
--- a/linux/ecosystem/epicmorg/debian/10-buster/jdk17/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk17/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:buster-jdk17"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:buster-develop-jdk17"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk18/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/jdk18/Dockerfile
index fb37f4ed7..219efb4bf 100644
--- a/linux/ecosystem/epicmorg/debian/10-buster/jdk18/Dockerfile
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk18/Dockerfile
@@ -3,7 +3,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
 ##################################################################
-#                   installing java16
+#                   installing java18
 ##################################################################
 RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
     echo 'deb https://packages.adoptium.net/artifactory/deb buster main' > /etc/apt/sources.list.d/temurin-official.list && \
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk18/Dockerfile.develop
new file mode 100644
index 000000000..48069da39
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk18/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:buster-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java18
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
+    echo 'deb https://packages.adoptium.net/artifactory/deb buster main' > /etc/apt/sources.list.d/temurin-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated temurin-18-jdk && \
+    mkdir /usr/lib/jvm/temurin-18-jdk-amd64/jre && \
+    ln -s /usr/lib/jvm/temurin-18-jdk-amd64/bin/ /usr/lib/jvm/temurin-18-jdk-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/temurin-18-jdk-amd64/lib/ /usr/lib/jvm/temurin-18-jdk-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk18/docker-compose.yml b/linux/ecosystem/epicmorg/debian/10-buster/jdk18/docker-compose.yml
index 5fe693a95..b576da6d5 100644
--- a/linux/ecosystem/epicmorg/debian/10-buster/jdk18/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk18/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:buster-jdk18"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:buster-develop-jdk18"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk6/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk6/Dockerfile.develop
new file mode 100644
index 000000000..d092f2c97
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk6/Dockerfile.develop
@@ -0,0 +1,22 @@
+FROM epicmorg/debian:buster-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java6
+##################################################################
+RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key add - && \
+    echo 'deb http://repos.azulsystems.com/debian stable main' > /etc/apt/sources.list.d/zulu.list && \
+    apt-get update -y && \
+    apt-get install -y --allow-unauthenticated zulu-6 && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk6/docker-compose.yml b/linux/ecosystem/epicmorg/debian/10-buster/jdk6/docker-compose.yml
index 9c936e3ec..54d50657b 100644
--- a/linux/ecosystem/epicmorg/debian/10-buster/jdk6/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk6/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:buster-jdk6"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:buster-develop-jdk6"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk7/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk7/Dockerfile.develop
new file mode 100644
index 000000000..c08412481
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk7/Dockerfile.develop
@@ -0,0 +1,22 @@
+FROM epicmorg/debian:buster-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java7
+##################################################################
+RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key add - && \
+    echo 'deb http://repos.azulsystems.com/debian stable main' > /etc/apt/sources.list.d/zulu.list && \
+    apt-get update -y && \
+    apt-get install -y --allow-unauthenticated zulu-7 && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk7/docker-compose.yml b/linux/ecosystem/epicmorg/debian/10-buster/jdk7/docker-compose.yml
index b8ed52b30..30235d565 100644
--- a/linux/ecosystem/epicmorg/debian/10-buster/jdk7/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk7/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:buster-jdk7"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:buster-develop-jdk7"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk8/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/10-buster/jdk8/Dockerfile.develop
new file mode 100644
index 000000000..a294dfc84
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk8/Dockerfile.develop
@@ -0,0 +1,23 @@
+FROM epicmorg/debian:buster-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java8
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
+    echo 'deb https://packages.adoptium.net/artifactory/deb buster main' > /etc/apt/sources.list.d/temurin-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated temurin-8-jdk && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/10-buster/jdk8/docker-compose.yml b/linux/ecosystem/epicmorg/debian/10-buster/jdk8/docker-compose.yml
index 9f080b984..8c4e4676f 100644
--- a/linux/ecosystem/epicmorg/debian/10-buster/jdk8/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/10-buster/jdk8/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.9'
 services:
   app:
-    image: "epicmorg/debian:byster-jdk8"
+    image: "epicmorg/debian:buster-jdk8"
     build:
       context: .
   app-old:
@@ -9,3 +9,8 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile.adopted
+  app-develop:
+    image: "epicmorg/debian:buster-develop-jdk8"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk11/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk11/Dockerfile.develop
new file mode 100644
index 000000000..1819ed8a7
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk11/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:bullseye-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java11
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
+    echo 'deb https://packages.adoptium.net/artifactory/deb bullseye main' > /etc/apt/sources.list.d/temurin-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated temurin-11-jdk && \
+    mkdir /usr/lib/jvm/temurin-11-jdk-amd64/jre && \
+    ln -s /usr/lib/jvm/temurin-11-jdk-amd64/bin/ /usr/lib/jvm/temurin-11-jdk-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/temurin-11-jdk-amd64/lib/ /usr/lib/jvm/temurin-11-jdk-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk11/docker-compose.yml b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk11/docker-compose.yml
index 951dc5633..f1a7e24cd 100644
--- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk11/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk11/docker-compose.yml
@@ -9,4 +9,8 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile.adopted
-
+  app-develop:
+    image: "epicmorg/debian:bullseye-develop-jdk11"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk12/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk12/Dockerfile.develop
new file mode 100644
index 000000000..3fdeb26ca
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk12/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:bullseye-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java12
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ bullseye main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-12-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk12/docker-compose.yml b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk12/docker-compose.yml
index 69baf63c9..52edd4179 100644
--- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk12/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk12/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:bullseye-jdk12"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:bullseye-develop-jdk12"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk13/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk13/Dockerfile.develop
new file mode 100644
index 000000000..0a63a24a7
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk13/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:bullseye-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java13
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ bullseye main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-13-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk13/docker-compose.yml b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk13/docker-compose.yml
index b45ba658c..cf2adfe4e 100644
--- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk13/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk13/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:bullseye-jdk13"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:bullseye-develop-jdk13"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk14/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk14/Dockerfile.develop
new file mode 100644
index 000000000..f334abe9e
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk14/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:bullseye-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java14
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ bullseye main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-14-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk14/docker-compose.yml b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk14/docker-compose.yml
index 118793f27..4cc11aab9 100644
--- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk14/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk14/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:bullseye-jdk14"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:bullseye-develop-jdk14"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk15/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk15/Dockerfile.develop
new file mode 100644
index 000000000..19b87adbf
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk15/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:bullseye-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java15
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ bullseye main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-15-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk15/docker-compose.yml b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk15/docker-compose.yml
index 87635b959..d547993eb 100644
--- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk15/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk15/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:bullseye-jdk15"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:bullseye-develop-jdk15"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk16/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk16/Dockerfile.develop
new file mode 100644
index 000000000..0966c80d8
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk16/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:bullseye-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java16
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ bullseye main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-16-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk16/docker-compose.yml b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk16/docker-compose.yml
index 0f8a40ab6..a9bc4d937 100644
--- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk16/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk16/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:bullseye-jdk16"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:bullseye-develop-jdk16"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk17/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk17/Dockerfile.develop
new file mode 100644
index 000000000..5b1a12225
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk17/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:bullseye-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java17
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
+    echo 'deb https://packages.adoptium.net/artifactory/deb bullseye main' > /etc/apt/sources.list.d/temurin-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated temurin-17-jdk && \
+    mkdir /usr/lib/jvm/temurin-17-jdk-amd64/jre && \
+    ln -s /usr/lib/jvm/temurin-17-jdk-amd64/bin/ /usr/lib/jvm/temurin-17-jdk-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/temurin-17-jdk-amd64/lib/ /usr/lib/jvm/temurin-17-jdk-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk17/docker-compose.yml b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk17/docker-compose.yml
index 968c543a4..10a65746f 100644
--- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk17/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk17/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:bullseye-jdk17"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:bullseye-develop-jdk17"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk18/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk18/Dockerfile
index ff0af9882..7bc43a108 100644
--- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk18/Dockerfile
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk18/Dockerfile
@@ -3,7 +3,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
 ##################################################################
-#                   installing java16
+#                   installing java18
 ##################################################################
 RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
     echo 'deb https://packages.adoptium.net/artifactory/deb bullseye main' > /etc/apt/sources.list.d/temurin-official.list && \
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk18/Dockerfile.develop
new file mode 100644
index 000000000..a4b4cd241
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk18/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:bullseye-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java18
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
+    echo 'deb https://packages.adoptium.net/artifactory/deb bullseye main' > /etc/apt/sources.list.d/temurin-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated temurin-18-jdk && \
+    mkdir /usr/lib/jvm/temurin-18-jdk-amd64/jre && \
+    ln -s /usr/lib/jvm/temurin-18-jdk-amd64/bin/ /usr/lib/jvm/temurin-18-jdk-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/temurin-18-jdk-amd64/lib/ /usr/lib/jvm/temurin-18-jdk-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk18/docker-compose.yml b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk18/docker-compose.yml
index 647ce2fca..5e37ba6d6 100644
--- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk18/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk18/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:bullseye-jdk18"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:bullseye-develop-jdk18"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk6/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk6/Dockerfile
index 94dcde555..fd30e929b 100644
--- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk6/Dockerfile
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/debian:buster
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk6/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk6/Dockerfile.develop
new file mode 100644
index 000000000..3f989718b
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk6/Dockerfile.develop
@@ -0,0 +1,22 @@
+FROM epicmorg/debian:bullseye-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java6
+##################################################################
+RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key add - && \
+    echo 'deb http://repos.azulsystems.com/debian stable main' > /etc/apt/sources.list.d/zulu.list && \
+    apt-get update -y && \
+    apt-get install -y --allow-unauthenticated zulu-6 && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk6/docker-compose.yml b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk6/docker-compose.yml
index 9c936e3ec..a606cec8f 100644
--- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk6/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk6/docker-compose.yml
@@ -1,6 +1,11 @@
 version: '3.9'
 services:
   app:
-    image: "epicmorg/debian:buster-jdk6"
+    image: "epicmorg/debian:bullseye-jdk6"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:bullseye-develop-jdk6"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk7/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk7/Dockerfile.develop
new file mode 100644
index 000000000..e204843d2
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk7/Dockerfile.develop
@@ -0,0 +1,22 @@
+FROM epicmorg/debian:bullseye-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java7
+##################################################################
+RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key add - && \
+    echo 'deb http://repos.azulsystems.com/debian stable main' > /etc/apt/sources.list.d/zulu.list && \
+    apt-get update -y && \
+    apt-get install -y --allow-unauthenticated zulu-7 && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk7/docker-compose.yml b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk7/docker-compose.yml
index 06e8c3a43..843f8cba3 100644
--- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk7/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk7/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:bullseye-jdk7"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:bullseye-develop-jdk7"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk8/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk8/Dockerfile.develop
new file mode 100644
index 000000000..d477912f2
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk8/Dockerfile.develop
@@ -0,0 +1,23 @@
+FROM epicmorg/debian:bullseye-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java8
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
+    echo 'deb https://packages.adoptium.net/artifactory/deb bullseye main' > /etc/apt/sources.list.d/temurin-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated temurin-8-jdk && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk8/docker-compose.yml b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk8/docker-compose.yml
index 188442cb3..75f8cffde 100644
--- a/linux/ecosystem/epicmorg/debian/11-bullseye/jdk8/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/11-bullseye/jdk8/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.9'
 services:
   app:
-    image: "epicmorg/debian:byster-jdk8"
+    image: "epicmorg/debian:bullseye-jdk8"
     build:
       context: .
   app-old:
@@ -9,3 +9,8 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile.adopted
+  app-develop:
+    image: "epicmorg/debian:bullseye-develop-jdk8"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile.develop
new file mode 100644
index 000000000..9c502013a
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:bookworm-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java11
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
+    echo 'deb https://packages.adoptium.net/artifactory/deb bookworm main' > /etc/apt/sources.list.d/temurin-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated temurin-11-jdk && \
+    mkdir /usr/lib/jvm/temurin-11-jdk-amd64/jre && \
+    ln -s /usr/lib/jvm/temurin-11-jdk-amd64/bin/ /usr/lib/jvm/temurin-11-jdk-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/temurin-11-jdk-amd64/lib/ /usr/lib/jvm/temurin-11-jdk-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/docker-compose.yml
index 25d07ec42..df42c2704 100644
--- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/docker-compose.yml
@@ -9,4 +9,8 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile.adopted
-
+  app-develop:
+    image: "epicmorg/debian:bookworm-develop-jdk11"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/Dockerfile.develop
new file mode 100644
index 000000000..d3aaaefb4
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:bookworm-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java12
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ bookworm main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-12-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/docker-compose.yml
index 3cc23068f..2a6af4614 100644
--- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:bookworm-jdk12"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:bookworm-develop-jdk12"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/Dockerfile.develop
new file mode 100644
index 000000000..0848c977b
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:bookworm-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java13
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ bookworm main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-13-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/docker-compose.yml
index 8a7adae72..57df280d2 100644
--- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:bookworm-jdk13"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:bookworm-develop-jdk13"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/Dockerfile.develop
new file mode 100644
index 000000000..4e89dd1a1
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:bookworm-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java14
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ bookworm main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-14-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/docker-compose.yml
index a422c279f..329a531a1 100644
--- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:bookworm-jdk14"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:bookworm-develop-jdk14"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Dockerfile.develop
new file mode 100644
index 000000000..e64b9938c
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:bookworm-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java15
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ bookworm main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-15-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/docker-compose.yml
index d35d21e79..fc598ba05 100644
--- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:bookworm-jdk15"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:bookworm-develop-jdk15"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Dockerfile.develop
new file mode 100644
index 000000000..2ce33f575
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:bookworm-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java16
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ bookworm main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-16-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/docker-compose.yml
index 95a16b2ee..07a767b23 100644
--- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:bookworm-jdk16"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:bookworm-develop-jdk16"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/Dockerfile.develop
new file mode 100644
index 000000000..5d01727ce
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:bookworm-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java17
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
+    echo 'deb https://packages.adoptium.net/artifactory/deb bookworm main' > /etc/apt/sources.list.d/temurin-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated temurin-17-jdk && \
+    mkdir /usr/lib/jvm/temurin-17-jdk-amd64/jre && \
+    ln -s /usr/lib/jvm/temurin-17-jdk-amd64/bin/ /usr/lib/jvm/temurin-17-jdk-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/temurin-17-jdk-amd64/lib/ /usr/lib/jvm/temurin-17-jdk-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/docker-compose.yml
index bf6b65eae..d59a1b9cc 100644
--- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:bookworm-jdk17"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:bookworm-develop-jdk17"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Dockerfile
index f5b095015..bc158d17a 100644
--- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Dockerfile
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Dockerfile
@@ -3,7 +3,7 @@ LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
 ##################################################################
-#                   installing java16
+#                   installing java18
 ##################################################################
 RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
     echo 'deb https://packages.adoptium.net/artifactory/deb bookworm main' > /etc/apt/sources.list.d/temurin-official.list && \
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Dockerfile.develop
new file mode 100644
index 000000000..55e425917
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Dockerfile.develop
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:bookworm-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java18
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
+    echo 'deb https://packages.adoptium.net/artifactory/deb bookworm main' > /etc/apt/sources.list.d/temurin-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated temurin-18-jdk && \
+    mkdir /usr/lib/jvm/temurin-18-jdk-amd64/jre && \
+    ln -s /usr/lib/jvm/temurin-18-jdk-amd64/bin/ /usr/lib/jvm/temurin-18-jdk-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/temurin-18-jdk-amd64/lib/ /usr/lib/jvm/temurin-18-jdk-amd64/jre/lib && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/docker-compose.yml
index 852ad3d7d..140a1604e 100644
--- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:bookworm-jdk18"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:bookworm-develop-jdk18"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk6/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk6/Dockerfile
index 94dcde555..25fdad24b 100644
--- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk6/Dockerfile
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/debian:buster
+FROM epicmorg/debian:bookworm
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk6/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk6/Dockerfile.develop
new file mode 100644
index 000000000..9c77018a3
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk6/Dockerfile.develop
@@ -0,0 +1,22 @@
+FROM epicmorg/debian:bookworm-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java6
+##################################################################
+RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key add - && \
+    echo 'deb http://repos.azulsystems.com/debian stable main' > /etc/apt/sources.list.d/zulu.list && \
+    apt-get update -y && \
+    apt-get install -y --allow-unauthenticated zulu-6 && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk6/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk6/docker-compose.yml
index 9c936e3ec..2c9b50651 100644
--- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk6/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk6/docker-compose.yml
@@ -1,6 +1,11 @@
 version: '3.9'
 services:
   app:
-    image: "epicmorg/debian:buster-jdk6"
+    image: "epicmorg/debian:bookworm-jdk6"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:bookworm-develop-jdk6"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk7/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk7/Dockerfile.develop
new file mode 100644
index 000000000..43e172903
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk7/Dockerfile.develop
@@ -0,0 +1,22 @@
+FROM epicmorg/debian:bookworm-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java7
+##################################################################
+RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key add - && \
+    echo 'deb http://repos.azulsystems.com/debian stable main' > /etc/apt/sources.list.d/zulu.list && \
+    apt-get update -y && \
+    apt-get install -y --allow-unauthenticated zulu-7 && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk7/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk7/docker-compose.yml
index 83b87053f..7f36d4053 100644
--- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk7/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk7/docker-compose.yml
@@ -4,3 +4,8 @@ services:
     image: "epicmorg/debian:bookworm-jdk7"
     build:
       context: .
+  app-develop:
+    image: "epicmorg/debian:bookworm-develop-jdk7"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/Dockerfile.develop
new file mode 100644
index 000000000..358475a95
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/Dockerfile.develop
@@ -0,0 +1,23 @@
+FROM epicmorg/debian:bookworm-develop
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   installing java8
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public  | apt-key add - && \
+    echo 'deb https://packages.adoptium.net/artifactory/deb bookworm main' > /etc/apt/sources.list.d/temurin-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated temurin-8-jdk && \
+    java -version
+
+##################################################################
+#                  cleanup
+##################################################################
+RUN apt-get purge policykit-1 -y && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /tmp/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/docker-compose.yml
index 62bb51801..ab6ce7fc3 100644
--- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/docker-compose.yml
+++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.9'
 services:
   app:
-    image: "epicmorg/debian:byster-jdk8"
+    image: "epicmorg/debian:bookworm-jdk8"
     build:
       context: .
   app-old:
@@ -9,3 +9,8 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile.adopted
+  app-develop:
+    image: "epicmorg/debian:bookworm-develop-jdk8"
+    build:
+      context: .
+      dockerfile: ./Dockerfile.develop
diff --git a/linux/ecosystem/nginx/1.14.2/main/Dockerfile b/linux/ecosystem/nginx/1.14.2/main/Dockerfile
index 907a090fe..f67d634e3 100644
--- a/linux/ecosystem/nginx/1.14.2/main/Dockerfile
+++ b/linux/ecosystem/nginx/1.14.2/main/Dockerfile
@@ -192,7 +192,7 @@ RUN cd ${NGINX_SRC_DIR} && \
 ##################################################################
 ##################################################################
 
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/nginx/1.15.12/main/Dockerfile b/linux/ecosystem/nginx/1.15.12/main/Dockerfile
index 907a090fe..f67d634e3 100644
--- a/linux/ecosystem/nginx/1.15.12/main/Dockerfile
+++ b/linux/ecosystem/nginx/1.15.12/main/Dockerfile
@@ -192,7 +192,7 @@ RUN cd ${NGINX_SRC_DIR} && \
 ##################################################################
 ##################################################################
 
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/nginx/1.16.1/main/Dockerfile b/linux/ecosystem/nginx/1.16.1/main/Dockerfile
index 907a090fe..f67d634e3 100644
--- a/linux/ecosystem/nginx/1.16.1/main/Dockerfile
+++ b/linux/ecosystem/nginx/1.16.1/main/Dockerfile
@@ -192,7 +192,7 @@ RUN cd ${NGINX_SRC_DIR} && \
 ##################################################################
 ##################################################################
 
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/nginx/1.17.10/main/Dockerfile b/linux/ecosystem/nginx/1.17.10/main/Dockerfile
index 907a090fe..f67d634e3 100644
--- a/linux/ecosystem/nginx/1.17.10/main/Dockerfile
+++ b/linux/ecosystem/nginx/1.17.10/main/Dockerfile
@@ -192,7 +192,7 @@ RUN cd ${NGINX_SRC_DIR} && \
 ##################################################################
 ##################################################################
 
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/nginx/1.18.0/main/Dockerfile b/linux/ecosystem/nginx/1.18.0/main/Dockerfile
index 907a090fe..f67d634e3 100644
--- a/linux/ecosystem/nginx/1.18.0/main/Dockerfile
+++ b/linux/ecosystem/nginx/1.18.0/main/Dockerfile
@@ -192,7 +192,7 @@ RUN cd ${NGINX_SRC_DIR} && \
 ##################################################################
 ##################################################################
 
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/nginx/1.19.10/main/Dockerfile b/linux/ecosystem/nginx/1.19.10/main/Dockerfile
index 907a090fe..f67d634e3 100644
--- a/linux/ecosystem/nginx/1.19.10/main/Dockerfile
+++ b/linux/ecosystem/nginx/1.19.10/main/Dockerfile
@@ -192,7 +192,7 @@ RUN cd ${NGINX_SRC_DIR} && \
 ##################################################################
 ##################################################################
 
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/nginx/1.20.1/main/Dockerfile b/linux/ecosystem/nginx/1.20.1/main/Dockerfile
index 907a090fe..f67d634e3 100644
--- a/linux/ecosystem/nginx/1.20.1/main/Dockerfile
+++ b/linux/ecosystem/nginx/1.20.1/main/Dockerfile
@@ -192,7 +192,7 @@ RUN cd ${NGINX_SRC_DIR} && \
 ##################################################################
 ##################################################################
 
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/nginx/1.21.3/main/Dockerfile b/linux/ecosystem/nginx/1.21.3/main/Dockerfile
index d63287502..76a3686e6 100644
--- a/linux/ecosystem/nginx/1.21.3/main/Dockerfile
+++ b/linux/ecosystem/nginx/1.21.3/main/Dockerfile
@@ -191,7 +191,7 @@ RUN cd ${NGINX_SRC_DIR} && \
 ##################################################################
 ##################################################################
 
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/nginx/latest/main/Dockerfile b/linux/ecosystem/nginx/latest/main/Dockerfile
index 013b2758c..3129bade0 100644
--- a/linux/ecosystem/nginx/latest/main/Dockerfile
+++ b/linux/ecosystem/nginx/latest/main/Dockerfile
@@ -193,7 +193,7 @@ RUN cd ${NGINX_SRC_DIR} && \
 ##################################################################
 ##################################################################
 
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/nginx/latest/quic/Dockerfile.experimental b/linux/ecosystem/nginx/latest/quic/Dockerfile.experimental
index da1919e7c..42a901013 100644
--- a/linux/ecosystem/nginx/latest/quic/Dockerfile.experimental
+++ b/linux/ecosystem/nginx/latest/quic/Dockerfile.experimental
@@ -271,7 +271,7 @@ RUN cd ${NGINX_SRC_DIR} && \
 ##################################################################
 ##################################################################
 
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/nodejs/current/Dockerfile b/linux/ecosystem/nodejs/current/Dockerfile
index 08fc9cc59..293acc4b5 100644
--- a/linux/ecosystem/nodejs/current/Dockerfile
+++ b/linux/ecosystem/nodejs/current/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge:latest
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/nodejs/lts/Dockerfile b/linux/ecosystem/nodejs/lts/Dockerfile
index 46ef6fe44..bfea23279 100644
--- a/linux/ecosystem/nodejs/lts/Dockerfile
+++ b/linux/ecosystem/nodejs/lts/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge:latest
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/nodejs/node12/Dockerfile b/linux/ecosystem/nodejs/node12/Dockerfile
index 0eddf099d..98729b06f 100644
--- a/linux/ecosystem/nodejs/node12/Dockerfile
+++ b/linux/ecosystem/nodejs/node12/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge:latest
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/nodejs/node14/Dockerfile b/linux/ecosystem/nodejs/node14/Dockerfile
index 260d9e967..1371051ea 100644
--- a/linux/ecosystem/nodejs/node14/Dockerfile
+++ b/linux/ecosystem/nodejs/node14/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge:latest
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/nodejs/node15/Dockerfile b/linux/ecosystem/nodejs/node15/Dockerfile
index 3d1770e52..7aa8838ad 100644
--- a/linux/ecosystem/nodejs/node15/Dockerfile
+++ b/linux/ecosystem/nodejs/node15/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge:latest
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/nodejs/node16/Dockerfile b/linux/ecosystem/nodejs/node16/Dockerfile
index a186e4a8b..71f5a3da2 100644
--- a/linux/ecosystem/nodejs/node16/Dockerfile
+++ b/linux/ecosystem/nodejs/node16/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge:latest
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/nodejs/node17/Dockerfile b/linux/ecosystem/nodejs/node17/Dockerfile
index d37d7bdc2..ca5007bf9 100644
--- a/linux/ecosystem/nodejs/node17/Dockerfile
+++ b/linux/ecosystem/nodejs/node17/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge:latest
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/nodejs/node18/Dockerfile b/linux/ecosystem/nodejs/node18/Dockerfile
new file mode 100644
index 000000000..46a11537a
--- /dev/null
+++ b/linux/ecosystem/nodejs/node18/Dockerfile
@@ -0,0 +1,34 @@
+FROM epicmorg/debian:bullseye
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   Node.js 18.x
+##################################################################
+RUN groupadd node && \
+    useradd --gid node --shell /bin/bash --create-home node
+
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - && \
+    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \
+    echo "deb https://nightly.yarnpkg.com/debian/ nightly main" > /etc/apt/sources.list.d/yarn.list && \
+    apt-get update && \
+    apt-get install -y nodejs yarn
+
+#   curl -L https://www.npmjs.com/install.sh | sh
+#   npm install -g npm
+
+RUN echo "=============================================" && \
+    echo node $(node --version) && \
+    echo npm $(npm --version) && \
+    echo yarn $(yarn --version) && \
+    echo "============================================="
+
+##################################################################
+#                   cleaninig up
+##################################################################
+RUN apt clean -y && \
+    apt-get clean all && \
+    apt autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb && \
+    rm -rfv /tmp/*
\ No newline at end of file
diff --git a/linux/ecosystem/nodejs/node18/Makefile b/linux/ecosystem/nodejs/node18/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/ecosystem/nodejs/node18/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+	make build
+	make deploy
+	make clean
+
+build:
+	docker-compose build --compress --parallel
+
+deploy:
+	docker-compose push
+
+clean:
+	docker container prune -f
+	docker image prune -f
+	docker network prune -f
+	docker volume prune -f
+	docker system prune -af
diff --git a/linux/ecosystem/nodejs/node18/README.md b/linux/ecosystem/nodejs/node18/README.md
new file mode 100644
index 000000000..b53fe01e8
--- /dev/null
+++ b/linux/ecosystem/nodejs/node18/README.md
@@ -0,0 +1,93 @@
+## TeamCity Minimal Build Agent
+
+[<img src="http://jb.gg/badges/official.svg" height="20"/>](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
+
+This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image.
+
+<img src="https://raw.githubusercontent.com/JetBrains/teamcity-docker-images/master/logo/GitHub.png" height="20" align="center"/> More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md).
+
+The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes.
+You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server.
+
+This minimal image adds just a  TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent/).
+
+## How to Use This Image
+
+Pull the TeamCity minimal image from the Docker Hub Repository:
+
+```
+jetbrains/teamcity-minimal-agent
+``` 
+&nbsp;
+and use the following command to start a container with TeamCity agent running inside 
+a Linux container:
+
+```
+docker run -it -e SERVER_URL="<url to TeamCity server>"  \ 
+    -v <path to agent config folder>:/data/teamcity_agent/conf  \      
+    jetbrains/teamcity-minimal-agent
+```
+&nbsp;
+or a Windows container:
+```
+docker run -it -e SERVER_URL="<url to TeamCity server>" 
+    -v <path to agent config folder>:C:/BuildAgent/conf      
+    jetbrains/teamcity-minimal-agent
+```
+where `<url to TeamCity server>` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container.
+`<path to agent config folder>` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create.
+    
+Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases.
+
+When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html).
+
+All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved.
+
+TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server.
+
+### Agent Image Environment Variables
+
+- **SERVER_URL** - URL of the TeamCity server agent will connect to
+- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted
+- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI.
+- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected  
+- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default  
+
+### Windows Containers Limitations
+
+The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers).
+ 
+## Customization
+
+You can customize the image via the usual Docker procedure:
+
+1. Run the image
+```
+docker run -it -e SERVER_URL="<url to TeamCity server>"  \ 
+    -v <path to agent config folder>:/data/teamcity_agent/conf  \
+    --name="my-customized-agent"  \
+    jetbrains/teamcity-minimal-agent  \
+```
+2. Enter the container 
+```
+docker exec -it my-customized-agent bash
+```
+
+3. Change whatever you need
+4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container
+```
+docker commit my-customized-agent <the registry where you what to store the image>
+```
+
+## License
+
+The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html).
+TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html).
+
+## Feedback
+
+Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW).
+
+## Other TeamCity Images
+* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/)
+* [Build Agent](https://hub.docker.com/r/jetbrains/teamcity-agent/)
diff --git a/linux/ecosystem/nodejs/node18/docker-compose.yml b/linux/ecosystem/nodejs/node18/docker-compose.yml
new file mode 100644
index 000000000..4ace7efff
--- /dev/null
+++ b/linux/ecosystem/nodejs/node18/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/nodejs:node18"
+    build:
+      context: .
diff --git a/linux/ecosystem/php/latest/Dockerfile b/linux/ecosystem/php/latest/Dockerfile
index 0b85b466e..08a6919f9 100644
--- a/linux/ecosystem/php/latest/Dockerfile
+++ b/linux/ecosystem/php/latest/Dockerfile
@@ -79,7 +79,7 @@ RUN pecl install smbclient && \
 ##################################################################
 ##################################################################
 
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/php/php7.4/Dockerfile b/linux/ecosystem/php/php7.4/Dockerfile
index 0b85b466e..08a6919f9 100644
--- a/linux/ecosystem/php/php7.4/Dockerfile
+++ b/linux/ecosystem/php/php7.4/Dockerfile
@@ -79,7 +79,7 @@ RUN pecl install smbclient && \
 ##################################################################
 ##################################################################
 
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/php/php8.0/Dockerfile b/linux/ecosystem/php/php8.0/Dockerfile
index 1c1d2c467..86d03151f 100644
--- a/linux/ecosystem/php/php8.0/Dockerfile
+++ b/linux/ecosystem/php/php8.0/Dockerfile
@@ -84,7 +84,7 @@ RUN pecl install smbclient && \
 ##################################################################
 ##################################################################
 
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/php/php8.1-p4-not-ready/Dockerfile b/linux/ecosystem/php/php8.1-p4-not-ready/Dockerfile
index 76fc73fcc..a15c60d9b 100644
--- a/linux/ecosystem/php/php8.1-p4-not-ready/Dockerfile
+++ b/linux/ecosystem/php/php8.1-p4-not-ready/Dockerfile
@@ -84,7 +84,7 @@ RUN pecl install smbclient && \
 ##################################################################
 ##################################################################
 
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/postgres/10/Dockerfile b/linux/ecosystem/postgres/10/Dockerfile
index 44cf44e99..766aba8d6 100644
--- a/linux/ecosystem/postgres/10/Dockerfile
+++ b/linux/ecosystem/postgres/10/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/postgres/11/Dockerfile b/linux/ecosystem/postgres/11/Dockerfile
index eac98e7cb..dc650590e 100644
--- a/linux/ecosystem/postgres/11/Dockerfile
+++ b/linux/ecosystem/postgres/11/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/postgres/12/Dockerfile b/linux/ecosystem/postgres/12/Dockerfile
index ca0a6c795..e8fb6c9ad 100644
--- a/linux/ecosystem/postgres/12/Dockerfile
+++ b/linux/ecosystem/postgres/12/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/postgres/13/Dockerfile b/linux/ecosystem/postgres/13/Dockerfile
index 0b551b1cd..fc82b7532 100644
--- a/linux/ecosystem/postgres/13/Dockerfile
+++ b/linux/ecosystem/postgres/13/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/postgres/14/Dockerfile b/linux/ecosystem/postgres/14/Dockerfile
index bdc6505ec..374cee24f 100644
--- a/linux/ecosystem/postgres/14/Dockerfile
+++ b/linux/ecosystem/postgres/14/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/postgres/8.2/Dockerfile b/linux/ecosystem/postgres/8.2/Dockerfile
index 6db85baaf..12d729678 100644
--- a/linux/ecosystem/postgres/8.2/Dockerfile
+++ b/linux/ecosystem/postgres/8.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/postgres/8.3/Dockerfile b/linux/ecosystem/postgres/8.3/Dockerfile
index 3832f41d1..f33c59f41 100644
--- a/linux/ecosystem/postgres/8.3/Dockerfile
+++ b/linux/ecosystem/postgres/8.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/postgres/8.4/Dockerfile b/linux/ecosystem/postgres/8.4/Dockerfile
index 85d64923a..8c360a073 100644
--- a/linux/ecosystem/postgres/8.4/Dockerfile
+++ b/linux/ecosystem/postgres/8.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/postgres/9.0/Dockerfile b/linux/ecosystem/postgres/9.0/Dockerfile
index 266be74ce..563e7d560 100644
--- a/linux/ecosystem/postgres/9.0/Dockerfile
+++ b/linux/ecosystem/postgres/9.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/postgres/9.1/Dockerfile b/linux/ecosystem/postgres/9.1/Dockerfile
index d950f3407..500f18ddd 100644
--- a/linux/ecosystem/postgres/9.1/Dockerfile
+++ b/linux/ecosystem/postgres/9.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/postgres/9.2/Dockerfile b/linux/ecosystem/postgres/9.2/Dockerfile
index 88327769d..2e8fde15d 100644
--- a/linux/ecosystem/postgres/9.2/Dockerfile
+++ b/linux/ecosystem/postgres/9.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/postgres/9.3/Dockerfile b/linux/ecosystem/postgres/9.3/Dockerfile
index 82076ba70..f6ca82e52 100644
--- a/linux/ecosystem/postgres/9.3/Dockerfile
+++ b/linux/ecosystem/postgres/9.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/postgres/9.4/Dockerfile b/linux/ecosystem/postgres/9.4/Dockerfile
index f86ecbfda..61faed099 100644
--- a/linux/ecosystem/postgres/9.4/Dockerfile
+++ b/linux/ecosystem/postgres/9.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/postgres/9.5/Dockerfile b/linux/ecosystem/postgres/9.5/Dockerfile
index 54c245186..e57c1d688 100644
--- a/linux/ecosystem/postgres/9.5/Dockerfile
+++ b/linux/ecosystem/postgres/9.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/postgres/9.6/Dockerfile b/linux/ecosystem/postgres/9.6/Dockerfile
index 990da2708..7ba133b0a 100644
--- a/linux/ecosystem/postgres/9.6/Dockerfile
+++ b/linux/ecosystem/postgres/9.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/postgres/latest/Dockerfile b/linux/ecosystem/postgres/latest/Dockerfile
index bdc6505ec..374cee24f 100644
--- a/linux/ecosystem/postgres/latest/Dockerfile
+++ b/linux/ecosystem/postgres/latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/qbittorrent/latest/Dockerfile b/linux/ecosystem/qbittorrent/latest/Dockerfile
index 4b65b463f..fa1858165 100644
--- a/linux/ecosystem/qbittorrent/latest/Dockerfile
+++ b/linux/ecosystem/qbittorrent/latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/qbittorrent/stable/Dockerfile b/linux/ecosystem/qbittorrent/stable/Dockerfile
index 21e60accd..0d451e1f2 100644
--- a/linux/ecosystem/qbittorrent/stable/Dockerfile
+++ b/linux/ecosystem/qbittorrent/stable/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/teamcity/agent/latest/Dockerfile b/linux/ecosystem/teamcity/agent/latest/Dockerfile
index 2649f02f4..556790f3e 100644
--- a/linux/ecosystem/teamcity/agent/latest/Dockerfile
+++ b/linux/ecosystem/teamcity/agent/latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/devel:jdk11
+FROM epicmorg/debian:bullseye-develop-jdk11
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/linux/ecosystem/teamcity/agent/node18/Dockerfile b/linux/ecosystem/teamcity/agent/node18/Dockerfile
new file mode 100644
index 000000000..4cef52975
--- /dev/null
+++ b/linux/ecosystem/teamcity/agent/node18/Dockerfile
@@ -0,0 +1,38 @@
+FROM epicmorg/teamcity-agent:latest
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   Node.js 18.x
+##################################################################
+RUN groupadd node && \
+    useradd --gid node --shell /bin/bash --create-home node
+
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - && \
+    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \
+    echo "deb https://nightly.yarnpkg.com/debian/ nightly main" > /etc/apt/sources.list.d/yarn.list && \
+    apt-get update && \
+    apt-get install -y nodejs yarn
+
+#   curl -L https://www.npmjs.com/install.sh | sh
+#   npm install -g npm
+
+RUN echo "=============================================" && \
+    echo node $(node --version) && \
+    echo npm $(npm --version) && \
+    echo yarn $(yarn --version) && \
+    echo "============================================="
+
+##################################################################
+#                   cleaninig up
+##################################################################
+RUN apt clean -y && \
+    apt-get clean all && \
+    apt autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb && \
+    rm -rfv /tmp/deb/* && \
+    rm -rfv /tmp/composer-setup.php && \
+    rm -rfv /tmp/amxx_base_latest.tar.gz && \
+    rm -rfv /tmp/atlassian-plugin-sdk.deb && \
+    rm -rfv /tmp/addons
diff --git a/linux/ecosystem/teamcity/agent/node18/Makefile b/linux/ecosystem/teamcity/agent/node18/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/ecosystem/teamcity/agent/node18/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+	make build
+	make deploy
+	make clean
+
+build:
+	docker-compose build --compress --parallel
+
+deploy:
+	docker-compose push
+
+clean:
+	docker container prune -f
+	docker image prune -f
+	docker network prune -f
+	docker volume prune -f
+	docker system prune -af
diff --git a/linux/ecosystem/teamcity/agent/node18/README.md b/linux/ecosystem/teamcity/agent/node18/README.md
new file mode 100644
index 000000000..b53fe01e8
--- /dev/null
+++ b/linux/ecosystem/teamcity/agent/node18/README.md
@@ -0,0 +1,93 @@
+## TeamCity Minimal Build Agent
+
+[<img src="http://jb.gg/badges/official.svg" height="20"/>](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
+
+This is an official [JetBrains TeamCity](https://www.jetbrains.com/teamcity/) minimal build agent image.
+
+<img src="https://raw.githubusercontent.com/JetBrains/teamcity-docker-images/master/logo/GitHub.png" height="20" align="center"/> More details about tags and components are [here](https://github.com/JetBrains/teamcity-docker-images/blob/master/generated/teamcity-minimal-agent.md).
+
+The [TeamCity build agent](https://www.jetbrains.com/help/teamcity/build-agent.html) connects to the TeamCity server and spawns the actual build processes.
+You can use the ```jetbrains/teamcity-server``` image to run a TeamCity server.
+
+This minimal image adds just a  TeamCity agent without any tools like VCS clients, etc. It is suitable for simple builds and can serve as a base for your custom images. For Java or .NET development we recommend using the default build agent image [jetbrains/teamcity-agent](https://hub.docker.com/r/jetbrains/teamcity-agent/).
+
+## How to Use This Image
+
+Pull the TeamCity minimal image from the Docker Hub Repository:
+
+```
+jetbrains/teamcity-minimal-agent
+``` 
+&nbsp;
+and use the following command to start a container with TeamCity agent running inside 
+a Linux container:
+
+```
+docker run -it -e SERVER_URL="<url to TeamCity server>"  \ 
+    -v <path to agent config folder>:/data/teamcity_agent/conf  \      
+    jetbrains/teamcity-minimal-agent
+```
+&nbsp;
+or a Windows container:
+```
+docker run -it -e SERVER_URL="<url to TeamCity server>" 
+    -v <path to agent config folder>:C:/BuildAgent/conf      
+    jetbrains/teamcity-minimal-agent
+```
+where `<url to TeamCity server>` is the full URL for TeamCity server, accessible by the agent. Note that `localhost` will not generally not work as it will refer to the `localhost` inside the container.
+`<path to agent config folder>` is the host machine directory to serve as the TeamCity agent config directory. We recommend providing this binding in order to persist the agent configuration, e.g. authorization on the server. Note that you should map a different folder for every new agent you create.
+    
+Since version 2020.1, TeamCity agent Docker images __run under a non-root user__. Refer to our [upgrade notes](https://www.jetbrains.com/help/teamcity/upgrade-notes.html#UpgradeNotes-AgentDockerimagesrunundernon-rootuser) for information on possible affected use cases.
+
+When you run the agent for the first time, you should authorize it via the TeamCity server UI: go to the **Unauthorized Agents** page in your browser. See [more details](https://www.jetbrains.com/help/teamcity/build-agent.html).
+
+All information about agent authorization is stored in agent's configuration folder. If you stop the container with the agent and then start a new one with the same config folder, the agent's name and authorization state will be preserved.
+
+TeamCity agent does not need manual upgrade: it will upgrade itself automatically on connecting to an upgraded server.
+
+### Agent Image Environment Variables
+
+- **SERVER_URL** - URL of the TeamCity server agent will connect to
+- **AGENT_NAME** - (optional) Name of the agent in TeamCity UI, autogenerated if omitted
+- **AGENT_TOKEN** - (optional) Agent authorization token, if unset, the agent should be [authorized](https://www.jetbrains.com/help/teamcity/build-agent.html#BuildAgent-BuildAgentStatus) via TeamCity UI.
+- **OWN_ADDRESS** - (optional, linux only) IP address build agent binds to, autodetected  
+- **OWN_PORT** - (optional, linux only) Port build agent binds to, 9090 by default  
+
+### Windows Containers Limitations
+
+The details on the known problems in Windows containers are available in the [TeamCity documentation](https://www.jetbrains.com/help/teamcity/known-issues.html#KnownIssues-WindowsDockerContainers).
+ 
+## Customization
+
+You can customize the image via the usual Docker procedure:
+
+1. Run the image
+```
+docker run -it -e SERVER_URL="<url to TeamCity server>"  \ 
+    -v <path to agent config folder>:/data/teamcity_agent/conf  \
+    --name="my-customized-agent"  \
+    jetbrains/teamcity-minimal-agent  \
+```
+2. Enter the container 
+```
+docker exec -it my-customized-agent bash
+```
+
+3. Change whatever you need
+4. Exit and [create a new image](https://docs.docker.com/engine/reference/commandline/commit/) from the container
+```
+docker commit my-customized-agent <the registry where you what to store the image>
+```
+
+## License
+
+The image is available under the [TeamCity license](https://www.jetbrains.com/teamcity/buy/license.html).
+TeamCity is free for perpetual use with the limitation of 100 build configurations (jobs) and 3 agents. [Licensing details](https://www.jetbrains.com/help/teamcity/licensing-policy.html).
+
+## Feedback
+
+Report issues of suggestions to the official TeamCity [issue tracker](https://youtrack.jetbrains.com/issues/TW).
+
+## Other TeamCity Images
+* [TeamCity Server](https://hub.docker.com/r/jetbrains/teamcity-server/)
+* [Build Agent](https://hub.docker.com/r/jetbrains/teamcity-agent/)
diff --git a/linux/ecosystem/teamcity/agent/node18/docker-compose.yml b/linux/ecosystem/teamcity/agent/node18/docker-compose.yml
new file mode 100644
index 000000000..ccb342e8a
--- /dev/null
+++ b/linux/ecosystem/teamcity/agent/node18/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/teamcity-agent:node18"
+    build:
+      context: .
diff --git a/linux/ecosystem/torrserver/Dockerfile b/linux/ecosystem/torrserver/Dockerfile
index 6c0e398aa..bf6ded8b0 100644
--- a/linux/ecosystem/torrserver/Dockerfile
+++ b/linux/ecosystem/torrserver/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/debian:bullseye
 
 #ARG TORRSERVER_LINK=https://releases.yourok.ru/torr/server/TorrServer-linux-amd64
 ARG TORRSERVER_LINK=https://github.com/YouROK/TorrServer/releases/latest/download/TorrServer-linux-amd64