diff --git a/.gitignore b/.gitignore
index 058946b..feafeca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,3 +86,5 @@ parent/.classpath
 /.settings/
 /.project
 /.classpath
+
+.flattened-pom.xml
diff --git a/bom/pom.xml b/bom/pom.xml
index 734b404..c51d56f 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -199,14 +199,26 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>com.outbrain.swinfra</groupId>
-				<artifactId>ci-friendly-flatten-maven-plugin</artifactId>
-				<version>1.0.14</version>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
+				<version>1.1.0</version>
+				<configuration>
+					<updatePomFile>true</updatePomFile>
+					<flattenMode>oss</flattenMode>
+				</configuration>
 				<executions>
 					<execution>
+						<id>flatten</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>flatten</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>flatten.clean</id>
+						<phase>clean</phase>
 						<goals>
 							<goal>clean</goal>
-							<goal>flatten</goal>
 						</goals>
 					</execution>
 				</executions>
diff --git a/parent/pom.xml b/parent/pom.xml
index ee12a98..63de7ee 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -3,7 +3,6 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>tdlight-java-parent</artifactId>
-	<version>${revision}</version>
 	<packaging>pom</packaging>
 	<parent>
 		<groupId>it.tdlight</groupId>
diff --git a/tdlib/pom.xml b/tdlib/pom.xml
index eab4579..a3ff9eb 100644
--- a/tdlib/pom.xml
+++ b/tdlib/pom.xml
@@ -253,14 +253,26 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>com.outbrain.swinfra</groupId>
-				<artifactId>ci-friendly-flatten-maven-plugin</artifactId>
-				<version>1.0.14</version>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
+				<version>1.1.0</version>
+				<configuration>
+					<updatePomFile>true</updatePomFile>
+					<flattenMode>oss</flattenMode>
+				</configuration>
 				<executions>
 					<execution>
+						<id>flatten</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>flatten</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>flatten.clean</id>
+						<phase>clean</phase>
 						<goals>
 							<goal>clean</goal>
-							<goal>flatten</goal>
 						</goals>
 					</execution>
 				</executions>
diff --git a/tdlight/pom.xml b/tdlight/pom.xml
index a4f3cbc..cafaea5 100644
--- a/tdlight/pom.xml
+++ b/tdlight/pom.xml
@@ -2,7 +2,6 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>tdlight-java</artifactId>
-	<version>${revision}</version>
 	<name>TDLight Java Wrapper</name>
 	<packaging>jar</packaging>
 	<parent>
@@ -254,14 +253,26 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>com.outbrain.swinfra</groupId>
-				<artifactId>ci-friendly-flatten-maven-plugin</artifactId>
-				<version>1.0.14</version>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
+				<version>1.1.0</version>
+				<configuration>
+					<updatePomFile>true</updatePomFile>
+					<flattenMode>oss</flattenMode>
+				</configuration>
 				<executions>
 					<execution>
+						<id>flatten</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>flatten</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>flatten.clean</id>
+						<phase>clean</phase>
 						<goals>
 							<goal>clean</goal>
-							<goal>flatten</goal>
 						</goals>
 					</execution>
 				</executions>