diff --git a/CHANGES.md b/CHANGES.md
index 3476c384c..0ba171599 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,6 @@
 Airbase 154
 * Fix javadoc building when `air.compiler.enable-preview` is set
+* Support maven reproducible builds
 
 Airbase 153
 * Dependency updates:
diff --git a/airbase/pom.xml b/airbase/pom.xml
index c67ba0462..0c1e70c00 100644
--- a/airbase/pom.xml
+++ b/airbase/pom.xml
@@ -54,6 +54,7 @@
         <project.build.targetJdk>8</project.build.targetJdk>
         <project.report.outputEncoding>UTF-8</project.report.outputEncoding>
         <project.report.inputEncoding>UTF-8</project.report.inputEncoding>
+        <project.build.outputTimestamp>${git.commit.time}</project.build.outputTimestamp>
 
         <!-- airlift build specific options are prefixed air.build. -->
 
@@ -856,6 +857,7 @@
                         <encoding>${project.build.sourceEncoding}</encoding>
                         <maxmemory>${air.build.jvmsize}</maxmemory>
                         <doclint>${air.javadoc.lint}</doclint>
+                        <notimestamp>true</notimestamp>
                         <additionalOptions>${surefireEnablePreview}</additionalOptions>
                     </configuration>
                     <executions>
@@ -885,9 +887,8 @@
                                 <addClasspath>false</addClasspath>
                             </manifest>
                             <manifestEntries>
-                                <!-- This is actually the time when the build was done -->
-                                <Build-Time>${git.build.time}</Build-Time>
                                 <Git-Commit-Id>${git.commit.id}</Git-Commit-Id>
+                                <Git-Commit-Time>${git.commit.time}</Git-Commit-Time>
                                 <Implementation-Version>${git.commit.id.describe}</Implementation-Version>
                             </manifestEntries>
                         </archive>
@@ -910,11 +911,11 @@
                     <configuration>
                         <!-- Include only properties used above to speed up build (https://github.com/git-commit-id/git-commit-id-maven-plugin/issues/462) -->
                         <includeOnlyProperties>
-                            <includeOnlyProperty>\Qgit.build.time</includeOnlyProperty>
                             <includeOnlyProperty>\Qgit.commit.id</includeOnlyProperty>
+                            <includeOnlyProperty>\Qgit.commit.time</includeOnlyProperty>
                             <includeOnlyProperty>\Qgit.commit.id.describe</includeOnlyProperty>
                         </includeOnlyProperties>
-                        <dateFormat>yyyy-MM-dd'T'HH:mm:ssZZ</dateFormat>
+                        <dateFormat>yyyy-MM-dd'T'HH:mm:ssXXX</dateFormat>
                         <gitDescribe>
                             <tags>true</tags>
                         </gitDescribe>