diff --git a/documentation/guide-jib.asciidoc b/documentation/guide-jib.asciidoc
new file mode 100644
index 00000000..66b22b75
--- /dev/null
+++ b/documentation/guide-jib.asciidoc
@@ -0,0 +1,58 @@
+:toc:
+toc::[]
+
+= JIB
+jib is a tool from Google to create Docker images in simple and faster way. No dockerfile or no docker compose file is required. Using Jib, image can be created and uploaded to the registery even without Docker daemon.
+
+The JIB maven plugin configured to build the image using mvn command.
+
+== Build and run the image locally
+The Docker daemon should be available locally. 
+
+To build the docker image.
+[source]
+----
+mvn compile -Pcontainer
+
+docker images
+
+REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE
+myapp-server/java   0.0.1-SNAPSHOT      c521c9800c48        51 years ago        206MB
+myapp-api/java      0.0.1-SNAPSHOT      7004670aa31e        51 years ago        161MB
+myapp-core/java     0.0.1-SNAPSHOT      82d949c3daa3        51 years ago        205MB
+----
+
+To run the image.
+
+[source]
+----
+docker run --publish 8081:8081 <image>
+----
+
+== Upload the image to the registery
+
+No docker daemon required to be installed on your machine for this.
+
+The first step is to configure the registery details in .m2/settings.xml.
+
+[source]
+----
+<servers>
+  <server>
+    <id>«registery»</id>
+    <username>«username»</username>
+    <password>«password»</password>
+  </server>
+</servers>
+----
+Keep the password encrypted (`mvn -ep`). Refer the documentation for the password encryption
+ https://maven.apache.org/guides/mini/guide-encryption.html
+
+Run the below command to create and push the image to the image repository.
+[source]
+----
+mvn compile -P release,container
+
+----
+
+
diff --git a/pom.xml b/pom.xml
index 919bea68..a8997f09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,8 @@
     <!-- Spring boot and spring cloud version has to match -->
     <spring.cloud.dependencies.version>2020.0.0</spring.cloud.dependencies.version>
     <jackson.version>2.11.2</jackson.version> <!-- Overriding Jackson for fixing vulnerabilities -->
+    <jib.version>2.8.0</jib.version>
+    <jib.container.image>adoptopenjdk/openjdk11:jre-11.0.4_11-alpine</jib.container.image>
     <guava.version>30.0-jre</guava.version>
     <junit.version>5.7.0</junit.version>
     <cxf.version>3.4.1</cxf.version>
diff --git a/templates/server/src/main/resources/archetype-resources/__batch__/pom.xml b/templates/server/src/main/resources/archetype-resources/__batch__/pom.xml
index c9df8148..20ff72e8 100644
--- a/templates/server/src/main/resources/archetype-resources/__batch__/pom.xml
+++ b/templates/server/src/main/resources/archetype-resources/__batch__/pom.xml
@@ -51,5 +51,4 @@
       </plugin>
     </plugins>
   </build>
-
 </project>
diff --git a/templates/server/src/main/resources/archetype-resources/api/pom.xml b/templates/server/src/main/resources/archetype-resources/api/pom.xml
index 87422fa3..b8346bc0 100644
--- a/templates/server/src/main/resources/archetype-resources/api/pom.xml
+++ b/templates/server/src/main/resources/archetype-resources/api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>${groupId}</groupId>
     <artifactId>${rootArtifactId}</artifactId>
-   <version>${app.version}</version>
+    <version>${app.version}</version>
   </parent>
   <artifactId>${rootArtifactId}-api</artifactId>
   <packaging>jar</packaging>
@@ -42,4 +42,15 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.google.cloud.tools</groupId>
+        <artifactId>jib-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/templates/server/src/main/resources/archetype-resources/core/pom.xml b/templates/server/src/main/resources/archetype-resources/core/pom.xml
index c32ec750..06d14d93 100644
--- a/templates/server/src/main/resources/archetype-resources/core/pom.xml
+++ b/templates/server/src/main/resources/archetype-resources/core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>${groupId}</groupId>
     <artifactId>${rootArtifactId}</artifactId>
-     <version>${app.version}</version>
+    <version>${app.version}</version>
   </parent>
   <artifactId>${rootArtifactId}-core</artifactId>
   <packaging>jar</packaging>
@@ -66,7 +66,7 @@
 
     <!-- auto-configure datasource
       https://stackoverflow.com/questions/34964066/spring-boot-doesnt-use-datasource-properties
-      -->
+    -->
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-jdbc</artifactId>
@@ -132,7 +132,7 @@
 #elseif ($dbType == 'postgresql')
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <!--<version>9.4.1211.jre7</version>-->
+      <!--<version>9.4.1211.jre7</version> -->
 #elseif ($dbType == 'mysql')
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
@@ -165,7 +165,7 @@
       <artifactId>h2</artifactId>
       <scope>test</scope>
     </dependency>
-#end
+ #end
 
     <!-- Flyway for DB Schema version management and migration -->
     <dependency>
@@ -230,7 +230,7 @@
     <profile>
       <id>embedded</id>
       <activation>
-       <activeByDefault>true</activeByDefault>
+        <activeByDefault>true</activeByDefault>
       </activation>
       <dependencies>
         <dependency>
diff --git a/templates/server/src/main/resources/archetype-resources/pom.xml b/templates/server/src/main/resources/archetype-resources/pom.xml
index 928bb425..823c3cd0 100644
--- a/templates/server/src/main/resources/archetype-resources/pom.xml
+++ b/templates/server/src/main/resources/archetype-resources/pom.xml
@@ -20,17 +20,21 @@
     <guava.version>$[guava.version]</guava.version>
     <devonfw.test.excluded.groups>system</devonfw.test.excluded.groups>
     <app.version>${revision}${changelist}</app.version>
+    <jib.version>$[jib.version]</jib.version>
+    <jib.container.image>$[jib.container.image]</jib.container.image>
+    <jib.app.port>8081</jib.app.port>
+    <jib.goal>buildTar</jib.goal>
   </properties>
 
   <modules>
     <module>api</module>
     <module>core</module>
-    #if ($earProjectName != '.')
+#if ($earProjectName != '.')
     <module>${earProjectName}</module>
-    #end
-    #if ($batch == 'batch')
+#end
+#if ($batch == 'batch')
     <module>batch</module>
-    #end
+#end
     <module>server</module>
   </modules>
 
@@ -328,6 +332,49 @@
   </build>
 
   <profiles>
+    <profile>
+      <id>release</id>
+      <properties>
+        <jib.goal>build</jib.goal>
+      </properties>
+    </profile>
+    <profile>
+      <id>container</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.google.cloud.tools</groupId>
+            <artifactId>jib-maven-plugin</artifactId>
+            <version>${jib.version}</version>
+            <configuration>
+              <from>
+                <image>${jib.container.image}</image>
+              </from>
+              <to>
+                <image>${project.name}/java:${project.version}</image>
+              </to>
+              <container>
+                <mainClass>${package}.SpringBootApp</mainClass>
+                <ports>
+                  <port>${jib.app.port}</port>
+                </ports>
+              </container>
+            </configuration>
+            <executions>
+              <execution>
+                <phase>package</phase>
+                <goals>
+                  <goal>${jib.goal}</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>moduletest</id>
       <properties>
diff --git a/templates/server/src/main/resources/archetype-resources/server/pom.xml b/templates/server/src/main/resources/archetype-resources/server/pom.xml
index cc0edbac..7fc7a374 100644
--- a/templates/server/src/main/resources/archetype-resources/server/pom.xml
+++ b/templates/server/src/main/resources/archetype-resources/server/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>${groupId}</groupId>
     <artifactId>${rootArtifactId}</artifactId>
-     <version>${app.version}</version>
+    <version>${app.version}</version>
   </parent>
   <artifactId>${rootArtifactId}-server</artifactId>
   <packaging>war</packaging>
@@ -145,8 +145,13 @@
           </execution>
         </executions>
       </plugin>
-
+      <plugin>
+        <groupId>com.google.cloud.tools</groupId>
+        <artifactId>jib-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
-
 </project>