diff --git a/linux/ecosystem/atlassian/jira/8/8.16.1/Makefile b/linux/ecosystem/atlassian/jira/8/8.16.1/Makefile
index 82c5a2de6..bad6d73b5 100644
--- a/linux/ecosystem/atlassian/jira/8/8.16.1/Makefile
+++ b/linux/ecosystem/atlassian/jira/8/8.16.1/Makefile
@@ -1,5 +1,19 @@
 all: app
 
 app:
-	docker-compose build --compress
+	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/atlassian/jira/8/8.16.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.16.1/docker-compose.yml
index 0f7a373af..81592d775 100644
--- a/linux/ecosystem/atlassian/jira/8/8.16.1/docker-compose.yml
+++ b/linux/ecosystem/atlassian/jira/8/8.16.1/docker-compose.yml
@@ -14,4 +14,4 @@ services:
       dockerfile: Dockerfile.jdk11
       args:
         RELEASE: ${RELEASE}
-        DOWNLOAD_URL: ${DOWNLOAD_URL}
\ No newline at end of file
+        DOWNLOAD_URL: ${DOWNLOAD_URL}
diff --git a/linux/ecosystem/atlassian/jira/8/8.20.1/.env b/linux/ecosystem/atlassian/jira/8/8.20.1/.env
new file mode 100644
index 000000000..7d0890948
--- /dev/null
+++ b/linux/ecosystem/atlassian/jira/8/8.20.1/.env
@@ -0,0 +1,3 @@
+
+RELEASE=8.20.1
+DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-8.20.1.tar.gz
diff --git a/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile b/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile
new file mode 100644
index 000000000..eeec7c1d8
--- /dev/null
+++ b/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile
@@ -0,0 +1,49 @@
+FROM epicmorg/prod:jdk8
+LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   ARGuments
+##################################################################
+
+#configured by dockerfile / .ENV
+ARG RELEASE
+ARG DOWNLOAD_URL
+
+
+##################################################################
+#                   Setup
+##################################################################
+ENV RUN_USER            daemon
+ENV RUN_GROUP           daemon
+
+# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files
+ENV JIRA_HOME          /var/atlassian/application-data/jira
+ENV JIRA_INSTALL_DIR   /opt/atlassian/jira
+
+VOLUME ["${JIRA_HOME}"]
+WORKDIR $JIRA_HOME
+
+# Expose HTTP port
+EXPOSE 8080
+
+##################################################################
+#                   Installing
+##################################################################
+RUN mkdir -p                             ${JIRA_INSTALL_DIR} \
+    && curl -L                           ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \
+    && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \
+    && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \
+    && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \
+    && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \
+    && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \
+    update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
+    apt clean -y && \
+    apt autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
+
+CMD ["/entrypoint.sh", "-fg"]
+ENTRYPOINT ["/usr/bin/tini", "--"]
+COPY entrypoint.sh              /entrypoint.sh
+COPY . /tmp
diff --git a/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile.jdk11 b/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile.jdk11
new file mode 100644
index 000000000..a98a20e49
--- /dev/null
+++ b/linux/ecosystem/atlassian/jira/8/8.20.1/Dockerfile.jdk11
@@ -0,0 +1,49 @@
+FROM epicmorg/prod:jdk11
+LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   ARGuments
+##################################################################
+
+#configured by dockerfile / .ENV
+ARG RELEASE
+ARG DOWNLOAD_URL
+
+
+##################################################################
+#                   Setup
+##################################################################
+ENV RUN_USER            daemon
+ENV RUN_GROUP           daemon
+
+# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files
+ENV JIRA_HOME          /var/atlassian/application-data/jira
+ENV JIRA_INSTALL_DIR   /opt/atlassian/jira
+
+VOLUME ["${JIRA_HOME}"]
+WORKDIR $JIRA_HOME
+
+# Expose HTTP port
+EXPOSE 8080
+
+##################################################################
+#                   Installing
+##################################################################
+RUN mkdir -p                             ${JIRA_INSTALL_DIR} \
+    && curl -L                           ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \
+    && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \
+    && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \
+    && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \
+    && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \
+    && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \
+    update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
+    apt clean -y && \
+    apt autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
+
+CMD ["/entrypoint.sh", "-fg"]
+ENTRYPOINT ["/usr/bin/tini", "--"]
+COPY entrypoint.sh              /entrypoint.sh
+COPY . /tmp
diff --git a/linux/ecosystem/atlassian/jira/8/8.20.1/Makefile b/linux/ecosystem/atlassian/jira/8/8.20.1/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/ecosystem/atlassian/jira/8/8.20.1/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/atlassian/jira/8/8.20.1/docker-compose.yml b/linux/ecosystem/atlassian/jira/8/8.20.1/docker-compose.yml
new file mode 100644
index 000000000..81592d775
--- /dev/null
+++ b/linux/ecosystem/atlassian/jira/8/8.20.1/docker-compose.yml
@@ -0,0 +1,17 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/jira:${RELEASE}"
+    build:
+      context: .
+      args:
+        RELEASE: ${RELEASE}
+        DOWNLOAD_URL: ${DOWNLOAD_URL}
+  app-jdk11:
+    image: "epicmorg/jira:${RELEASE}-jdk11"
+    build:
+      context: .
+      dockerfile: Dockerfile.jdk11
+      args:
+        RELEASE: ${RELEASE}
+        DOWNLOAD_URL: ${DOWNLOAD_URL}
diff --git a/linux/ecosystem/atlassian/jira/8/8.20.1/entrypoint.sh b/linux/ecosystem/atlassian/jira/8/8.20.1/entrypoint.sh
new file mode 100644
index 000000000..50ee4ecd1
--- /dev/null
+++ b/linux/ecosystem/atlassian/jira/8/8.20.1/entrypoint.sh
@@ -0,0 +1,89 @@
+#!/bin/bash
+set -euo pipefail
+
+export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::")
+export JRE_HOME="$JAVA_HOME/jre"
+export JAVA_BINARY="$JRE_HOME/bin/java"
+export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}')
+
+# Setup Catalina Opts
+: ${CATALINA_CONNECTOR_PROXYNAME:=}
+: ${CATALINA_CONNECTOR_PROXYPORT:=}
+: ${CATALINA_CONNECTOR_SCHEME:=http}
+: ${CATALINA_CONNECTOR_SECURE:=false}
+
+: ${CATALINA_OPTS:=}
+
+: ${JAVA_OPTS:=}
+
+CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}"
+CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}"
+CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}"
+CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}"
+
+export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}"
+
+# Setup Data Center configuration
+if [ ! -f "/etc/container_id" ]; then
+  uuidgen > /etc/container_id
+fi
+CONTAINER_ID=$(cat /etc/container_id)
+CONTAINER_SHORT_ID=${CONTAINER_ID::8}
+
+: ${CLUSTERED:=false}
+: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}}
+: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared}
+: ${EHCACHE_PEER_DISCOVERY:=}
+: ${EHCACHE_LISTENER_HOSTNAME:=}
+: ${EHCACHE_LISTENER_PORT:=}
+: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=}
+: ${EHCACHE_MULTICAST_ADDRESS:=}
+: ${EHCACHE_MULTICAST_PORT:=}
+: ${EHCACHE_MULTICAST_TIMETOLIVE:=}
+: ${EHCACHE_MULTICAST_HOSTNAME:=}
+
+# Cleanly set/unset values in cluster.properties
+function set_cluster_property {
+    if [ -z $2 ]; then
+        if [ -f "${JIRA_HOME}/cluster.properties" ]; then
+            sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties"
+        fi
+        return
+    fi
+    if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then
+        echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties"
+    elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then
+        sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties"
+    else
+        echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties"
+    fi
+}
+
+if [ "${CLUSTERED}" == "true" ]; then
+    set_cluster_property "jira.node.id" "${JIRA_NODE_ID}"
+    set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}"
+    set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}"
+    set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}"
+    set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}"
+    set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}"
+    set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}"
+    set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}"
+    set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}"
+    set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}"
+fi
+
+
+# Start Jira as the correct user
+if [ "${UID}" -eq 0 ]; then
+    echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}"
+    PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}")
+    EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700
+    if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then
+        chmod -R 700 "${JIRA_HOME}" &&
+            chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}"
+    fi
+    # Now drop privileges
+    exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@"
+else
+    exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@"
+fi