diff --git a/ChangeLog b/ChangeLog
index 5537d2c..d192d02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2.3-3:
+  * Use customized command line for Azure images
+  * Update cctools
+
+2.3-2:
+  * Update cctools
+
+2.3-1:
+  * Update cctools
+
 2.3-0:
   * Docker: update parrot for fix of #919
   * Docker: look for x32 ELF interpreter
diff --git a/Makefile b/Makefile
index a5a9208..ac43895 100644
--- a/Makefile
+++ b/Makefile
@@ -135,8 +135,16 @@ $(IMAGE_DIR)/$(IMAGE_NAME).vdi: $(IMAGE_DIR)/$(IMAGE_NAME).hdd
 	rm -f $(IMAGE_DIR)/$(IMAGE_NAME).hdd.working
 
 $(IMAGE_DIR)/$(IMAGE_NAME).vhd: $(IMAGE_DIR)/$(IMAGE_NAME).hdd
-	rm -f $(IMAGE_DIR)/$(IMAGE_NAME).vhd $(IMAGE_DIR)/$(IMAGE_NAME)-working.vdi $(IMAGE_DIR)/$(IMAGE_NAME).hdd.workin
+	rm -f $(IMAGE_DIR)/$(IMAGE_NAME).vhd $(IMAGE_DIR)/$(IMAGE_NAME)-working.vdi $(IMAGE_DIR)/$(IMAGE_NAME).hdd.working tmp/azure/mountpoint
+	mkdir -p tmp/azure/mountpoint
 	cp $(IMAGE_DIR)/$(IMAGE_NAME).hdd $(IMAGE_DIR)/$(IMAGE_NAME).hdd.working
+	losetup -o 512 /dev/loop5 $(IMAGE_DIR)/$(IMAGE_NAME).hdd.working
+	mount /dev/loop5 tmp/azure/mountpoint
+	cat tmp/azure/mountpoint/isolinux/syslinux.cfg | sed s/console=tty0// | sed "s/lastarg/console=ttyS0 earlyprintk=ttyS0 rootdelay=300 numa=off/" > tmp/azure/mountpoint/isolinux/syslinux.cfg~
+	mv tmp/azure/mountpoint/isolinux/syslinux.cfg~ tmp/azure/mountpoint/isolinux/syslinux.cfg
+	cat tmp/azure/mountpoint/isolinux/syslinux.cfg
+	umount tmp/azure/mountpoint && rmdir tmp/azure/mountpoint
+	losetup -d /dev/loop5
 	while pgrep VBoxSVC > /dev/null; do true; done
 	VBoxManage convertfromraw $(IMAGE_DIR)/$(IMAGE_NAME).hdd.working $(IMAGE_DIR)/$(IMAGE_NAME)-working.vdi
 	while pgrep VBoxSVC > /dev/null; do true; done
diff --git a/config.mk b/config.mk
index 3b90fb1..68f1873 100644
--- a/config.mk
+++ b/config.mk
@@ -11,8 +11,8 @@ DROPBEAR_UPSTREAM_VERSION = 2015.67
 DROPBEAR_RELEASE = 1
 PATCHELF_UPSTREAM_VERSION = 0.8
 PATCHELF_RELEASE = 1
-PARROT_UPSTREAM_VERSION = 5.2.0
-PARROT_RELEASE = 2
+PARROT_UPSTREAM_VERSION = 5.2.1
+PARROT_RELEASE = 1
 NTPCLIENT_UPSTREAM_VERSION = 2010
 NTPCLIENT_RELEASE = 1
 DHCLIENT_UPSTREAM_VERSION = 4.3.1
@@ -30,10 +30,10 @@ EXTRAS_VERSION = 1.0
 CERNVM_INCREASE_RELEASE = 0
 
 CERNVM_SYSTEM = HEAD
-#CERNVM_BRANCHES = devel
-#IMAGE_FORMATS = iso ova
-CERNVM_BRANCHES = testing devel prod slc4 slc5 sl7
-IMAGE_FORMATS = iso hdd fat vdi vhd vmdk tar.gz ova box
+CERNVM_BRANCHES = prod
+IMAGE_FORMATS = vhd
+#CERNVM_BRANCHES = testing devel prod slc4 slc5 sl7
+#IMAGE_FORMATS = iso hdd fat vdi vhd vmdk tar.gz ova box
 
 SIGNING_SERVER = cvm-sign01.cern.ch
 SINGING_URL = https://$(SIGNING_SERVER)/cgi-bin/cernvm/sign-image
diff --git a/packages.d/parrot/config.mk b/packages.d/parrot/config.mk
index a3300b7..2b3eea2 100644
--- a/packages.d/parrot/config.mk
+++ b/packages.d/parrot/config.mk
@@ -1,5 +1,5 @@
 PARROT_GIT = https://github.com/cooperative-computing-lab/cctools.git
-PARROT_TREEISH = 3de4f819ad
+PARROT_TREEISH = 9b6a0d012ad
 PARROT_SOURCETREE = parrot-$(PARROT_TREEISH)
 
 LIBCVMFS_GIT = https://github.com/cvmfs/cvmfs.git
diff --git a/release b/release
index 573541a..00750ed 100644
--- a/release
+++ b/release
@@ -1 +1 @@
-0
+3