diff --git a/share/pkgs/CentOS/opennebula.sudoers b/share/pkgs/CentOS/opennebula.sudoers
index 129cbb238d..a440487ee2 100644
--- a/share/pkgs/CentOS/opennebula.sudoers
+++ b/share/pkgs/CentOS/opennebula.sudoers
@@ -1,7 +1,7 @@
 Defaults:oneadmin !requiretty
 Defaults:oneadmin secure_path = /sbin:/bin:/usr/sbin:/usr/bin
 
-Cmnd_Alias ONE_MISC = /bin/dd, /sbin/mkfs, /bin/sync
+Cmnd_Alias ONE_MISC = /bin/dd, /sbin/mkfs, /bin/sync, /sbin/mkswap
 Cmnd_Alias ONE_NET = /usr/sbin/brctl, /sbin/ebtables, /sbin/iptables, /sbin/ip, /usr/sbin/ipset
 Cmnd_Alias ONE_LVM = /sbin/lvcreate, /sbin/lvremove, /sbin/lvs, /sbin/vgdisplay, /sbin/lvchange, /sbin/lvscan
 Cmnd_Alias ONE_ISCSI = /sbin/iscsiadm, /usr/sbin/tgt-admin, /usr/sbin/tgtadm
diff --git a/share/pkgs/Debian7/opennebula.sudoers b/share/pkgs/Debian7/opennebula.sudoers
index d93a755d3e..832286454d 100644
--- a/share/pkgs/Debian7/opennebula.sudoers
+++ b/share/pkgs/Debian7/opennebula.sudoers
@@ -1,7 +1,7 @@
 Defaults:oneadmin !requiretty
 Defaults:oneadmin secure_path = /sbin:/bin:/usr/sbin:/usr/bin
 
-Cmnd_Alias ONE_MISC = /bin/dd, /sbin/mkfs, /bin/sync
+Cmnd_Alias ONE_MISC = /bin/dd, /sbin/mkfs, /bin/sync, /sbin/mkswap
 Cmnd_Alias ONE_NET = /sbin/brctl, /sbin/ebtables, /sbin/iptables, /sbin/ip, /usr/sbin/ipset
 Cmnd_Alias ONE_LVM = /sbin/lvcreate, /sbin/lvremove, /sbin/lvs, /sbin/vgdisplay, /sbin/lvchange, /sbin/lvscan
 Cmnd_Alias ONE_ISCSI = /usr/bin/iscsiadm, /usr/sbin/tgt-admin, /usr/sbin/tgtadm
diff --git a/share/pkgs/Debian8/opennebula.sudoers b/share/pkgs/Debian8/opennebula.sudoers
index 8ed60c5d59..673f25b36a 100644
--- a/share/pkgs/Debian8/opennebula.sudoers
+++ b/share/pkgs/Debian8/opennebula.sudoers
@@ -1,7 +1,7 @@
 Defaults:oneadmin !requiretty
 Defaults:oneadmin secure_path = /sbin:/bin:/usr/sbin:/usr/bin
 
-Cmnd_Alias ONE_MISC = /bin/dd, /sbin/mkfs, /bin/sync
+Cmnd_Alias ONE_MISC = /bin/dd, /sbin/mkfs, /bin/sync, /sbin/mkswap
 Cmnd_Alias ONE_NET = /sbin/brctl, /sbin/ebtables, /sbin/iptables, /sbin/ip, /sbin/ipset
 Cmnd_Alias ONE_LVM = /sbin/lvcreate, /sbin/lvremove, /sbin/lvs, /sbin/vgdisplay, /sbin/lvchange, /sbin/lvscan
 Cmnd_Alias ONE_ISCSI = /usr/bin/iscsiadm, /usr/sbin/tgt-admin, /usr/sbin/tgtadm
diff --git a/share/pkgs/Ubuntu/opennebula.sudoers b/share/pkgs/Ubuntu/opennebula.sudoers
index 8ed60c5d59..673f25b36a 100644
--- a/share/pkgs/Ubuntu/opennebula.sudoers
+++ b/share/pkgs/Ubuntu/opennebula.sudoers
@@ -1,7 +1,7 @@
 Defaults:oneadmin !requiretty
 Defaults:oneadmin secure_path = /sbin:/bin:/usr/sbin:/usr/bin
 
-Cmnd_Alias ONE_MISC = /bin/dd, /sbin/mkfs, /bin/sync
+Cmnd_Alias ONE_MISC = /bin/dd, /sbin/mkfs, /bin/sync, /sbin/mkswap
 Cmnd_Alias ONE_NET = /sbin/brctl, /sbin/ebtables, /sbin/iptables, /sbin/ip, /sbin/ipset
 Cmnd_Alias ONE_LVM = /sbin/lvcreate, /sbin/lvremove, /sbin/lvs, /sbin/vgdisplay, /sbin/lvchange, /sbin/lvscan
 Cmnd_Alias ONE_ISCSI = /usr/bin/iscsiadm, /usr/sbin/tgt-admin, /usr/sbin/tgtadm
diff --git a/src/tm_mad/ceph/mkimage b/src/tm_mad/ceph/mkimage
index cf70db999b..90337eadde 100755
--- a/src/tm_mad/ceph/mkimage
+++ b/src/tm_mad/ceph/mkimage
@@ -101,7 +101,7 @@ MKIMAGE_CMD=$(cat <<EOF
 
     if [ "$FSTYPE" = "swap" ]; then
         $SUDO $RBD map $RBD_SOURCE || exit \$?
-        $SUDO $MKSWAP -L swap $DST
+        $SUDO $MKSWAP -L swap /dev/rbd/$RBD_SOURCE
         $SUDO $RBD unmap /dev/rbd/$RBD_SOURCE
     fi
 EOF