diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 821be05cfb2..34f166a7fb6 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -382,6 +382,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
 
     public static final String CHECKPOINT_DELETE_COMMAND = "virsh checkpoint-delete --domain %s --checkpointname %s  --metadata";
 
+    public static final int IMAGE_SERVER_DEFAULT_PORT = 54322;
+
     protected int qcow2DeltaMergeTimeout;
 
     private String modifyVlanPath;
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateImageTransferCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateImageTransferCommandWrapper.java
index 71beafe9fa1..859b7498859 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateImageTransferCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateImageTransferCommandWrapper.java
@@ -135,7 +135,7 @@ public class LibvirtCreateImageTransferCommandWrapper extends CommandWrapper<Cre
             }
         }
 
-        final int imageServerPort = 54323;
+        final int imageServerPort = LibvirtComputingResource.IMAGE_SERVER_DEFAULT_PORT;
         if (!startImageServerIfNotRunning(imageServerPort, resource)) {
             return new CreateImageTransferAnswer(cmd, false, "Failed to start image server.");
         }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtFinalizeImageTransferCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtFinalizeImageTransferCommandWrapper.java
index 3f0026ae38f..240dc362219 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtFinalizeImageTransferCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtFinalizeImageTransferCommandWrapper.java
@@ -41,7 +41,7 @@ public class LibvirtFinalizeImageTransferCommandWrapper extends CommandWrapper<F
 
     private boolean stopImageServer() {
         String unitName = "cloudstack-image-server";
-        final int imageServerPort = 54323;
+        final int imageServerPort = LibvirtComputingResource.IMAGE_SERVER_DEFAULT_PORT;
 
         Script checkScript = new Script("/bin/bash", logger);
         checkScript.add("-c");
diff --git a/scripts/vm/hypervisor/kvm/imageserver/__init__.py b/scripts/vm/hypervisor/kvm/imageserver/__init__.py
index 69eec98956a..dc950531039 100644
--- a/scripts/vm/hypervisor/kvm/imageserver/__init__.py
+++ b/scripts/vm/hypervisor/kvm/imageserver/__init__.py
@@ -31,7 +31,7 @@ Supports two backends (configured per-transfer at registration time):
 Usage::
 
     # As a module
-    python -m imageserver --listen 127.0.0.1 --port 54323
+    python -m imageserver --listen 127.0.0.1 --port 54322
 
     # Or via the systemd service started by createImageTransfer
 """
diff --git a/scripts/vm/hypervisor/kvm/imageserver/constants.py b/scripts/vm/hypervisor/kvm/imageserver/constants.py
index 6e0ae03a0b5..33cf3001d7a 100644
--- a/scripts/vm/hypervisor/kvm/imageserver/constants.py
+++ b/scripts/vm/hypervisor/kvm/imageserver/constants.py
@@ -28,7 +28,7 @@ MAX_PARALLEL_WRITES = 1
 
 # HTTP server defaults
 DEFAULT_LISTEN_ADDRESS = "127.0.0.1"
-DEFAULT_HTTP_PORT = 54323
+DEFAULT_HTTP_PORT = 54322
 
 # Control socket
 CONTROL_SOCKET = "/var/run/cloudstack/image-server.sock"