diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f32e31a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.idea/
+.DS_Store
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 74d32b9..aff5984 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# Applivery iOS Deploy Step
+# Applivery Android Deploy Step
 
-This is the new and official [Applivery.com](http://www.applivery.com) step to deploy iOS Apps in [Bitrise.io](http://bitrise.io).
+This is the new and official [Applivery.com](http://www.applivery.com) step to deploy Android Apps in [Bitrise.io](http://bitrise.io).
 
 ## How to use this Step
 
diff --git a/bitrise.yml b/bitrise.yml
index c0a95ca..c337113 100644
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -4,7 +4,7 @@ default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git
 app:
   envs:
   # define these in your .bitrise.secrets.yml
-  - IPA_PATH: $IPA_PATH
+  - APK_PATH: $APK_PATH
   - API_TOKEN: $API_TOKEN
   - APP_ID: $APP_ID
 
@@ -18,7 +18,7 @@ workflows:
           - is_create_path: true
       - path::./:
           inputs:
-          - ipa_path: "${IPA_PATH}"
+          - apk_path: "${$APK_PATH}"
           - api_token: "${APPLIVERY_API_TOKEN}"
           - app_id: "${APPLIVERY_APP_ID}"
       - script:
diff --git a/step.sh b/step.sh
index 265ffd4..6d930fb 100644
--- a/step.sh
+++ b/step.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo "=> Starting Applivery iOS Deploy"
+echo "=> Starting Applivery Android Deploy"
 
 THIS_SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
@@ -14,9 +14,9 @@ function echoStatusFailed {
 ############# VALIDATIONS ##############
 
 # IPA
-if [ ! -f "${ipa_path}" ] ; then
+if [ ! -f "${apk_path}" ] ; then
   echo "# Error"
-  echo "* No IPA found to deploy. Specified path was: ${ipa_path}"
+  echo "* No IPA found to deploy. Specified path was: ${apk_path}"
   echoStatusFailed
   exit 1
 fi
@@ -51,7 +51,7 @@ echo "* notes: ${notes}"
 echo "* notify: ${notify}"
 echo "* os: ${os}"
 echo "* tags: ${tags}"
-echo "* ipa_path: ${ipa_path}"
+echo "* apk_path: ${apk_path}"
 echo
 
 ###########################
@@ -62,9 +62,9 @@ curl_cmd="$curl_cmd -F \"app=${app_id}\""
 curl_cmd="$curl_cmd -F \"versionName=${version_name}\""
 curl_cmd="$curl_cmd -F \"notes=${notes}\""
 curl_cmd="$curl_cmd -F \"notify=${notify}\""
-curl_cmd="$curl_cmd -F \"os=ios\""
+curl_cmd="$curl_cmd -F \"os=android\""
 curl_cmd="$curl_cmd -F \"tags=${tags}\""
-curl_cmd="$curl_cmd -F \"package=@${ipa_path}\""
+curl_cmd="$curl_cmd -F \"package=@${apk_path}\""
 curl_cmd="$curl_cmd https://dashboard.applivery.com/api/builds"
 
 echo
diff --git a/step.yml b/step.yml
index 8670651..3daf016 100644
--- a/step.yml
+++ b/step.yml
@@ -1,32 +1,32 @@
-title: "Applivery.com iOS Deploy"
-summary: Deploy your awesome iOS Application to Applivery.com
+title: "Applivery.com Android Deploy"
+summary: Deploy your awesome Android Application to Applivery.com
 description: |-
-  Deploy an iOS application to [Applivery](http://www.applivery.com),
+  Deploy an Android application to [Applivery](http://www.applivery.com),
   add notes and notify testers.
 
   Register a Applivery account at [http://www.applivery..com/](http://www.applivery.com)
   and create an App to utilize this step.
 
   You also need to get your *Account API Key* for you account and the *App Id* for the app.
-website: https://github.com/applivery/steps-applivery-ios-deploy
-source_code_url: https://github.com/applivery/steps-applivery-ios-deploy
-support_url: https://github.com/applivery/steps-applivery-ios-deploy/issues
+website: https://github.com/applivery/steps-applivery-android-deploy
+source_code_url: https://github.com/applivery/steps-applivery-android-deploy
+support_url: https://github.com/applivery/steps-applivery-android-deploy/issues
 host_os_tags:
+  - ubuntu
   - osx-10.10
 project_type_tags:
-  - ios
+  - android
 type_tags:
   - deploy
   - Applivery
-  - iOS
 is_requires_admin_user: false
 is_always_run: false
 is_skippable: false
 run_if: ".IsCI"
 inputs:
-  - ipa_path: "$BITRISE_IPA_PATH"
+  - apk_path: "$BITRISE_IPA_PATH"
     opts:
-      title: "IPA file path"
+      title: "APK file path"
       summary: ""
       description: ""
       is_required: true
@@ -56,7 +56,7 @@ inputs:
         click on Applications menu option from the left side menu, click on the desired App.
         You'll find the App Id inside the (i) information block (written in red).
       is_required: false
-  - notes: "Deployed with Bitrise Applivery.com iOS Deploy Step."
+  - notes: "Deployed with Bitrise Applivery.com Android Deploy Step."
     opts:
       title: "Notes attached to the deploy"
       summary: ""