diff --git a/packaging/README.md b/packaging/README.md
index 5203531..b075d1a 100644
--- a/packaging/README.md
+++ b/packaging/README.md
@@ -33,14 +33,14 @@ inside the synergy-service directory.
 
 - launch the container
 
-      docker run -i -v /path/to/synergy-service:/tmp/synergy-service \
+      docker run -i -v /path/to/synergy-service:/tmp/synergy \
                  synergy-centos7-builder
 
   You can override the package version that will be set during the packaging
   process by adding `-e "PKG_VERSION=x.y.z"` to the above command line.
   Otherwise, the package version will be set to the latest git tag.
 
-  This actually mount the synergy-service directory to `/tmp/synergy-service` on
+  This actually mount the synergy-service directory to `/tmp/synergy` on
   the guest.
 
 - the resulting rpm should be in the build directory if successful
@@ -59,7 +59,7 @@ inside the synergy-service directory.
 
 - launch the container
 
-      docker run -i -v /path/to/synergy-service:/tmp/synergy-service \
+      docker run -i -v /path/to/synergy-service:/tmp/synergy \
                  synergy-ubuntu14.04-builder
 
   You can override the package version that will be set during the packaging
diff --git a/packaging/docker/centos7/Dockerfile b/packaging/docker/centos7/Dockerfile
index 051c992..0dde077 100644
--- a/packaging/docker/centos7/Dockerfile
+++ b/packaging/docker/centos7/Dockerfile
@@ -7,7 +7,7 @@ RUN yum install -y centos-release-openstack-liberty \
                    git-core \
     && yum update -y
 RUN yum install -y python-pbr  # Needs centos-release-openstack-* to be installed first
-RUN mkdir /tmp/synergy-service
+RUN mkdir /tmp/synergy
 RUN useradd -m -p pkger pkger
 USER pkger
 COPY build.sh /home/pkger/
diff --git a/packaging/docker/centos7/build.sh b/packaging/docker/centos7/build.sh
index ba43cf9..0e3fe74 100644
--- a/packaging/docker/centos7/build.sh
+++ b/packaging/docker/centos7/build.sh
@@ -2,7 +2,7 @@
 set -e -x
 
 RPMBUILD=/home/pkger/rpmbuild
-PKG_DIR=/tmp/synergy-service
+PKG_DIR=/tmp/synergy
 
 function get_version() {
     if [[ -z $PKG_VERSION ]]; then
diff --git a/packaging/docker/ubuntu-14.04/Dockerfile b/packaging/docker/ubuntu-14.04/Dockerfile
index 15187fd..646c10b 100644
--- a/packaging/docker/ubuntu-14.04/Dockerfile
+++ b/packaging/docker/ubuntu-14.04/Dockerfile
@@ -11,7 +11,7 @@ RUN apt-get update \
                           python-all \
                           python-pbr \
                           python-setuptools
-RUN mkdir /tmp/synergy-service
+RUN mkdir /tmp/synergy
 RUN useradd -m -p pkger pkger
 USER pkger
 COPY build.sh /home/pkger/build.sh
diff --git a/packaging/docker/ubuntu-14.04/build.sh b/packaging/docker/ubuntu-14.04/build.sh
index 03983e0..82a00c6 100644
--- a/packaging/docker/ubuntu-14.04/build.sh
+++ b/packaging/docker/ubuntu-14.04/build.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e -x
 
-PKG_DIR=/tmp/synergy-service
+PKG_DIR=/tmp/synergy
 
 function copy_source() {
     cd /home/pkger