diff --git a/.github/workflows/platform_natives.yaml b/.github/workflows/platform_natives.yaml
index 5af8180..fc0388a 100644
--- a/.github/workflows/platform_natives.yaml
+++ b/.github/workflows/platform_natives.yaml
@@ -189,16 +189,25 @@ jobs:
           set -eo pipefail
           echo "REVISION: $REVISION"
           echo "TYPE: $TYPE"
+          
+          mvn -B -f natives/pom.xml -Drevision="$REVISION" -Dnative.type.classifier="$TYPE" clean package
+          mvn org.apache.maven.plugins:maven-deploy-plugin:3.1.1:deploy-file -Durl=https://mvn.mchv.eu/repository/mchv-snapshot \
+                                                                            -DrepositoryId=mchv-snapshot-distribution \
+                                                                            -Dfile=natives/target-$TYPE/tdlight-natives-$REVISION-$TYPE.jar \
+                                                                            -DpomFile=natives/pom.xml \
+                                                                            -Dclassifier=$TYPE \
+                                                                            -Drevision="$REVISION" \
+                                                                            -Dnative.type.classifier="$TYPE"
           if [[ "$TYPE" == "linux-amd64-ssl1"]]; then
-            mvn -B -f natives/pom.xml -Drevision="$REVISION" -Dnative.type.classifier="$TYPE" clean package deploy
-          else
-            mvn -B -f natives/pom.xml -Drevision="$REVISION" -Dnative.type.classifier="$TYPE" clean package
             mvn org.apache.maven.plugins:maven-deploy-plugin:3.1.1:deploy-file -Durl=https://mvn.mchv.eu/repository/mchv-snapshot \
                                                                               -DrepositoryId=mchv-snapshot-distribution \
-                                                                              -Dfile=natives/target-$TYPE/tdlight-natives-$REVISION-$TYPE.jar \
-                                                                              -DpomFile=natives/pom.xml \
-                                                                              -Dclassifier=bin \
-                                                                              -Drevision="$REVISION"
+                                                                              -Dfile=natives/.ci-friendly-pom.xml \
+                                                                              -Dpackaging=pom \
+                                                                              -DgroupId=it.tdlight \
+                                                                              -DartifactId=tdlight-natives \
+                                                                              -Dversion=$REVISION \
+                                                                              -Drevision="$REVISION" \
+                                                                              -Dnative.type.classifier="$TYPE"
           fi
           
           echo "Done."
@@ -213,16 +222,25 @@ jobs:
           set -eo pipefail
           echo "REVISION: $REVISION"
           echo "TYPE: $TYPE"
+          
+          mvn -B -f natives/pom.xml -Drevision="$REVISION" -Dnative.type.classifier="$TYPE" clean package
+          mvn org.apache.maven.plugins:maven-deploy-plugin:3.1.1:deploy-file -Durl=https://mvn.mchv.eu/repository/mchv \
+                                                                            -DrepositoryId=mchv-release-distribution \
+                                                                            -Dfile=natives/target-$TYPE/tdlight-natives-$REVISION-$TYPE.jar \
+                                                                            -DpomFile=natives/pom.xml \
+                                                                            -Dclassifier=$TYPE \
+                                                                            -Drevision="$REVISION" \
+                                                                            -Dnative.type.classifier="$TYPE"
           if [[ "$TYPE" == "linux-amd64-ssl1"]]; then
-            mvn -B -f natives/pom.xml -Drevision="$REVISION" -Dnative.type.classifier="$TYPE" clean package deploy
-          else
-            mvn -B -f natives/pom.xml -Drevision="$REVISION" -Dnative.type.classifier="$TYPE" clean package
             mvn org.apache.maven.plugins:maven-deploy-plugin:3.1.1:deploy-file -Durl=https://mvn.mchv.eu/repository/mchv \
                                                                               -DrepositoryId=mchv-release-distribution \
-                                                                              -Dfile=natives/target-$TYPE/tdlight-natives-$REVISION-$TYPE.jar \
-                                                                              -DpomFile=natives/pom.xml \
-                                                                              -Dclassifier=bin \
-                                                                              -Drevision="$REVISION"
+                                                                              -Dfile=natives/.ci-friendly-pom.xml \
+                                                                              -Dpackaging=pom \
+                                                                              -DgroupId=it.tdlight \
+                                                                              -DartifactId=tdlight-natives \
+                                                                              -Dversion=$REVISION \
+                                                                              -Drevision="$REVISION" \
+                                                                              -Dnative.type.classifier="$TYPE"
           fi
           
           echo "Done."
diff --git a/.github/workflows/tdapi_file.yaml b/.github/workflows/tdapi_file.yaml
index e724683..50fb7c2 100644
--- a/.github/workflows/tdapi_file.yaml
+++ b/.github/workflows/tdapi_file.yaml
@@ -90,15 +90,16 @@ jobs:
           echo "REVISION: $REVISION"
 
           echo "Building standard package"
-          mvn -f api/pom.xml clean package deploy -Drevision="1.0.0.0-SNAPSHOT"
+          mvn -f api/pom.xml clean package deploy -Drevision="$REVISION"
           echo "Deploying legacy package"
-          mvn -f api/pom.xml clean package -Dlegacy=true -Drevision="1.0.0.0-SNAPSHOT"
+          mvn -f api/pom.xml clean package -Dlegacy=true -Drevision="$REVISION"
           mvn org.apache.maven.plugins:maven-deploy-plugin:3.1.1:deploy-file -Durl=https://mvn.mchv.eu/repository/mchv-snapshot \
                                                                             -DrepositoryId=mchv-snapshot-distribution \
-                                                                            -Dfile=api/target/tdlight-api-$REVISION-legacy.jar \
+                                                                            -Dfile=api/target-legacy/tdlight-api-$REVISION-legacy.jar \
                                                                             -DpomFile=api/pom.xml \
-                                                                            -Dclassifier=bin \
-                                                                            -Drevision="1.0.0.0-SNAPSHOT"
+                                                                            -Dclassifier=legacy \
+                                                                            -Drevision="$REVISION" \
+                                                                            -Dlegacy=true
         env:
           MAVEN_USERNAME: ${{ secrets.MCHV_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.MCHV_TOKEN }}
@@ -118,8 +119,9 @@ jobs:
                                                                             -DrepositoryId=mchv-release-distribution \
                                                                             -Dfile=api/target-legacy/tdlight-api-$REVISION-legacy.jar \
                                                                             -DpomFile=api/pom.xml \
-                                                                            -Dclassifier=bin \
-                                                                            -Drevision="$REVISION"
+                                                                            -Dclassifier=legacy \
+                                                                            -Drevision="$REVISION" \
+                                                                            -Dlegacy=true
           
           
           echo "Deploying docs"