diff --git a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
index 29170d325..7b5472d73 100644
--- a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
@@ -62,10 +62,8 @@ $configFiles = array(AirtimeIni::CONF_FILE_AIRTIME,
 * This function creates the /etc/airtime configuration folder
 * and copies the default config files to it.
 */
-function CreateIniFiles()
+function CreateIniFiles($suffix)
 {
-    global $AIRTIME_PYTHON_APPS;
-
     if (!file_exists("/etc/airtime/")){
         if (!mkdir("/etc/airtime/", 0755, true)){
             echo "Could not create /etc/airtime/ directory. Exiting.";
@@ -73,20 +71,20 @@ function CreateIniFiles()
         }
     }
 
-    if (!copy(__DIR__."/airtime.conf.180", CONF_FILE_AIRTIME)){
-        echo "Could not copy airtime.conf to /etc/airtime/. Exiting.";
+    if (!copy(__DIR__."/airtime.conf.$suffix", CONF_FILE_AIRTIME)){
+        echo "Could not copy airtime.conf.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
-    if (!copy($AIRTIME_PYTHON_APPS."/pypo/pypo.cfg", CONF_FILE_PYPO)){
-        echo "Could not copy pypo.cfg to /etc/airtime/. Exiting.";
+    if (!copy__DIR__."/pypo.cfg.$suffix", CONF_FILE_PYPO)){
+        echo "Could not copy pypo.cfg.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
-    if (!copy($AIRTIME_PYTHON_APPS."/show-recorder/recorder.cfg", CONF_FILE_RECORDER)){
-        echo "Could not copy recorder.cfg to /etc/airtime/. Exiting.";
+    if (!copy(__DIR__."/recorder.cfg.$suffix", CONF_FILE_RECORDER)){
+        echo "Could not copy recorder.cfg.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
-    if (!copy($AIRTIME_PYTHON_APPS."/pypo/liquidsoap_scripts/liquidsoap.cfg", CONF_FILE_LIQUIDSOAP)){
-        echo "Could not copy liquidsoap.cfg to /etc/airtime/. Exiting.";
+    if (!copy(__DIR__."/liquidsoap.cfg.$suffix", CONF_FILE_LIQUIDSOAP)){
+        echo "Could not copy liquidsoap.cfg.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
 }
@@ -201,7 +199,8 @@ foreach ($configFiles as $conf) {
     }
 }
 
-CreateIniFiles();
+$suffix = "180";
+CreateIniFiles($suffix);
 echo "* Initializing INI files".PHP_EOL;
 MergeConfigFiles($configFiles, $suffix);
 
diff --git a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
index 2b4764db2..828fe5af2 100644
--- a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
@@ -114,10 +114,8 @@ function LoadConfig($CC_CONFIG) {
  * This function creates the /etc/airtime configuration folder
  * and copies the default config files to it.
  */
-function CreateIniFiles()
+function CreateIniFiles($suffix)
 {
-    global $AIRTIME_PYTHON_APPS;
-
     if (!file_exists("/etc/airtime/")){
         if (!mkdir("/etc/airtime/", 0755, true)){
             echo "Could not create /etc/airtime/ directory. Exiting.";
@@ -125,20 +123,20 @@ function CreateIniFiles()
         }
     }
 
-    if (!copy(__DIR__."/airtime.conf.181", CONF_FILE_AIRTIME)){
-        echo "Could not copy airtime.conf to /etc/airtime/. Exiting.";
+    if (!copy(__DIR__."/airtime.conf.$suffix", CONF_FILE_AIRTIME)){
+        echo "Could not copy airtime.conf.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
-    if (!copy($AIRTIME_PYTHON_APPS."/pypo/pypo.cfg", CONF_FILE_PYPO)){
-        echo "Could not copy pypo.cfg to /etc/airtime/. Exiting.";
+    if (!copy__DIR__."/pypo.cfg.$suffix", CONF_FILE_PYPO)){
+        echo "Could not copy pypo.cfg.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
-    if (!copy($AIRTIME_PYTHON_APPS."/show-recorder/recorder.cfg", CONF_FILE_RECORDER)){
-        echo "Could not copy recorder.cfg to /etc/airtime/. Exiting.";
+    if (!copy(__DIR__."/recorder.cfg.$suffix", CONF_FILE_RECORDER)){
+        echo "Could not copy recorder.cfg.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
-    if (!copy($AIRTIME_PYTHON_APPS."/pypo/liquidsoap_scripts/liquidsoap.cfg", CONF_FILE_LIQUIDSOAP)){
-        echo "Could not copy liquidsoap.cfg to /etc/airtime/. Exiting.";
+    if (!copy(__DIR__."/liquidsoap.cfg.$suffix", CONF_FILE_LIQUIDSOAP)){
+        echo "Could not copy liquidsoap.cfg.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
 }
@@ -226,7 +224,8 @@ foreach ($configFiles as $conf) {
     }
 }
 
-CreateIniFiles();
+$suffix = "181";
+CreateIniFiles($suffix);
 echo "* Initializing INI files".PHP_EOL;
 MergeConfigFiles($configFiles, $suffix);
 
diff --git a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
index 0f88c22c3..8ce224bbe 100644
--- a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
@@ -114,10 +114,8 @@ function LoadConfig($CC_CONFIG) {
  * This function creates the /etc/airtime configuration folder
  * and copies the default config files to it.
  */
-function CreateIniFiles()
+function CreateIniFiles($suffix)
 {
-    global $AIRTIME_PYTHON_APPS;
-
     if (!file_exists("/etc/airtime/")){
         if (!mkdir("/etc/airtime/", 0755, true)){
             echo "Could not create /etc/airtime/ directory. Exiting.";
@@ -125,20 +123,20 @@ function CreateIniFiles()
         }
     }
 
-    if (!copy(__DIR__."/airtime.conf.182", CONF_FILE_AIRTIME)){
-        echo "Could not copy airtime.conf to /etc/airtime/. Exiting.";
+    if (!copy(__DIR__."/airtime.conf.$suffix", CONF_FILE_AIRTIME)){
+        echo "Could not copy airtime.conf.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
-    if (!copy($AIRTIME_PYTHON_APPS."/pypo/pypo.cfg", CONF_FILE_PYPO)){
-        echo "Could not copy pypo.cfg to /etc/airtime/. Exiting.";
+    if (!copy__DIR__."/pypo.cfg.$suffix", CONF_FILE_PYPO)){
+        echo "Could not copy pypo.cfg.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
-    if (!copy($AIRTIME_PYTHON_APPS."/show-recorder/recorder.cfg", CONF_FILE_RECORDER)){
-        echo "Could not copy recorder.cfg to /etc/airtime/. Exiting.";
+    if (!copy(__DIR__."/recorder.cfg.$suffix", CONF_FILE_RECORDER)){
+        echo "Could not copy recorder.cfg.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
-    if (!copy($AIRTIME_PYTHON_APPS."/pypo/liquidsoap_scripts/liquidsoap.cfg", CONF_FILE_LIQUIDSOAP)){
-        echo "Could not copy liquidsoap.cfg to /etc/airtime/. Exiting.";
+    if (!copy(__DIR__."/liquidsoap.cfg.$suffix", CONF_FILE_LIQUIDSOAP)){
+        echo "Could not copy liquidsoap.cfg.$suffix to /etc/airtime/. Exiting.";
         exit(1);
     }
 }
@@ -225,7 +223,8 @@ foreach ($configFiles as $conf) {
     }
 }
 
-CreateIniFiles();
+$suffix = "182";
+CreateIniFiles($suffix);
 echo "* Initializing INI files".PHP_EOL;
 MergeConfigFiles($configFiles, $suffix);
 
diff --git a/install_minimal/upgrades/airtime-1.9.0/airtime-monit.cfg.190 b/install_minimal/upgrades/airtime-1.9.0/airtime-monit.cfg.190
new file mode 100644
index 000000000..22f05e2ca
--- /dev/null
+++ b/install_minimal/upgrades/airtime-1.9.0/airtime-monit.cfg.190
@@ -0,0 +1,23 @@
+ set daemon 10 # Poll at 10 second intervals
+ set logfile syslog facility log_daemon
+
+ set httpd port 2812 and use address 127.0.0.1
+    allow localhost
+    allow admin:monit
+
+ check process airtime-playout
+    with pidfile "/var/run/airtime-playout.pid"
+    start program = "/etc/init.d/airtime-playout start" with timeout 10 seconds
+    stop program = "/etc/init.d/airtime-playout stop"
+ check process airtime-liquidsoap
+    with pidfile "/var/run/airtime-liquidsoap.pid"
+    start program = "/etc/init.d/airtime-playout start" with timeout 10 seconds
+    stop program = "/etc/init.d/airtime-playout stop"
+# check process airtime-media-monitor
+#    with pidfile "/var/run/airtime-media-monitor.pid"
+#    start program = "/etc/init.d/airtime-media-monitor start" with timeout 10 seconds
+#    stop program = "/etc/init.d/airtime-media-monitor stop"
+ check process airtime-show-recorder
+    with pidfile "/var/run/airtime-show-recorder.pid"
+    start program = "/etc/init.d/airtime-show-recorder start" with timeout 10 seconds
+    stop program = "/etc/init.d/airtime-show-recorder stop"
diff --git a/install_minimal/upgrades/airtime-1.9.0/api_client.cfg.190 b/install_minimal/upgrades/airtime-1.9.0/api_client.cfg.190
new file mode 100644
index 000000000..7c94e34c2
--- /dev/null
+++ b/install_minimal/upgrades/airtime-1.9.0/api_client.cfg.190
@@ -0,0 +1,110 @@
+bin_dir = "/usr/lib/airtime/api_clients"
+
+#############################
+## Common
+#############################
+
+# Value needed to access the API
+api_key = 'AAA'
+
+# Path to the base of the API
+api_base = 'api'
+
+# URL to get the version number of the server API
+version_url = 'version/api_key/%%api_key%%'
+
+# Hostname
+base_url = 'localhost'
+base_port = 80
+
+#############################
+## Config for Media Monitor
+#############################
+
+# URL to setup the media monitor
+media_setup_url = 'media-monitor-setup/format/json/api_key/%%api_key%%'
+
+# Tell Airtime the file id associated with a show instance.
+upload_recorded = 'upload-recorded/format/json/api_key/%%api_key%%/fileid/%%fileid%%/showinstanceid/%%showinstanceid%%'
+
+# URL to tell Airtime to update file's meta data
+update_media_url = 'reload-metadata/format/json/api_key/%%api_key%%/mode/%%mode%%'
+
+# URL to tell Airtime we want a listing of all files it knows about
+list_all_db_files = 'list-all-files/format/json/api_key/%%api_key%%/dir_id/%%dir_id%%'
+
+# URL to tell Airtime we want a listing of all dirs its watching (including the stor dir)
+list_all_watched_dirs = 'list-all-watched-dirs/format/json/api_key/%%api_key%%'
+
+# URL to tell Airtime we want to add watched directory
+add_watched_dir = 'add-watched-dir/format/json/api_key/%%api_key%%/path/%%path%%'
+
+# URL to tell Airtime we want to add watched directory
+remove_watched_dir = 'remove-watched-dir/format/json/api_key/%%api_key%%/path/%%path%%'
+
+# URL to tell Airtime we want to add watched directory
+set_storage_dir = 'set-storage-dir/format/json/api_key/%%api_key%%/path/%%path%%'
+
+
+#############################
+## Config for Recorder
+#############################
+
+# URL to get the schedule of shows set to record
+show_schedule_url = 'recorded-shows/format/json/api_key/%%api_key%%'
+
+# URL to upload the recorded show's file to Airtime
+upload_file_url = 'upload-file/format/json/api_key/%%api_key%%'
+
+#number of retries to upload file if connection problem
+upload_retries = 3
+
+#time to wait between attempts to upload file if connection problem (in seconds)
+upload_wait = 60
+
+################################################################################
+# Uncomment *one of the sets* of values from the API clients below, and comment
+# out all the others.
+################################################################################
+
+#############################
+## Config for Pypo
+#############################
+
+# Schedule export path.
+# %%from%% - starting date/time in the form YYYY-MM-DD-hh-mm
+# %%to%% - starting date/time in the form YYYY-MM-DD-hh-mm
+export_url = 'schedule/api_key/%%api_key%%'
+
+get_media_url = 'get-media/file/%%file%%/api_key/%%api_key%%'
+
+# Update whether a schedule group has begun playing.
+update_item_url = 'notify-schedule-group-play/api_key/%%api_key%%/schedule_id/%%schedule_id%%'
+
+# Update whether an audio clip is currently playing.
+update_start_playing_url = 'notify-media-item-start-play/api_key/%%api_key%%/media_id/%%media_id%%/schedule_id/%%schedule_id%%'
+
+# ???
+generate_range_url = 'generate_range_dp.php'
+
+
+##############
+# OBP config #
+##############
+
+# URL to get the version number of the server API
+#version_url = 'api/pypo/status/json'
+
+# Schedule export path.
+# %%from%% - starting date/time in the form YYYY-MM-DD-hh-mm
+# %%to%% - starting date/time in the form YYYY-MM-DD-hh-mm
+
+# Update whether an item has been played.
+#update_item_url = 'api/pypo/update_shedueled_item/$$item_id%%?played=%%played%%' 
+
+# Update whether an item is currently playing.
+#update_start_playing_url = 'api/pypo/mod/medialibrary/?playlist_type=%%playlist_type%%&export_source=%%export_source%%&media_id=%%media_id%%&playlist_id=%%playlist_id%%&transmission_id=%%transmission_id%%'
+
+# ???
+#generate_range_url = 'api/pypo/generate_range_dp/'
+