diff --git a/ovh_orchestrator/__main__.py b/ovh_orchestrator/__main__.py
index f71567b..65a7fac 100644
--- a/ovh_orchestrator/__main__.py
+++ b/ovh_orchestrator/__main__.py
@@ -23,7 +23,7 @@ if __name__ == '__main__':
         # Get image id
         result = client.get(
             '/cloud/project/' + config.ovh_public_cloud_project + '/image',
-            flavorType='s1-2',
+            flavorType=config.ovh_public_cloud_flavor,
             osType='linux',
             region=config.ovh_public_cloud_region,
         )
@@ -52,7 +52,7 @@ if __name__ == '__main__':
         flavor_id = next(
             x['id']
             for x in result
-            if x['name'] == 's1-2'
+            if x['name'] == config.ovh_public_cloud_flavor
         )
 
         # Create instance
diff --git a/run.sh b/run.sh
index 4f44ce5..d8feebb 100755
--- a/run.sh
+++ b/run.sh
@@ -23,7 +23,7 @@ if [ "$1" == "" ] || [ $# -gt 1 ]; then
     # Run the build on the OVH instance
     scp -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null" ./build_android.sh ubuntu@${IP_ADDRESS}:~
     # Build /e/ (or edit the BUILD_FLAVOR environment variable)
-    ssh -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null" -f ubuntu@${IP_ADDRESS} 'screen -S build -dm bash BUILD_FLAVOR=e ./build_android.sh'
+    ssh -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null" -f ubuntu@${IP_ADDRESS} 'BUILD_FLAVOR=e screen -S build -dm bash ./build_android.sh'
 else
     IP_ADDRESS="$1"
 fi