diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5da3fbe..882d75b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,12 +26,12 @@ jobs:
         port: 3000
     - name: Build
       run: |
-        ./gradlew clean build 
+        make build
     - name: test
       run: |
-        ./gradlew  test
+        make test
     - name: Archive artifacts
       uses: actions/upload-artifact@v2
       with:
         name: app
-        path: app/build/outputs/apk/debug/app-debug.apk
+        path: app/build/outputs/aar/conektasdk-debug.aar
diff --git a/Makefile b/Makefile
index a627c44..03e548e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 test:
 	./gradlew  test
+build:
+	./gradlew clean build -x lintDebug
 android:
 	rm -rf src/main/kotlin && \
 	rm -rf docs && \
diff --git a/build.gradle b/build.gradle
index df6e7e3..d447634 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,9 +21,6 @@ android {
             withSourcesJar()
         }
     }
-     lintOptions {
-        baseline file("lint-baseline.xml")
-    }
 }
 
 ext {
diff --git a/config.json b/config.json
index b094b38..d024783 100644
--- a/config.json
+++ b/config.json
@@ -29,6 +29,7 @@
   "openApiNullable" : false,
   "apiVersion" :"application/vnd.conekta-v2.1.0+json",
   "templateDir": "local/templates",
+  "androidGradleVersion": "7.3.1",
   "files": {
         "OasAnyTypeNotMapped.mustache" : {
           "templateType": "SupportingFiles",
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8fad3f5..d951fac 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists