diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro
index 71cab753..f34f07a8 100644
--- a/nymea-app/nymea-app.pro
+++ b/nymea-app/nymea-app.pro
@@ -54,10 +54,8 @@ android {
         FIREBASE_STL_VARIANT = gnustl
     }
 
-    message("Using FIREBASE_STL_VARIANT ($$FIREBASE_STL_VARIANT)")
-
     INCLUDEPATH += /opt/firebase_cpp_sdk/include
-    LIBS += -L/opt/firebase_cpp_sdk/libs/android/armeabi-v7a/$$FIREBASE_STL_VARIANT/ -lfirebase_messaging -lfirebase_app
+    LIBS += -L/opt/firebase_cpp_sdk/libs/android/$$ANDROID_TARGET_ARCH/$$FIREBASE_STL_VARIANT/ -lfirebase_messaging -lfirebase_app
 
     QT += androidextras
     HEADERS += platformintegration/android/platformhelperandroid.h
diff --git a/packaging/android/build.gradle b/packaging/android/build.gradle
index 0833e652..7fbd9137 100644
--- a/packaging/android/build.gradle
+++ b/packaging/android/build.gradle
@@ -69,17 +69,4 @@ android {
     lintOptions {
         abortOnError false
     }
-
-    /***************************************************************************
-     * This is a hack to copy the output apk one level up
-     * old versions of gradle have put it to build/apks/android-build-debug.apk
-     * new versions put it to build/apks/debug/android-build-debug.apk
-     * which breaks qtcreator deployment
-     * Remote this when QtCreator is updated to support new gradle
-     **************************************************************************/
-    applicationVariants.all { variant ->
-        variant.outputs.all {
-            outputFileName = "../" + outputFileName
-        }
-    }
 }