diff --git a/customize b/customize
index 03b86ae..31496a9 100755
--- a/customize
+++ b/customize
@@ -2,8 +2,7 @@
 #
 # Put customizations to your image in this file.
 
-#KUMQUAT_VERSION="refs/heads/master"
-KUMQUAT_VERSION='v0.1.57'
+KUMQUAT_VERSION='v0.1.58'
 
 PATH=/opt/local/gnu/bin:/opt/local/bin:/opt/local/sbin:/usr/bin:/usr/sbin
 
@@ -22,8 +21,9 @@ MUNIN_PLUGINS="
 # Exit if any commands fail
 set -o errexit
 
-echo "* Use default python 3.8"
-pkg_alternatives manual python38
+echo "* Use default python 3.9"
+pkg_alternatives manual python39
+pkg_alternatives manual py39-pip
 
 echo "* Configuring image specific packages."
 mkdir -p /opt/kumquat
@@ -42,8 +42,8 @@ echo "* Install missing dependencies via pip"
 gsed -i '/zerorpc.*/d'      /opt/kumquat/requirements.txt
 gsed -i '/cryptography.*/d' /opt/kumquat/requirements.txt
 gsed -i '/mysqlclient.*/d'  /opt/kumquat/requirements.txt
-pip3.8 install -r /opt/kumquat/requirements.txt
-pip3.8 install --no-deps zerorpc==0.6.3
+pip install -r /opt/kumquat/requirements.txt
+pip install --no-deps zerorpc==0.6.3
 
 echo "* Create extra ssl folder for kumquat"
 mkdir -p /opt/local/etc/kumquat/ssl
diff --git a/manifest b/manifest
index 61dca25..50cd3d0 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 name="core-kumquat"
 organization="SkyLime"
 brand="Instance"
-version="20.4.1"
+version="21.4.0"
 description="Standalone web services zone with apache,php,mysql,ftp and management frontend"
 homepage="https://github.com/skylime/mi-core-kumquat"
 users="root admin"
-base="b17e3cc1-5993-4af9-9e5e-70653fa856f6"
+base="ae9666e0-ba7b-4d82-904b-07268877e265"
diff --git a/manifest.json b/manifest.json
index 35b69f0..8214213 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,11 +1,11 @@
 {
 	"name":         "core-kumquat",
-	"version":      "20.4.1",
+	"version":      "21.4.0",
 	"description":  "Standalone web services zone with apache,php,mysql,ftp and management frontend",
 	"organization": "SkyLime",
 	"brand":        "Instance",
 	"homepage":     "https://github.com/skylime/mi-core-kumquat",
-	"base":         "b17e3cc1-5993-4af9-9e5e-70653fa856f6",
+	"base":         "ae9666e0-ba7b-4d82-904b-07268877e265",
 	"customer_metadata": {
 		"admin_authorized_keys": {"type": "text", "description": "SSH public authorized key(s) for the root user"},
 		"root_authorized_keys": {"type": "text", "description": "SSH public authorized key(s) for the root user"},