diff --git a/maven-parent/pom.xml b/maven-parent/pom.xml
index 8a10721..2792ab4 100644
--- a/maven-parent/pom.xml
+++ b/maven-parent/pom.xml
@@ -381,4 +381,235 @@
+
+
+ docker
+
+
+ 1.0.0-SNAPSHOT
+
+ ${project.groupId}-${project.artifactId}-${project.version}
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+ Unpack Ozone Docker Embedded to a tempoarary location
+ generate-resources
+
+ unpack-dependencies
+
+
+ true
+ ${project.build.directory}/embedded-build-tmp/docker-embedded
+ ozone-docker-embedded
+
+
+
+
+
+ org.codehaus.gmavenplus
+ gmavenplus-plugin
+
+
+ Generate Docker Compose Embedded yaml
+
+ execute
+
+ process-resources
+
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+
+
+
+ Copy Docker Embedded compose file
+ package
+
+ copy-resources
+
+
+
+ ${project.build.directory}/${project.artifactId}-${project.version}/run/docker
+ true
+
+
+
+ ${project.build.directory}/embedded-build-tmp/docker-embedded
+ true
+
+ docker-compose-embedded.yaml
+
+
+
+
+
+
+
+ Copy Ozone
+ package
+
+ copy-resources
+
+
+
+ ${project.build.directory}/embedded-build-tmp/distro
+ true
+
+
+
+ ${project.build.directory}/${project.artifactId}-${project.version}/distro
+ false
+
+
+
+
+
+
+
+ io.fabric8
+ docker-maven-plugin
+
+
+
+ ozone-embedded-openmrs-backend:${docker.tag}
+
+
+ ${project.build.directory}/embedded-build-tmp/docker-embedded/openmrs/Dockerfile
+
+ ${project.build.directory}/embedded-build-tmp/distro
+
+
+
+ ozone-embedded-openmrs-frontend:${project.version}
+
+
+ ${project.build.directory}/embedded-build-tmp/docker-embedded/frontend/Dockerfile
+
+ ${project.build.directory}/embedded-build-tmp/
+
+
+
+ ozone-embedded-proxy:${docker.tag}
+
+
+ ${project.build.directory}/embedded-build-tmp/docker-embedded/proxy/Dockerfile
+
+ ${project.build.directory}/embedded-build-tmp/
+
+
+
+ ozone-embedded-odoo:${docker.tag}
+
+
+ ${project.build.directory}/embedded-build-tmp/docker-embedded/odoo/Dockerfile
+
+ ${project.build.directory}/embedded-build-tmp/distro
+
+
+
+ ozone-embedded-senaite:${docker.tag}
+
+
+ ${project.build.directory}/embedded-build-tmp/docker-embedded/senaite/Dockerfile
+
+ ${project.build.directory}/embedded-build-tmp/distro
+
+
+
+ ozone-embedded-erpnext:${docker.tag}
+
+
+ ${project.build.directory}/embedded-build-tmp/docker-embedded/erpnext/Dockerfile
+
+ ${project.build.directory}/embedded-build-tmp/distro
+
+
+
+ ozone-embedded-eip-erpnext-openmrs:${docker.tag}
+
+
+ ${project.build.directory}/embedded-build-tmp/docker-embedded/eip-erpnext-openmrs/Dockerfile
+
+ ${project.build.directory}/embedded-build-tmp/distro
+
+
+
+ ozone-embedded-eip-odoo-openmrs:${docker.tag}
+
+
+ ${project.build.directory}/embedded-build-tmp/docker-embedded/eip-odoo-openmrs/Dockerfile
+
+ ${project.build.directory}/embedded-build-tmp/distro
+
+
+
+ ozone-embedded-eip-openmrs-senaite:${docker.tag}
+
+
+ ${project.build.directory}/embedded-build-tmp/docker-embedded/eip-openmrs-senaite/Dockerfile
+
+ ${project.build.directory}/embedded-build-tmp/distro
+
+
+
+ ozone-embedded-postgresql:${project.version}
+
+
+ ${project.build.directory}/embedded-build-tmp/docker-embedded/postgresql/Dockerfile
+
+ ${project.build.directory}/embedded-build-tmp/distro
+
+
+
+ ozone-embedded-mysql:${project.version}
+
+
+ ${project.build.directory}/embedded-build-tmp/docker-embedded/mysql/Dockerfile
+
+ ${project.build.directory}/embedded-build-tmp/distro
+
+
+
+
+
+ linux/amd64
+ linux/arm64
+
+
+
+
+
+ Build embedded docker images
+
+ build
+
+ package
+
+
+
+
+
+
+
+ com.ozonehis
+ ozone-docker-embedded
+ zip
+ ${ozoneDockerEmbedded}
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 7b87a2c..52f77df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,209 +61,6 @@
${ozoneDockerComposeVersion}
-
-
-
- docker
-
-
- ozone-embedded
- mekomsolutions
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
-
-
- Unpack Ozone Docker Embedded to a tempoarary location
- generate-resources
-
- unpack-dependencies
-
-
- true
- ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded
- ozone-docker-embedded
-
-
-
-
-
- org.codehaus.gmavenplus
- gmavenplus-plugin
-
-
- Generate Docker Compose Embedded yaml
-
- execute
-
- process-resources
-
-
-
-
-
-
-
-
-
- io.fabric8
- docker-maven-plugin
-
-
-
- mekomsolutions/ozone-embedded-openmrs-3-backend:${project.version}
-
-
- ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded/openmrs/Dockerfile
-
- ${project.build.directory}/${project.artifactId}-${project.version}/distro
-
-
-
- mekomsolutions/ozone-embedded-openmrs-3-frontend:${project.version}
-
-
- ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded/frontend/Dockerfile
-
- ${project.build.directory}/${project.artifactId}-${project.version}/
-
-
-
- mekomsolutions/ozone-embedded-odoo:${project.version}
-
-
- ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded/odoo/Dockerfile
-
- ${project.build.directory}/${project.artifactId}-${project.version}/distro
-
-
-
- mekomsolutions/ozone-embedded-senaite:${project.version}
-
-
- ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded/senaite/Dockerfile
-
- ${project.build.directory}/${project.artifactId}-${project.version}/distro
-
-
-
- mekomsolutions/ozone-embedded-erpnext:${project.version}
-
-
- ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded/erpnext/Dockerfile
-
- ${project.build.directory}/${project.artifactId}-${project.version}/distro
-
-
-
- mekomsolutions/ozone-embedded-eip-erpnext-openmrs:${project.version}
-
-
- ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded/eip-erpnext-openmrs/Dockerfile
-
- ${project.build.directory}/${project.artifactId}-${project.version}/distro
-
-
-
- mekomsolutions/ozone-embedded-eip-odoo-openmrs:${project.version}
-
-
- ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded/eip-odoo-openmrs/Dockerfile
-
- ${project.build.directory}/${project.artifactId}-${project.version}/distro
-
-
-
- mekomsolutions/ozone-embedded-eip-openmrs-senaite:${project.version}
-
-
- ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded/eip-openmrs-senaite/Dockerfile
-
- ${project.build.directory}/${project.artifactId}-${project.version}/distro
-
-
-
- mekomsolutions/ozone-embedded-postgresql:${project.version}
-
-
- ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded/postgresql/Dockerfile
-
- ${project.build.directory}/${project.artifactId}-${project.version}/distro
-
-
-
- mekomsolutions/ozone-embedded-mysql:${project.version}
-
-
- ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded/mysql/Dockerfile
-
- ${project.build.directory}/${project.artifactId}-${project.version}/distro
-
-
-
-
-
- linux/amd64
- linux/arm64
-
-
-
-
-
- Build embedded docker images
-
- build
-
- package
-
-
-
-
- org.apache.maven.plugins
- maven-resources-plugin
-
-
-
- Copy Docker Embedded compose file
- package
-
- copy-resources
-
-
-
- ${project.build.directory}/${project.artifactId}-${project.version}/run/docker
- true
-
-
-
- ${project.build.directory}/${project.artifactId}-${project.version}/docker-embedded
- true
-
- docker-compose-embedded.yaml
-
-
-
-
-
-
-
-
-
-
-
- com.ozonehis
- ozone-docker-embedded
- zip
- 1.0.0-SNAPSHOT
-
-
-
-
-
@@ -298,21 +95,6 @@
ozone-distro
-
-
-
diff --git a/scripts/openmrs/docker-embedded/generate-docker-embedded-compose.groovy b/scripts/openmrs/docker-embedded/generate-docker-embedded-compose.groovy
index b132e78..dc9c444 100644
--- a/scripts/openmrs/docker-embedded/generate-docker-embedded-compose.groovy
+++ b/scripts/openmrs/docker-embedded/generate-docker-embedded-compose.groovy
@@ -4,14 +4,14 @@ import java.text.SimpleDateFormat
import groovy.text.*
import groovy.json.JsonBuilder
-myver = "${project.version}"
+myver = "${project.groupId}-${project.artifactId}-${project.version}"
-def dockerComposeTemplate = Paths.get("${project.build.directory}/${project.artifactId}-${project.version}", "docker-embedded", "docker-compose-embedded.yaml.template").toFile()
+def dockerComposeTemplate = Paths.get("${project.build.directory}", "/embedded-build-tmp", "docker-embedded", "docker-compose-embedded.yaml.template").toFile()
def binding = ['dockertag' : myver ]
def engine = new SimpleTemplateEngine()
def template = engine.createTemplate(dockerComposeTemplate)
def writable = template.make(binding)
-def dockerComposePath = Paths.get("${project.build.directory}/${project.artifactId}-${project.version}", "docker-embedded", "docker-compose-embedded.yaml").toAbsolutePath().toString()
+def dockerComposePath = Paths.get("${project.build.directory}", "/embedded-build-tmp", "docker-embedded", "docker-compose-embedded.yaml").toAbsolutePath().toString()
def myFile = new File(dockerComposePath)
myFile.write(writable.toString())
\ No newline at end of file
diff --git a/scripts/pom.xml b/scripts/pom.xml
index 160bd1a..c5a5ce3 100644
--- a/scripts/pom.xml
+++ b/scripts/pom.xml
@@ -48,6 +48,9 @@
${project.basedir}/../scripts
+
+ openmrs/docker-embedded/generate-docker-embedded-compose.groovy
+
openmrs/frontend_assembly/build-openmrs-frontend.groovy