diff --git a/.java-version b/.java-version
new file mode 100644
index 000000000..4181564b4
--- /dev/null
+++ b/.java-version
@@ -0,0 +1,2 @@
+17
+
diff --git a/.licenserc.yaml b/.licenserc.yaml
index 3f7f739d3..62041777c 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -40,5 +40,6 @@ header:
     - '**/*.iml'
     - '.releaserc.json'
     - '.commitlintrc.json'
+    - '.java-version'
 
   comment: on-failure
diff --git a/pom.xml b/pom.xml
index a3990bbbc..04d42b15c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -248,7 +248,7 @@
                 <jvmFlag>-Djava.security.egd=file:/dev/./urandom</jvmFlag>
                 <jvmFlag>-Djdk.serialSetFilterAfterRead=true</jvmFlag>
               </jvmFlags>
-              <creationTime>EPOCH</creationTime>
+              <creationTime>USE_CURRENT_TIMESTAMP</creationTime>
             </container>
 
           </configuration>
diff --git a/shogun-boot/pom.xml b/shogun-boot/pom.xml
index 1d07f3fa8..4e55388f8 100644
--- a/shogun-boot/pom.xml
+++ b/shogun-boot/pom.xml
@@ -176,11 +176,26 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>pl.project13.maven</groupId>
-        <artifactId>git-commit-id-plugin</artifactId>
+        <groupId>io.github.git-commit-id</groupId>
+        <artifactId>git-commit-id-maven-plugin</artifactId>
+        <version>5.0.0</version>
+        <executions>
+          <execution>
+            <id>get-the-git-infos</id>
+            <goals>
+              <goal>revision</goal>
+            </goals>
+            <phase>initialize</phase>
+          </execution>
+        </executions>
         <configuration>
-          <offline>true</offline>
-          <abbrevLength>8</abbrevLength>
+          <generateGitPropertiesFile>true</generateGitPropertiesFile>
+          <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+          <includeOnlyProperties>
+            <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
+            <includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
+          </includeOnlyProperties>
+          <commitIdGenerationMode>full</commitIdGenerationMode>
         </configuration>
       </plugin>
       <plugin>
diff --git a/shogun-config/pom.xml b/shogun-config/pom.xml
index 1d398c3c5..51b1d0dbf 100644
--- a/shogun-config/pom.xml
+++ b/shogun-config/pom.xml
@@ -30,8 +30,24 @@
   <name>SHOGun Config</name>
   <packaging>jar</packaging>
 
-  <dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>com.google.cloud.tools</groupId>
+        <artifactId>jib-maven-plugin</artifactId>
+        <configuration>
+          <!-- we don't want jib to execute on this module -->
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
+  <dependencies>
     <!-- Spring Boot -->
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/shogun-gs-interceptor/pom.xml b/shogun-gs-interceptor/pom.xml
index 852b5170f..6cfb242a5 100644
--- a/shogun-gs-interceptor/pom.xml
+++ b/shogun-gs-interceptor/pom.xml
@@ -144,14 +144,7 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>pl.project13.maven</groupId>
-        <artifactId>git-commit-id-plugin</artifactId>
-        <configuration>
-          <offline>true</offline>
-          <abbrevLength>8</abbrevLength>
-        </configuration>
-      </plugin>
+
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>jib-maven-plugin</artifactId>
diff --git a/shogun-lib/pom.xml b/shogun-lib/pom.xml
index db18ab20c..e8664f0a7 100644
--- a/shogun-lib/pom.xml
+++ b/shogun-lib/pom.xml
@@ -36,6 +36,14 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>com.google.cloud.tools</groupId>
+        <artifactId>jib-maven-plugin</artifactId>
+        <configuration>
+          <!-- we don't want jib to execute on this module -->
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/shogun-manager/pom.xml b/shogun-manager/pom.xml
index bca5bd8a0..4577dc62e 100644
--- a/shogun-manager/pom.xml
+++ b/shogun-manager/pom.xml
@@ -28,6 +28,23 @@
   <name>SHOGun Manager client</name>
   <packaging>jar</packaging>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>com.google.cloud.tools</groupId>
+        <artifactId>jib-maven-plugin</artifactId>
+        <configuration>
+          <!-- we don't want jib to execute on this module -->
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <dependencies>
     <dependency>
       <groupId>de.terrestris</groupId>
diff --git a/shogun-proxy/pom.xml b/shogun-proxy/pom.xml
index c2ab6367d..f19fb11bd 100644
--- a/shogun-proxy/pom.xml
+++ b/shogun-proxy/pom.xml
@@ -123,11 +123,26 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>pl.project13.maven</groupId>
-        <artifactId>git-commit-id-plugin</artifactId>
+        <groupId>io.github.git-commit-id</groupId>
+        <artifactId>git-commit-id-maven-plugin</artifactId>
+        <version>5.0.0</version>
+        <executions>
+          <execution>
+            <id>get-the-git-infos</id>
+            <goals>
+              <goal>revision</goal>
+            </goals>
+            <phase>initialize</phase>
+          </execution>
+        </executions>
         <configuration>
-          <offline>true</offline>
-          <abbrevLength>8</abbrevLength>
+          <generateGitPropertiesFile>true</generateGitPropertiesFile>
+          <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+          <includeOnlyProperties>
+            <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
+            <includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
+          </includeOnlyProperties>
+          <commitIdGenerationMode>full</commitIdGenerationMode>
         </configuration>
       </plugin>
       <plugin>