diff --git a/Dockerfile b/docker-image/Dockerfile
similarity index 66%
rename from Dockerfile
rename to docker-image/Dockerfile
index 8e2d348ac..a7ecb6e6f 100644
--- a/Dockerfile
+++ b/docker-image/Dockerfile
@@ -1,3 +1,8 @@
+FROM quay.io/yakiyoshi/spring-petclinic:maven-3.5.4-java-1.8
+RUN git clone https://github.com/yakiyoshi/spring-petclinic.git
+WORKDIR /opt/maven/spring-petclinic
+RUN ./mvnw package
+
 FROM registry.redhat.io/ubi8/ubi
 ARG JAR_FILE=target/*.jar
 RUN yum install -y java-11-openjdk && yum clean all -y
diff --git a/docker-image/java-1.8/Dockerfile b/docker-image/java-1.8/Dockerfile
new file mode 100644
index 000000000..15975daab
--- /dev/null
+++ b/docker-image/java-1.8/Dockerfile
@@ -0,0 +1,8 @@
+FROM registry.redhat.io/ubi8/ubi
+WORKDIR /app
+RUN useradd appuser && \
+    chown -R appuser:appuser /app && \
+    chgrp -R 0 /app && \
+    chmod -R g=u /app
+RUN yum install -y git java-1.8.0-openjdk && yum clean all -y
+USER maven
diff --git a/settings.xml b/settings.xml
new file mode 100644
index 000000000..fe68160b2
--- /dev/null
+++ b/settings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <localRepository>/localrepo</localRepository>
+</settings>
\ No newline at end of file