diff --git a/clearwater-etcd/usr/bin/clearwater-etcdctl b/clearwater-etcd/usr/bin/clearwater-etcdctl
index 2c948d98..9272a7e3 100755
--- a/clearwater-etcd/usr/bin/clearwater-etcdctl
+++ b/clearwater-etcd/usr/bin/clearwater-etcdctl
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Default the etcd version to the latest supported etcd version.
-etcd_version=3.1.7
+etcd_version=3.2.17
 . /etc/clearwater/config
 
 # Work out the IP address to contact etcd on. Look first for
@@ -15,4 +15,4 @@ if [ -z "$target_ip" ]; then
 fi
 
 # Run the real etcdctl.
-/usr/share/clearwater/clearwater-etcd/$etcd_version/etcdctl -C $target_ip:4000 "$@"
+/usr/share/clearwater/clearwater-etcd/$etcd_version/etcdctl -C http://$target_ip:4000 "$@"
diff --git a/clearwater-etcd/usr/share/clearwater/clearwater-etcd/2.2.5/etcdctl b/clearwater-etcd/usr/share/clearwater/clearwater-etcd/3.2.17/etcd
similarity index 52%
rename from clearwater-etcd/usr/share/clearwater/clearwater-etcd/2.2.5/etcdctl
rename to clearwater-etcd/usr/share/clearwater/clearwater-etcd/3.2.17/etcd
index d3016b29..532098e4 100755
Binary files a/clearwater-etcd/usr/share/clearwater/clearwater-etcd/2.2.5/etcdctl and b/clearwater-etcd/usr/share/clearwater/clearwater-etcd/3.2.17/etcd differ
diff --git a/clearwater-etcd/usr/share/clearwater/clearwater-etcd/2.2.5/etcd-dump-logs b/clearwater-etcd/usr/share/clearwater/clearwater-etcd/3.2.17/etcd-dump-logs
similarity index 56%
rename from clearwater-etcd/usr/share/clearwater/clearwater-etcd/2.2.5/etcd-dump-logs
rename to clearwater-etcd/usr/share/clearwater/clearwater-etcd/3.2.17/etcd-dump-logs
index 1b7d2164..871f7dc5 100755
Binary files a/clearwater-etcd/usr/share/clearwater/clearwater-etcd/2.2.5/etcd-dump-logs and b/clearwater-etcd/usr/share/clearwater/clearwater-etcd/3.2.17/etcd-dump-logs differ
diff --git a/clearwater-etcd/usr/share/clearwater/clearwater-etcd/2.2.5/etcd b/clearwater-etcd/usr/share/clearwater/clearwater-etcd/3.2.17/etcdctl
similarity index 59%
rename from clearwater-etcd/usr/share/clearwater/clearwater-etcd/2.2.5/etcd
rename to clearwater-etcd/usr/share/clearwater/clearwater-etcd/3.2.17/etcdctl
index b8019f01..3fb18b6c 100755
Binary files a/clearwater-etcd/usr/share/clearwater/clearwater-etcd/2.2.5/etcd and b/clearwater-etcd/usr/share/clearwater/clearwater-etcd/3.2.17/etcdctl differ
diff --git a/clearwater-etcd/usr/share/clearwater/clearwater-etcd/2.2.5/etcdwrapper b/clearwater-etcd/usr/share/clearwater/clearwater-etcd/3.2.17/etcdwrapper
similarity index 91%
rename from clearwater-etcd/usr/share/clearwater/clearwater-etcd/2.2.5/etcdwrapper
rename to clearwater-etcd/usr/share/clearwater/clearwater-etcd/3.2.17/etcdwrapper
index bbb261a8..f9349c40 100755
--- a/clearwater-etcd/usr/share/clearwater/clearwater-etcd/2.2.5/etcdwrapper
+++ b/clearwater-etcd/usr/share/clearwater/clearwater-etcd/3.2.17/etcdwrapper
@@ -24,6 +24,6 @@ fi
 # write to the pidfile without fear that another etcd process will start
 /usr/share/clearwater/bin/ent_log.py "etcd" CL_ETCD_STARTED
 echo $$ > $PIDFILE
-exec /usr/share/clearwater/clearwater-etcd/2.2.5/etcd $@ >> /var/log/clearwater-etcd/clearwater-etcd.log 2>&1
+exec /usr/share/clearwater/clearwater-etcd/3.2.17/etcd $@ >> /var/log/clearwater-etcd/clearwater-etcd.log 2>&1
 rm $PIDFILE
 /usr/share/clearwater/bin/ent_log.py "etcd" CL_ETCD_EXITED
diff --git a/debian/clearwater-etcd.init.d b/debian/clearwater-etcd.init.d
index 1d758456..2d1bf0e0 100755
--- a/debian/clearwater-etcd.init.d
+++ b/debian/clearwater-etcd.init.d
@@ -38,7 +38,7 @@ USER=$NAME
 LOG_FILE=/var/log/clearwater-etcd/clearwater-etcd-initd.log
 
 # Default the etcd version to the latest supported etcd version.
-etcd_version=3.1.7
+etcd_version=3.2.17
 . /etc/clearwater/config
 
 DAEMON=/usr/share/clearwater/clearwater-etcd/$etcd_version/etcd
@@ -122,7 +122,7 @@ etcdctl_wrapper() {
 
 # Exit if the package is not installed
 if [ ! -x "$DAEMON" ]; then
-  log_info "Invalid etcd version: valid versions are 3.1.7 (recommended) and 2.2.5"
+  log_info "Invalid etcd version: valid versions are 3.2.17 (recommended) and 3.1.7"
   exit 0
 fi
 
@@ -234,7 +234,7 @@ setup_etcdctl_peers()
         do
             if [[ $server != $advertisement_ip ]]
             then
-                ETCDCTL_PEERS="$server:4000,$ETCDCTL_PEERS"
+                ETCDCTL_PEERS="http://$server:4000,$ETCDCTL_PEERS"
             fi
         done
 
@@ -530,7 +530,7 @@ do_decommission()
         #   0 if successful
         #   2 on error
         log_debug "Check cluster is healthy before decommissioning"
-        export ETCDCTL_PEERS=$advertisement_ip:4000
+        export ETCDCTL_PEERS=http://$advertisement_ip:4000
         health=$(etcdctl_wrapper cluster-health)
         if [[ $health =~ unhealthy ]]
         then
diff --git a/src/metaswitch/clearwater/etcd_tests/etcdserver.py b/src/metaswitch/clearwater/etcd_tests/etcdserver.py
index c8d6604a..5eb5e61a 100644
--- a/src/metaswitch/clearwater/etcd_tests/etcdserver.py
+++ b/src/metaswitch/clearwater/etcd_tests/etcdserver.py
@@ -15,7 +15,7 @@
 from shutil import rmtree
 import uuid
 
-base_cmd =              """clearwater-etcd/usr/share/clearwater/clearwater-etcd/3.1.7/etcd --debug --listen-client-urls http://{0}:4000 --advertise-client-urls http://{0}:4000 --listen-peer-urls http://{0}:2380 --initial-advertise-peer-urls http://{0}:2380 --data-dir {2} --name {1}"""
+base_cmd =              """clearwater-etcd/usr/share/clearwater/clearwater-etcd/3.2.17/etcd --debug --listen-client-urls http://{0}:4000 --advertise-client-urls http://{0}:4000 --listen-peer-urls http://{0}:2380 --initial-advertise-peer-urls http://{0}:2380 --data-dir {2} --name {1}"""
 
 first_member_cmd =      base_cmd + """ --initial-cluster-state new --initial-cluster {1}=http://{0}:2380"""
 subsequent_member_cmd = base_cmd + """ --initial-cluster-state existing --initial-cluster {3},{1}=http://{0}:2380"""