diff --git a/nop-auth/nop-auth-app/src/main/docker/Dockerfile.native b/nop-auth/nop-auth-app/src/main/docker/Dockerfile.native
deleted file mode 100644
index 7476b1542..000000000
--- a/nop-auth/nop-auth-app/src/main/docker/Dockerfile.native
+++ /dev/null
@@ -1,27 +0,0 @@
-####
-# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
-#
-# Before building the container image run:
-#
-# ./mvnw package -Dnative
-#
-# Then, build the image with:
-#
-# docker build -f src/main/docker/Dockerfile.native -t quarkus/code-with-quarkus .
-#
-# Then run the container using:
-#
-# docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus
-#
-###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8
-WORKDIR /work/
-RUN chown 1001 /work \
- && chmod "g+rwX" /work \
- && chown 1001:root /work
-COPY --chown=1001:root target/*-runner /work/application
-
-EXPOSE 8080
-USER 1001
-
-ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
diff --git a/nop-auth/nop-auth-app/src/main/docker/Dockerfile.native-micro b/nop-auth/nop-auth-app/src/main/docker/Dockerfile.native-micro
deleted file mode 100644
index 357d4aff3..000000000
--- a/nop-auth/nop-auth-app/src/main/docker/Dockerfile.native-micro
+++ /dev/null
@@ -1,30 +0,0 @@
-####
-# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
-# It uses a micro base image, tuned for Quarkus native executables.
-# It reduces the size of the resulting container image.
-# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
-#
-# Before building the container image run:
-#
-# ./mvnw package -Dnative
-#
-# Then, build the image with:
-#
-# docker build -f src/main/docker/Dockerfile.native-micro -t nop/nop-quarkus-demo .
-#
-# Then run the container using:
-#
-# docker run -i --rm -p 8080:8080 nop/nop-quarkus-demo
-#
-###
-FROM quay.io/quarkus/quarkus-micro-image:2.0
-WORKDIR /work/
-RUN chown 1001 /work \
- && chmod "g+rwX" /work \
- && chown 1001:root /work
-COPY --chown=1001:root target/*-runner /work/application
-
-EXPOSE 8080
-USER 1001
-
-ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
diff --git a/nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.jvm b/nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.jvm
deleted file mode 100644
index f5328dbef..000000000
--- a/nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.jvm
+++ /dev/null
@@ -1,97 +0,0 @@
-####
-# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
-#
-# Before building the container image run:
-#
-# ./mvnw package
-#
-# Then, build the image with:
-#
-# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/code-with-quarkus-jvm .
-#
-# Then run the container using:
-#
-# docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus-jvm
-#
-# If you want to include the debug port into your docker image
-# you will have to expose the debug port (default 5005 being the default) like this : EXPOSE 8080 5005.
-# Additionally you will have to set -e JAVA_DEBUG=true and -e JAVA_DEBUG_PORT=*:5005
-# when running the container
-#
-# Then run the container using :
-#
-# docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus-jvm
-#
-# This image uses the `run-java.sh` script to run the application.
-# This scripts computes the command line to execute your Java application, and
-# includes memory/GC tuning.
-# You can configure the behavior using the following environment properties:
-# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class")
-# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options
-# in JAVA_OPTS (example: "-Dsome.property=foo")
-# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is
-# used to calculate a default maximal heap memory based on a containers restriction.
-# If used in a container without any memory constraints for the container then this
-# option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio
-# of the container available memory as set here. The default is `50` which means 50%
-# of the available memory is used as an upper boundary. You can skip this mechanism by
-# setting this value to `0` in which case no `-Xmx` option is added.
-# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This
-# is used to calculate a default initial heap memory based on the maximum heap memory.
-# If used in a container without any memory constraints for the container then this
-# option has no effect. If there is a memory constraint then `-Xms` is set to a ratio
-# of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx`
-# is used as the initial heap size. You can skip this mechanism by setting this value
-# to `0` in which case no `-Xms` option is added (example: "25")
-# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS.
-# This is used to calculate the maximum value of the initial heap memory. If used in
-# a container without any memory constraints for the container then this option has
-# no effect. If there is a memory constraint then `-Xms` is limited to the value set
-# here. The default is 4096MB which means the calculated value of `-Xms` never will
-# be greater than 4096MB. The value of this variable is expressed in MB (example: "4096")
-# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output
-# when things are happening. This option, if set to true, will set
-# `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true").
-# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example:
-# true").
-# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787").
-# - CONTAINER_CORE_LIMIT: A calculated core limit as described in
-# https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2")
-# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024").
-# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion.
-# (example: "20")
-# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking.
-# (example: "40")
-# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection.
-# (example: "4")
-# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus
-# previous GC times. (example: "90")
-# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20")
-# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100")
-# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should
-# contain the necessary JRE command-line options to specify the required GC, which
-# will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC).
-# - HTTPS_PROXY: The location of the https proxy. (example: "myuser@127.0.0.1:8080")
-# - HTTP_PROXY: The location of the http proxy. (example: "myuser@127.0.0.1:8080")
-# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be
-# accessed directly. (example: "foo.example.com,bar.example.com")
-#
-###
-FROM registry.access.redhat.com/ubi8/openjdk-17:1.16
-
-ENV LANGUAGE='en_US:en'
-
-
-# We make four distinct layers so if there are application changes the library layers can be re-used
-COPY --chown=185 target/quarkus-app/lib/ /deployments/lib/
-COPY --chown=185 target/quarkus-app/*.jar /deployments/
-COPY --chown=185 target/quarkus-app/app/ /deployments/app/
-COPY --chown=185 target/quarkus-app/quarkus/ /deployments/quarkus/
-
-EXPOSE 8080
-USER 185
-ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
-ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
-
-ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
-
diff --git a/nop-auth/nop-auth-app/src/main/docker/Dockerfile.jvm b/nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.jvm.xgen
similarity index 95%
rename from nop-auth/nop-auth-app/src/main/docker/Dockerfile.jvm
rename to nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.jvm.xgen
index f5328dbef..01753caf6 100644
--- a/nop-auth/nop-auth-app/src/main/docker/Dockerfile.jvm
+++ b/nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.jvm.xgen
@@ -1,4 +1,4 @@
-####
+
\ No newline at end of file
diff --git a/nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.legacy-jar b/nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.legacy-jar
deleted file mode 100644
index bee5fd829..000000000
--- a/nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.legacy-jar
+++ /dev/null
@@ -1,93 +0,0 @@
-####
-# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
-#
-# Before building the container image run:
-#
-# ./mvnw package -Dquarkus.package.type=legacy-jar
-#
-# Then, build the image with:
-#
-# docker build -f src/main/docker/Dockerfile.legacy-jar -t quarkus/code-with-quarkus-legacy-jar .
-#
-# Then run the container using:
-#
-# docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus-legacy-jar
-#
-# If you want to include the debug port into your docker image
-# you will have to expose the debug port (default 5005 being the default) like this : EXPOSE 8080 5005.
-# Additionally you will have to set -e JAVA_DEBUG=true and -e JAVA_DEBUG_PORT=*:5005
-# when running the container
-#
-# Then run the container using :
-#
-# docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus-legacy-jar
-#
-# This image uses the `run-java.sh` script to run the application.
-# This scripts computes the command line to execute your Java application, and
-# includes memory/GC tuning.
-# You can configure the behavior using the following environment properties:
-# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class")
-# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options
-# in JAVA_OPTS (example: "-Dsome.property=foo")
-# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is
-# used to calculate a default maximal heap memory based on a containers restriction.
-# If used in a container without any memory constraints for the container then this
-# option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio
-# of the container available memory as set here. The default is `50` which means 50%
-# of the available memory is used as an upper boundary. You can skip this mechanism by
-# setting this value to `0` in which case no `-Xmx` option is added.
-# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This
-# is used to calculate a default initial heap memory based on the maximum heap memory.
-# If used in a container without any memory constraints for the container then this
-# option has no effect. If there is a memory constraint then `-Xms` is set to a ratio
-# of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx`
-# is used as the initial heap size. You can skip this mechanism by setting this value
-# to `0` in which case no `-Xms` option is added (example: "25")
-# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS.
-# This is used to calculate the maximum value of the initial heap memory. If used in
-# a container without any memory constraints for the container then this option has
-# no effect. If there is a memory constraint then `-Xms` is limited to the value set
-# here. The default is 4096MB which means the calculated value of `-Xms` never will
-# be greater than 4096MB. The value of this variable is expressed in MB (example: "4096")
-# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output
-# when things are happening. This option, if set to true, will set
-# `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true").
-# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example:
-# true").
-# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787").
-# - CONTAINER_CORE_LIMIT: A calculated core limit as described in
-# https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2")
-# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024").
-# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion.
-# (example: "20")
-# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking.
-# (example: "40")
-# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection.
-# (example: "4")
-# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus
-# previous GC times. (example: "90")
-# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20")
-# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100")
-# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should
-# contain the necessary JRE command-line options to specify the required GC, which
-# will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC).
-# - HTTPS_PROXY: The location of the https proxy. (example: "myuser@127.0.0.1:8080")
-# - HTTP_PROXY: The location of the http proxy. (example: "myuser@127.0.0.1:8080")
-# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be
-# accessed directly. (example: "foo.example.com,bar.example.com")
-#
-###
-FROM registry.access.redhat.com/ubi8/openjdk-17:1.16
-
-ENV LANGUAGE='en_US:en'
-
-
-COPY target/lib/* /deployments/lib/
-COPY target/*-runner.jar /deployments/quarkus-run.jar
-
-EXPOSE 8080
-USER 185
-ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
-ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
-
-ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
diff --git a/nop-auth/nop-auth-app/src/main/docker/Dockerfile.legacy-jar b/nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.legacy-jar.xgen
similarity index 95%
rename from nop-auth/nop-auth-app/src/main/docker/Dockerfile.legacy-jar
rename to nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.legacy-jar.xgen
index bee5fd829..4599e52d5 100644
--- a/nop-auth/nop-auth-app/src/main/docker/Dockerfile.legacy-jar
+++ b/nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.legacy-jar.xgen
@@ -1,4 +1,4 @@
-####
+
\ No newline at end of file
diff --git a/nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.native-micro b/nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.native-micro.xgen
similarity index 80%
rename from nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.native-micro
rename to nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.native-micro.xgen
index 357d4aff3..811fc2160 100644
--- a/nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.native-micro
+++ b/nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.native-micro.xgen
@@ -1,4 +1,4 @@
-####
+
\ No newline at end of file
diff --git a/nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.native b/nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.native.xgen
similarity index 74%
rename from nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.native
rename to nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.native.xgen
index 7476b1542..f0db67678 100644
--- a/nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.native
+++ b/nop-codegen/src/main/resources/_vfs/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.native.xgen
@@ -1,4 +1,4 @@
-####
+
\ No newline at end of file
diff --git a/nop-demo/nop-quarkus-demo/build-docker.sh b/nop-demo/nop-quarkus-demo/build-docker.sh
new file mode 100644
index 000000000..104ceaf36
--- /dev/null
+++ b/nop-demo/nop-quarkus-demo/build-docker.sh
@@ -0,0 +1,2 @@
+mvn install -DskipTests
+docker build . -f=src/main/docker/Dockerfile.jvm -t=nop/quarkus-demo
\ No newline at end of file
diff --git a/nop-demo/nop-quarkus-demo/build-native-docker.sh b/nop-demo/nop-quarkus-demo/build-native-docker.sh
new file mode 100644
index 000000000..68de4ba07
--- /dev/null
+++ b/nop-demo/nop-quarkus-demo/build-native-docker.sh
@@ -0,0 +1 @@
+docker build . -f=src/main/docker/Dockerfile.native-micro -t=nop/quarkus-demo
\ No newline at end of file
diff --git a/nop-demo/nop-quarkus-demo/build-native.bat b/nop-demo/nop-quarkus-demo/build-native.bat
new file mode 100644
index 000000000..f442d0bca
--- /dev/null
+++ b/nop-demo/nop-quarkus-demo/build-native.bat
@@ -0,0 +1,4 @@
+set GRAALVM_HOME=C:\Software\graalvm
+set JAVA_HOME=%GRAALVM_HOME%
+set Path=%GRAALVM_HOME%\bin;%Path%
+"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" && mvn package -DskipTests -Pnative
diff --git a/nop-demo/nop-quarkus-demo/run-docker.sh b/nop-demo/nop-quarkus-demo/run-docker.sh
new file mode 100644
index 000000000..278bf0472
--- /dev/null
+++ b/nop-demo/nop-quarkus-demo/run-docker.sh
@@ -0,0 +1 @@
+docker run -i --rm -p 8080:8080 nop/quarkus-demo
\ No newline at end of file
diff --git a/nop-demo/nop-quarkus-demo/src/main/resources/META-INF/native-image/io.nop.demo/nop-quarkus-demo/proxy-config.json b/nop-demo/nop-quarkus-demo/src/main/resources/META-INF/native-image/io.nop.demo/nop-quarkus-demo/proxy-config.json
index e69de29bb..16d9e9188 100644
--- a/nop-demo/nop-quarkus-demo/src/main/resources/META-INF/native-image/io.nop.demo/nop-quarkus-demo/proxy-config.json
+++ b/nop-demo/nop-quarkus-demo/src/main/resources/META-INF/native-image/io.nop.demo/nop-quarkus-demo/proxy-config.json
@@ -0,0 +1,8 @@
+[
+ [
+ "io.nop.auth.dao.mapper.NopAuthRoleMapper"
+ ],
+ [
+ "io.nop.auth.dao.mapper.NopAuthUserMapper"
+ ]
+]
\ No newline at end of file
diff --git a/nop-demo/nop-quarkus-demo/src/main/resources/application.yaml b/nop-demo/nop-quarkus-demo/src/main/resources/application.yaml
index a59a90e71..8de02f18b 100644
--- a/nop-demo/nop-quarkus-demo/src/main/resources/application.yaml
+++ b/nop-demo/nop-quarkus-demo/src/main/resources/application.yaml
@@ -33,14 +33,14 @@ nop:
# jdbc-url: jdbc:h2:./db/test
# username: sa
# password:
- driver-class-name: com.mysql.cj.jdbc.Driver
- jdbc-url: jdbc:mysql://127.0.0.1:3306/dev?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=UTC
- username: nop
- password: nop-test
- #driver-class-name: org.h2.Driver
- #jdbc-url: jdbc:h2:./db/test
- #username: sa
- #password:
+ # driver-class-name: com.mysql.cj.jdbc.Driver
+ # jdbc-url: jdbc:mysql://127.0.0.1:3306/dev?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=UTC
+ # username: nop
+ # password: nop-test
+ driver-class-name: org.h2.Driver
+ jdbc-url: jdbc:h2:./db/test
+ username: sa
+ password:
gateway:
http-filter:
diff --git a/nop-demo/nop-quarkus-demo/src/main/resources/nop-vfs-index.txt b/nop-demo/nop-quarkus-demo/src/main/resources/nop-vfs-index.txt
index 2105c3dca..47bfe8510 100644
--- a/nop-demo/nop-quarkus-demo/src/main/resources/nop-vfs-index.txt
+++ b/nop-demo/nop-quarkus-demo/src/main/resources/nop-vfs-index.txt
@@ -671,10 +671,10 @@
/nop/templates/orm/{!!useCoreModule}{appName}-core/src/main/java/{basePackagePath}/core/{moduleClassPrefix}CoreConstants.java.xgen
/nop/templates/orm/{appName}-api/pom.xml.xgen
/nop/templates/orm/{appName}-app/pom.xml.xgen
-/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.jvm
-/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.legacy-jar
-/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.native
-/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.native-micro
+/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.jvm.xgen
+/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.legacy-jar.xgen
+/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.native-micro.xgen
+/nop/templates/orm/{appName}-app/src/main/docker/Dockerfile.native.xgen
/nop/templates/orm/{appName}-app/src/main/java/{basePackagePath}/app/{moduleClassPrefix}Application.java.xgen
/nop/templates/orm/{appName}-app/src/main/resources/META-INF/native-image/{mavenGroupId}/{mavenArtifactId}-app/jni-config.json
/nop/templates/orm/{appName}-app/src/main/resources/META-INF/native-image/{mavenGroupId}/{mavenArtifactId}-app/native-image.properties