diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk16/Dockerfile b/linux/ecosystem/epicmorg/debian/08-jessie/jdk16/Dockerfile
index ab8c19795..c3a16dbb2 100644
--- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk16/Dockerfile
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk16/Dockerfile
@@ -5,10 +5,14 @@ ARG DEBIAN_FRONTEND=noninteractive
 ##################################################################
 #                   installing java16
 ##################################################################
-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-16 && \
+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
 
 ##################################################################
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk16/Dockerfile.adopted b/linux/ecosystem/epicmorg/debian/08-jessie/jdk17/Dockerfile
similarity index 59%
rename from linux/ecosystem/epicmorg/debian/08-jessie/jdk16/Dockerfile.adopted
rename to linux/ecosystem/epicmorg/debian/08-jessie/jdk17/Dockerfile
index 20a242aba..3022b9f94 100644
--- a/linux/ecosystem/epicmorg/debian/08-jessie/jdk16/Dockerfile.adopted
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk17/Dockerfile
@@ -5,14 +5,14 @@ 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/ jessie main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+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 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 && \
+    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
 
 ##################################################################
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk17/Makefile b/linux/ecosystem/epicmorg/debian/08-jessie/jdk17/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk17/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/epicmorg/debian/08-jessie/jdk17/docker-compose.yml b/linux/ecosystem/epicmorg/debian/08-jessie/jdk17/docker-compose.yml
new file mode 100644
index 000000000..2893861b9
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk17/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/debian:jessie-jdk17"
+    build:
+      context: .
diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/jdk18/Dockerfile b/linux/ecosystem/epicmorg/debian/08-jessie/jdk18/Dockerfile
new file mode 100644
index 000000000..d34224b97
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk18/Dockerfile
@@ -0,0 +1,26 @@
+FROM epicmorg/debian:jessie
+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://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/Makefile b/linux/ecosystem/epicmorg/debian/08-jessie/jdk18/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk18/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/epicmorg/debian/08-jessie/jdk18/docker-compose.yml b/linux/ecosystem/epicmorg/debian/08-jessie/jdk18/docker-compose.yml
new file mode 100644
index 000000000..b81ce327a
--- /dev/null
+++ b/linux/ecosystem/epicmorg/debian/08-jessie/jdk18/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/debian:jessie-jdk18"
+    build:
+      context: .