diff --git a/.github/workflows/epicmorg.base.images.current.debian12.yml.disabled b/.github/workflows/epicmorg.base.images.current.debian12.yml
similarity index 100%
rename from .github/workflows/epicmorg.base.images.current.debian12.yml.disabled
rename to .github/workflows/epicmorg.base.images.current.debian12.yml
diff --git a/Makefile b/Makefile
index fa102bec1..6e57b2d1f 100644
--- a/Makefile
+++ b/Makefile
@@ -726,58 +726,7 @@ ecosystem-perforce-proxy-images:
 	cd `pwd`/linuxecosystem/perforce/p4p/r21.2    && pwd && make build && make deploy
 	cd `pwd`/linuxecosystem/perforce/p4p/r22.1    && pwd && make build && make deploy
 
-bundle-base-images:
-	@echo "======================================="
-	@echo "===== Building  EpicMorg   images ====="
-	@echo "======================================="
-	make advanced-pyhton-images
-	make ecosystem-debian-images
-
-bundle-teamcity:
-	@echo "======================================="
-	@echo "===== Building  TeamCity   images ====="
-	@echo "======================================="
-	make advanced-teamcity-server-images
-
-bundle-gitlab:
-	@echo "======================================="
-	@echo "===== Building  GitLab     images ====="
-	@echo "======================================="
-	make ecosystem-gitlab-runner-images
-
-bundle-atlassian:
-	@echo "======================================="
-	@echo "===== Building  Atlassian  images ====="
-	@echo "======================================="
-	cd `pwd`/linux/ecosystem/atlassian/bitbucket/latest           && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/atlassian/confluence/latest          && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/atlassian/crowd/latest               && pwd && make build && make deploy
-#	cd `pwd`/linux/ecosystem/atlassian/crucible/latest            && pwd && make build && make deploy
-#	cd `pwd`/linux/ecosystem/atlassian/fisheye/latest             && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/atlassian/fisheye-crucible/latest    && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/atlassian/jira/latest                && pwd && make build && make deploy
-#
-	cd `pwd`/linux/ecosystem/atlassian/bitbucket/8/8.12.0           && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/atlassian/confluence/8/8.4.0          && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/atlassian/jira/9/9.10.0                && pwd && make build && make deploy
-
-
-bundle-web:
-	@echo "======================================="
-	@echo "=====   Building    web    images ====="
-	@echo "======================================="
-	make ecosystem-php-images
-	make ecosystem-apache2-images
-	make ecosystem-nginx-images
-	
-bundle-p4:
-	@echo "======================================="
-	@echo "=====   Building    p4    images ====="
-	@echo "======================================="
-	make ecosystem-perforce-base-images
-	make ecosystem-perforce-proxy-images
-
-atlassian-jira-all-images:
+ecosystem-jira-4-images:
 	cd `pwd`/linux/ecosystem/atlassian/jira/4/4.1.1                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/4/4.1.2                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/4/4.2                && pwd && make build && make deploy
@@ -796,8 +745,7 @@ atlassian-jira-all-images:
 	cd `pwd`/linux/ecosystem/atlassian/jira/4/4.4.4                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/4/4.4.5                && pwd && make build && make deploy
 
-	make docker-clean
-
+ecosystem-jira-5-images:
 	cd `pwd`/linux/ecosystem/atlassian/jira/5/5.0                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/5/5.0.1                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/5/5.0.2                && pwd && make build && make deploy
@@ -829,8 +777,7 @@ atlassian-jira-all-images:
 	cd `pwd`/linux/ecosystem/atlassian/jira/5/5.2.8                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/5/5.2.9                && pwd && make build && make deploy
 
-	make docker-clean
-
+ecosystem-jira-6-images:
 	cd `pwd`/linux/ecosystem/atlassian/jira/6/6.0                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/6/6.0.1                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/6/6.0.2                && pwd && make build && make deploy
@@ -889,8 +836,7 @@ atlassian-jira-all-images:
 	cd `pwd`/linux/ecosystem/atlassian/jira/6/6.4.13                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/6/6.4.14                && pwd && make build && make deploy
 
-	make docker-clean
-
+ecosystem-jira-7-images:
 	cd `pwd`/linux/ecosystem/atlassian/jira/7/7.0.0                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/7/7.0.2                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/7/7.0.4                && pwd && make build && make deploy
@@ -943,9 +889,6 @@ atlassian-jira-all-images:
 	cd `pwd`/linux/ecosystem/atlassian/jira/7/7.5.2                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/7/7.5.3                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/7/7.5.4                && pwd && make build && make deploy
-
-	make docker-clean
-
 	cd `pwd`/linux/ecosystem/atlassian/jira/7/7.6.0                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/7/7.6.1                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/7/7.6.2                && pwd && make build && make deploy
@@ -1000,8 +943,7 @@ atlassian-jira-all-images:
 	cd `pwd`/linux/ecosystem/atlassian/jira/7/7.13.17                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/7/7.13.18                && pwd && make build && make deploy
 
-	make docker-clean
-
+ecosystem-jira-8-images:
 	cd `pwd`/linux/ecosystem/atlassian/jira/8/8.0.0                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/8/8.0.2                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/8/8.0.3                && pwd && make build && make deploy
@@ -1036,9 +978,6 @@ atlassian-jira-all-images:
 	cd `pwd`/linux/ecosystem/atlassian/jira/8/8.5.7                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/8/8.5.8                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/8/8.5.9                && pwd && make build && make deploy
-
-	make docker-clean
-
 	cd `pwd`/linux/ecosystem/atlassian/jira/8/8.5.10                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/8/8.5.11                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/8/8.5.12                && pwd && make build && make deploy
@@ -1092,9 +1031,6 @@ atlassian-jira-all-images:
 	cd `pwd`/linux/ecosystem/atlassian/jira/8/8.13.25                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/8/8.13.26                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/8/8.13.27                && pwd && make build && make deploy
-
-	make docker-clean
-
 	cd `pwd`/linux/ecosystem/atlassian/jira/8/8.14.0                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/8/8.14.1                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/8/8.15.0                && pwd && make build && make deploy
@@ -1141,8 +1077,7 @@ atlassian-jira-all-images:
 	cd `pwd`/linux/ecosystem/atlassian/jira/8/8.22.4                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/8/8.22.6                && pwd && make build && make deploy
 
-	make docker-clean
-
+ecosystem-jira-9-images:
 	cd `pwd`/linux/ecosystem/atlassian/jira/9/9.0.0                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/9/9.1.0                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/9/9.1.1                && pwd && make build && make deploy
@@ -1171,3 +1106,67 @@ atlassian-jira-all-images:
 	cd `pwd`/linux/ecosystem/atlassian/jira/9/9.9.0                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/9/9.9.1                && pwd && make build && make deploy
 	cd `pwd`/linux/ecosystem/atlassian/jira/9/9.10.0                && pwd && make build && make deploy
+
+bundle-base-images:
+	@echo "======================================="
+	@echo "===== Building  EpicMorg   images ====="
+	@echo "======================================="
+	make advanced-pyhton-images
+	make ecosystem-debian-images
+
+bundle-teamcity:
+	@echo "======================================="
+	@echo "===== Building  TeamCity   images ====="
+	@echo "======================================="
+	make advanced-teamcity-server-images
+
+bundle-gitlab:
+	@echo "======================================="
+	@echo "===== Building  GitLab     images ====="
+	@echo "======================================="
+	make ecosystem-gitlab-runner-images
+
+bundle-jira:
+	@echo "======================================="
+	@echo "===== Building  All Jira  images  ====="
+	@echo "======================================="
+#	make ecosystem-jira-4-images
+	make ecosystem-jira-5-images
+	make ecosystem-jira-6-images
+	make ecosystem-jira-7-images
+	make ecosystem-jira-8-images
+	make ecosystem-jira-9-images
+
+bundle-atlassian-altest:
+	@echo "=============================================="
+	@echo "===== Building  Atlassian Latest images  ====="
+	@echo "=============================================="
+	cd `pwd`/linux/ecosystem/atlassian/bitbucket/latest           && pwd && make build && make deploy
+	cd `pwd`/linux/ecosystem/atlassian/confluence/latest          && pwd && make build && make deploy
+	cd `pwd`/linux/ecosystem/atlassian/crowd/latest               && pwd && make build && make deploy
+	cd `pwd`/linux/ecosystem/atlassian/crucible/latest            && pwd && make build && make deploy
+	cd `pwd`/linux/ecosystem/atlassian/fisheye/latest             && pwd && make build && make deploy
+	cd `pwd`/linux/ecosystem/atlassian/fisheye-crucible/latest    && pwd && make build && make deploy
+	cd `pwd`/linux/ecosystem/atlassian/jira/latest                && pwd && make build && make deploy
+
+bundle-atlassian:
+	@echo "======================================="
+	@echo "===== Building  Atlassian  images ====="
+	@echo "======================================="
+	make bundle-jira
+
+bundle-web:
+	@echo "======================================="
+	@echo "=====   Building    web    images ====="
+	@echo "======================================="
+	make ecosystem-php-images
+	make ecosystem-apache2-images
+	make ecosystem-nginx-images
+	
+bundle-p4:
+	@echo "======================================="
+	@echo "=====   Building    p4    images ====="
+	@echo "======================================="
+	make ecosystem-perforce-base-images
+	make ecosystem-perforce-proxy-images
+ 
\ No newline at end of file
diff --git a/bin/ansible/playbook.yml b/bin/ansible/playbook.yml
index dac6c454e..77ea9eb67 100644
--- a/bin/ansible/playbook.yml
+++ b/bin/ansible/playbook.yml
@@ -18,5 +18,5 @@
   connection: local
   gather_facts: false
   roles:
-    #- atlassian.jira
-    - gurock.testrail
\ No newline at end of file
+    - atlassian.jira
+#    - gurock.testrail
\ No newline at end of file
diff --git a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk11 b/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk11
index 7339da96d..537dfab83 100644
--- a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk11
+++ b/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk11
@@ -30,7 +30,7 @@ EXPOSE 8080
 #                   Installing
 ##################################################################
 RUN mkdir -p                             ${JIRA_INSTALL_DIR} \
-    && curl -L                           ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \
+    && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -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 \
diff --git a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk17 b/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk17
index 7339da96d..537dfab83 100644
--- a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk17
+++ b/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk17
@@ -30,7 +30,7 @@ EXPOSE 8080
 #                   Installing
 ##################################################################
 RUN mkdir -p                             ${JIRA_INSTALL_DIR} \
-    && curl -L                           ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \
+    && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -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 \
diff --git a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk6 b/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk6
index 7a48709f6..ee24fd5f0 100644
--- a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk6
+++ b/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk6
@@ -30,7 +30,7 @@ EXPOSE 8080
 #                   Installing
 ##################################################################
 RUN mkdir -p                             ${JIRA_INSTALL_DIR} \
-    && curl -L                           ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \
+    && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -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 \
diff --git a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk7 b/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk7
index 026ec6f67..4486d41b9 100644
--- a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk7
+++ b/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk7
@@ -30,7 +30,7 @@ EXPOSE 8080
 #                   Installing
 ##################################################################
 RUN mkdir -p                             ${JIRA_INSTALL_DIR} \
-    && curl -L                           ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \
+    && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -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 \
diff --git a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk7-8 b/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk7-8
index 3d4520509..a7fc16081 100644
--- a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk7-8
+++ b/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk7-8
@@ -30,7 +30,7 @@ EXPOSE 8080
 #                   Installing
 ##################################################################
 RUN mkdir -p                             ${JIRA_INSTALL_DIR} \
-    && curl -L                           ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \
+    && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -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 \
diff --git a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk8 b/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk8
index 7eb0d9d6b..2fcdbd250 100644
--- a/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk8
+++ b/bin/ansible/roles/atlassian.jira/files/Dockerfile.jdk8
@@ -30,7 +30,7 @@ EXPOSE 8080
 #                   Installing
 ##################################################################
 RUN mkdir -p                             ${JIRA_INSTALL_DIR} \
-    && curl -L                           ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \
+    && curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -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 \
diff --git a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.4.jdk6.yml.disabled b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.4.jdk6.yml
similarity index 82%
rename from bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.4.jdk6.yml.disabled
rename to bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.4.jdk6.yml
index 2e2022dee..bb59a057d 100644
--- a/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.4.jdk6.yml.disabled
+++ b/bin/ansible/roles/atlassian.jira/tasks/atlassian.jira.4.jdk6.yml
@@ -1,4 +1,4 @@
-# Cant template because each versions have unical link. need to rework
+# Cant template urls because each versions have unical link. need to rework
 
 - name: Read versions from file
   slurp:
@@ -16,11 +16,11 @@
     mode: '0755'
   with_items: "{{ jira_versions }}"
 
-- name: Copy template with link to each version directory
-  template:
-    src: "template.env.j2"
-    dest: "{{ target_directory }}/{{ item }}/.env"
-  with_items: "{{ jira_versions }}"
+#- name: Copy template with link to each version directory
+#  template:
+#    src: "template.env.j2"
+#    dest: "{{ target_directory }}/{{ item }}/.env"
+#  with_items: "{{ jira_versions }}"
 
 - name: Copy docker-compose.yml from 'files' directory to each version directory
   copy:
diff --git a/bin/ansible/roles/atlassian.jira/tasks/main.yml b/bin/ansible/roles/atlassian.jira/tasks/main.yml
index 0cea7ffdd..22f6c83ef 100644
--- a/bin/ansible/roles/atlassian.jira/tasks/main.yml
+++ b/bin/ansible/roles/atlassian.jira/tasks/main.yml
@@ -1,6 +1,6 @@
-# broken
-#- name: "Generate images for Jira 4 (jdk6)"
-#  import_tasks: atlassian.jira.5.jdk6.yml
+# broken envs, generating without it
+- name: "Generate images for Jira 4 (jdk6)"
+  import_tasks: atlassian.jira.5.jdk6.yml
 
 - name: "Generate images for Jira 5.0-5.1 (jdk6)"
   import_tasks: atlassian.jira.5.jdk6.yml
diff --git a/bin/ansible/roles/common/files/versions/jira/7.jdk8p1.txt b/bin/ansible/roles/common/files/versions/jira/7.jdk8p1.txt
index 4d91ac349..3a2893b99 100644
--- a/bin/ansible/roles/common/files/versions/jira/7.jdk8p1.txt
+++ b/bin/ansible/roles/common/files/versions/jira/7.jdk8p1.txt
@@ -3,7 +3,6 @@
 7.0.4
 7.0.5
 7.0.10
-7.0.11
 7.1.0
 7.1.1
 7.1.2
diff --git a/bin/ansible/roles/common/files/versions/jira/7.jdk8p2.txt b/bin/ansible/roles/common/files/versions/jira/7.jdk8p2.txt
index aa66a4063..fbfd3966e 100644
--- a/bin/ansible/roles/common/files/versions/jira/7.jdk8p2.txt
+++ b/bin/ansible/roles/common/files/versions/jira/7.jdk8p2.txt
@@ -1,3 +1,4 @@
+7.0.11
 7.1.9
 7.1.10
 7.2.0
diff --git a/bin/ansible/roles/gurock.testrail/templates/php70/main/Dockerfile.j2 b/bin/ansible/roles/gurock.testrail/templates/php70/main/Dockerfile.j2
index 5e258575f..06bc47cdb 100644
--- a/bin/ansible/roles/gurock.testrail/templates/php70/main/Dockerfile.j2
+++ b/bin/ansible/roles/gurock.testrail/templates/php70/main/Dockerfile.j2
@@ -42,7 +42,7 @@ RUN echo "[testrail] Preparing folders" && \
     mkdir -p ${TR_WWW_PATH} && \
     mkdir -p ${TR_DEFAULT_ATTACHMENT_DIR} ${TR_DEFAULT_REPORT_DIR} ${TR_DEFAULT_AUDIT_DIR} ${TR_DEFAULT_LOG_DIR} && \
     echo "[testrail] Downloading and installing" && \
-    wget --no-check-certificate -O ${TESTRAIL_RELEASE_DIR}/testrail.zip ${DOWNLOAD_URL} && \
+    wget --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --no-check-certificate -O ${TESTRAIL_RELEASE_DIR}/testrail.zip ${DOWNLOAD_URL} && \
     chown -R www-data:www-data ${TESTRAIL_RELEASE_DIR} && \
     unzip -q -o ${TESTRAIL_RELEASE_DIR}/testrail.zip -d /var/www/ && \
     chown -R www-data:www-data ${TR_WWW_PATH} && \
diff --git a/bin/ansible/roles/gurock.testrail/templates/php71/main/Dockerfile.j2 b/bin/ansible/roles/gurock.testrail/templates/php71/main/Dockerfile.j2
index 9e64aa53a..12c689b9d 100644
--- a/bin/ansible/roles/gurock.testrail/templates/php71/main/Dockerfile.j2
+++ b/bin/ansible/roles/gurock.testrail/templates/php71/main/Dockerfile.j2
@@ -42,7 +42,7 @@ RUN echo "[testrail] Preparing folders" && \
     mkdir -p ${TR_WWW_PATH} && \
     mkdir -p ${TR_DEFAULT_ATTACHMENT_DIR} ${TR_DEFAULT_REPORT_DIR} ${TR_DEFAULT_AUDIT_DIR} ${TR_DEFAULT_LOG_DIR} && \
     echo "[testrail] Downloading and installing" && \
-    wget --no-check-certificate -O ${TESTRAIL_RELEASE_DIR}/testrail.zip ${DOWNLOAD_URL} && \
+    wget --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --no-check-certificate -O ${TESTRAIL_RELEASE_DIR}/testrail.zip ${DOWNLOAD_URL} && \
     chown -R www-data:www-data ${TESTRAIL_RELEASE_DIR} && \
     unzip -q -o ${TESTRAIL_RELEASE_DIR}/testrail.zip -d /var/www/ && \
     chown -R www-data:www-data ${TR_WWW_PATH} && \
diff --git a/bin/ansible/roles/gurock.testrail/templates/php72/main/Dockerfile.j2 b/bin/ansible/roles/gurock.testrail/templates/php72/main/Dockerfile.j2
index 19bad950b..34036fe0b 100644
--- a/bin/ansible/roles/gurock.testrail/templates/php72/main/Dockerfile.j2
+++ b/bin/ansible/roles/gurock.testrail/templates/php72/main/Dockerfile.j2
@@ -42,7 +42,7 @@ RUN echo "[testrail] Preparing folders" && \
     mkdir -p ${TR_WWW_PATH} && \
     mkdir -p ${TR_DEFAULT_ATTACHMENT_DIR} ${TR_DEFAULT_REPORT_DIR} ${TR_DEFAULT_AUDIT_DIR} ${TR_DEFAULT_LOG_DIR} && \
     echo "[testrail] Downloading and installing" && \
-    wget --no-check-certificate -O ${TESTRAIL_RELEASE_DIR}/testrail.zip ${DOWNLOAD_URL} && \
+    wget --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --no-check-certificate -O ${TESTRAIL_RELEASE_DIR}/testrail.zip ${DOWNLOAD_URL} && \
     chown -R www-data:www-data ${TESTRAIL_RELEASE_DIR} && \
     unzip -q -o ${TESTRAIL_RELEASE_DIR}/testrail.zip -d /var/www/ && \
     chown -R www-data:www-data ${TR_WWW_PATH} && \
diff --git a/bin/ansible/roles/gurock.testrail/templates/php74/main/Dockerfile.j2 b/bin/ansible/roles/gurock.testrail/templates/php74/main/Dockerfile.j2
index 75d0e4504..a34081549 100644
--- a/bin/ansible/roles/gurock.testrail/templates/php74/main/Dockerfile.j2
+++ b/bin/ansible/roles/gurock.testrail/templates/php74/main/Dockerfile.j2
@@ -42,7 +42,7 @@ RUN echo "[testrail] Preparing folders" && \
     mkdir -p ${TR_WWW_PATH} && \
     mkdir -p ${TR_DEFAULT_ATTACHMENT_DIR} ${TR_DEFAULT_REPORT_DIR} ${TR_DEFAULT_AUDIT_DIR} ${TR_DEFAULT_LOG_DIR} && \
     echo "[testrail] Downloading and installing" && \
-    wget --no-check-certificate -O ${TESTRAIL_RELEASE_DIR}/testrail.zip ${DOWNLOAD_URL} && \
+    wget --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --no-check-certificate -O ${TESTRAIL_RELEASE_DIR}/testrail.zip ${DOWNLOAD_URL} && \
     chown -R www-data:www-data ${TESTRAIL_RELEASE_DIR} && \
     unzip -q -o ${TESTRAIL_RELEASE_DIR}/testrail.zip -d /var/www/ && \
     chown -R www-data:www-data ${TR_WWW_PATH} && \
diff --git a/bin/ansible/roles/gurock.testrail/templates/php81/main/Dockerfile.j2 b/bin/ansible/roles/gurock.testrail/templates/php81/main/Dockerfile.j2
index e67b1ce15..4b00784c4 100644
--- a/bin/ansible/roles/gurock.testrail/templates/php81/main/Dockerfile.j2
+++ b/bin/ansible/roles/gurock.testrail/templates/php81/main/Dockerfile.j2
@@ -42,7 +42,7 @@ RUN echo "[testrail] Preparing folders" && \
     mkdir -p ${TR_WWW_PATH} && \
     mkdir -p ${TR_DEFAULT_ATTACHMENT_DIR} ${TR_DEFAULT_REPORT_DIR} ${TR_DEFAULT_AUDIT_DIR} ${TR_DEFAULT_LOG_DIR} && \
     echo "[testrail] Downloading and installing" && \
-    wget --no-check-certificate -O ${TESTRAIL_RELEASE_DIR}/testrail.zip ${DOWNLOAD_URL} && \
+    wget --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" --no-check-certificate -O ${TESTRAIL_RELEASE_DIR}/testrail.zip ${DOWNLOAD_URL} && \
     chown -R www-data:www-data ${TESTRAIL_RELEASE_DIR} && \
     unzip -q -o ${TESTRAIL_RELEASE_DIR}/testrail.zip -d /var/www/ && \
     chown -R www-data:www-data ${TR_WWW_PATH} && \
diff --git a/linux/ecosystem/atlassian/jira/4/4.1.1/.env b/linux/ecosystem/atlassian/jira/4/4.1.1/.env
index 4ddb10259..b081f552f 100644
--- a/linux/ecosystem/atlassian/jira/4/4.1.1/.env
+++ b/linux/ecosystem/atlassian/jira/4/4.1.1/.env
@@ -1,3 +1,3 @@
 
 RELEASE=4.1.1
-DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-4.1.1.tar.gz
+DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-4.1.1-standalone.tar.gz
diff --git a/linux/ecosystem/atlassian/jira/4/4.1.2/.env b/linux/ecosystem/atlassian/jira/4/4.1.2/.env
index d06527fe3..c0671a4f9 100644
--- a/linux/ecosystem/atlassian/jira/4/4.1.2/.env
+++ b/linux/ecosystem/atlassian/jira/4/4.1.2/.env
@@ -1,3 +1,3 @@
 
 RELEASE=4.1.2
-DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-4.1.2.tar.gz
+DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-4.1.2-standalone.tar.gz
diff --git a/linux/ecosystem/atlassian/jira/4/4.2.1/.env b/linux/ecosystem/atlassian/jira/4/4.2.1/.env
index 38eabf28e..0037a6009 100644
--- a/linux/ecosystem/atlassian/jira/4/4.2.1/.env
+++ b/linux/ecosystem/atlassian/jira/4/4.2.1/.env
@@ -1,3 +1,3 @@
 
 RELEASE=4.2.1
-DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-4.2.1-b588.tar.gz
+DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-4.2.1-b588-standalone.tar.gz
diff --git a/linux/ecosystem/atlassian/jira/4/4.2.2/.env b/linux/ecosystem/atlassian/jira/4/4.2.2/.env
index a66ff82a8..101bea911 100644
--- a/linux/ecosystem/atlassian/jira/4/4.2.2/.env
+++ b/linux/ecosystem/atlassian/jira/4/4.2.2/.env
@@ -1,3 +1,3 @@
 
 RELEASE=4.2.2
-DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-4.2.2-b589.tar.gz
+DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-4.2.2-b589-standalone.tar.gz
diff --git a/linux/ecosystem/atlassian/jira/4/4.2.3/.env b/linux/ecosystem/atlassian/jira/4/4.2.3/.env
index adf9e5a86..c0477d73e 100644
--- a/linux/ecosystem/atlassian/jira/4/4.2.3/.env
+++ b/linux/ecosystem/atlassian/jira/4/4.2.3/.env
@@ -1,3 +1,3 @@
 
 RELEASE=4.2.3
-DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-4.2.3-b590.tar.gz
+DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-4.2.3-b590-standalone.tar.gz
diff --git a/linux/ecosystem/atlassian/jira/4/4.2.4/.env b/linux/ecosystem/atlassian/jira/4/4.2.4/.env
index 6725affc3..6dbffd4c0 100644
--- a/linux/ecosystem/atlassian/jira/4/4.2.4/.env
+++ b/linux/ecosystem/atlassian/jira/4/4.2.4/.env
@@ -1,3 +1,3 @@
 
 RELEASE=4.2.4
-DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-4.2.4-b591.tar.gz
+DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-enterprise-4.2.4-b591-standalone.tar.gz
diff --git a/linux/ecosystem/atlassian/jira/4/4.3.1/.env b/linux/ecosystem/atlassian/jira/4/4.3.1/.env
index fae92807a..0d771ed2b 100644
--- a/linux/ecosystem/atlassian/jira/4/4.3.1/.env
+++ b/linux/ecosystem/atlassian/jira/4/4.3.1/.env
@@ -1,3 +1,3 @@
 
 RELEASE=4.3.1
-DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.3.1-war.tar.gz
+DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.3.1.tar.gz
diff --git a/linux/ecosystem/atlassian/jira/4/4.3.2/.env b/linux/ecosystem/atlassian/jira/4/4.3.2/.env
index 0388964f8..f2a5f1b8c 100644
--- a/linux/ecosystem/atlassian/jira/4/4.3.2/.env
+++ b/linux/ecosystem/atlassian/jira/4/4.3.2/.env
@@ -1,3 +1,3 @@
 
 RELEASE=4.3.2
-DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.3.2-war.tar.gz
+DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.3.2.tar.gz
diff --git a/linux/ecosystem/atlassian/jira/4/4.3.3/.env b/linux/ecosystem/atlassian/jira/4/4.3.3/.env
index 69e9842e9..368c7870d 100644
--- a/linux/ecosystem/atlassian/jira/4/4.3.3/.env
+++ b/linux/ecosystem/atlassian/jira/4/4.3.3/.env
@@ -1,3 +1,3 @@
 
 RELEASE=4.3.3
-DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.3.3-war.tar.gz
+DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.3.3.tar.gz
diff --git a/linux/ecosystem/atlassian/jira/4/4.3.4/.env b/linux/ecosystem/atlassian/jira/4/4.3.4/.env
index 60cdcf2cd..0d02c45d5 100644
--- a/linux/ecosystem/atlassian/jira/4/4.3.4/.env
+++ b/linux/ecosystem/atlassian/jira/4/4.3.4/.env
@@ -1,3 +1,3 @@
 
 RELEASE=4.3.4
-DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.3.4-war.tar.gz
+DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.3.4.tar.gz
diff --git a/linux/ecosystem/atlassian/jira/4/4.3/.env b/linux/ecosystem/atlassian/jira/4/4.3/.env
index d211ec967..89efb9a85 100644
--- a/linux/ecosystem/atlassian/jira/4/4.3/.env
+++ b/linux/ecosystem/atlassian/jira/4/4.3/.env
@@ -1,3 +1,3 @@
 
 RELEASE=4.3
-DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.3-war.tar.gz
+DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.3.tar.gz
diff --git a/linux/ecosystem/atlassian/jira/4/4.4.1/.env b/linux/ecosystem/atlassian/jira/4/4.4.1/.env
index 47171665e..a9c5185a6 100644
--- a/linux/ecosystem/atlassian/jira/4/4.4.1/.env
+++ b/linux/ecosystem/atlassian/jira/4/4.4.1/.env
@@ -1,3 +1,3 @@
 
 RELEASE=4.4.1
-DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.4.1-war.tar.gz
+DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.4.1.tar.gz
diff --git a/linux/ecosystem/atlassian/jira/4/4.4.3/.env b/linux/ecosystem/atlassian/jira/4/4.4.3/.env
index 9e45f4395..c7d84abc5 100644
--- a/linux/ecosystem/atlassian/jira/4/4.4.3/.env
+++ b/linux/ecosystem/atlassian/jira/4/4.4.3/.env
@@ -1,3 +1,3 @@
 
 RELEASE=4.4.3
-DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.4.3-war.tar.gz
+DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.4.3.tar.gz
diff --git a/linux/ecosystem/atlassian/jira/4/4.4.4/.env b/linux/ecosystem/atlassian/jira/4/4.4.4/.env
index 44fa02cb8..fb37a864d 100644
--- a/linux/ecosystem/atlassian/jira/4/4.4.4/.env
+++ b/linux/ecosystem/atlassian/jira/4/4.4.4/.env
@@ -1,3 +1,3 @@
 
 RELEASE=4.4.4
-DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.4.4-war.tar.gz
+DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.4.4.tar.gz
diff --git a/linux/ecosystem/atlassian/jira/4/4.4.5/.env b/linux/ecosystem/atlassian/jira/4/4.4.5/.env
index 63b406f58..c8a82755a 100644
--- a/linux/ecosystem/atlassian/jira/4/4.4.5/.env
+++ b/linux/ecosystem/atlassian/jira/4/4.4.5/.env
@@ -1,3 +1,3 @@
 
 RELEASE=4.4.5
-DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.4.5-war.tar.gz
+DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.4.5.tar.gz
diff --git a/linux/ecosystem/atlassian/jira/4/4.4/.env b/linux/ecosystem/atlassian/jira/4/4.4/.env
index 8f4af81e8..3d1900c83 100644
--- a/linux/ecosystem/atlassian/jira/4/4.4/.env
+++ b/linux/ecosystem/atlassian/jira/4/4.4/.env
@@ -1,3 +1,3 @@
 
 RELEASE=4.4
-DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.4-war.tar.gz
+DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-4.4.tar.gz