diff --git a/6/s2i/bin/assemble b/6/s2i/bin/assemble
index f575991..76925ff 100755
--- a/6/s2i/bin/assemble
+++ b/6/s2i/bin/assemble
@@ -2,9 +2,11 @@
 
 set -e
 
-echo "---> Copying varnish configuration files..."
+shopt -s dotglob
+echo "---> Installing application source..."
 rm -rf "${VARNISH_CONFIGURATION_PATH}/default.vcl"
-cp -Rfv /tmp/src/. "${VARNISH_CONFIGURATION_PATH}"
+rm -fR /tmp/src/.git
+mv /tmp/src/* "${VARNISH_CONFIGURATION_PATH}"
 
 # Fix source directory permissions
 fix-permissions ./
diff --git a/7/s2i/bin/assemble b/7/s2i/bin/assemble
index f575991..76925ff 100755
--- a/7/s2i/bin/assemble
+++ b/7/s2i/bin/assemble
@@ -2,9 +2,11 @@
 
 set -e
 
-echo "---> Copying varnish configuration files..."
+shopt -s dotglob
+echo "---> Installing application source..."
 rm -rf "${VARNISH_CONFIGURATION_PATH}/default.vcl"
-cp -Rfv /tmp/src/. "${VARNISH_CONFIGURATION_PATH}"
+rm -fR /tmp/src/.git
+mv /tmp/src/* "${VARNISH_CONFIGURATION_PATH}"
 
 # Fix source directory permissions
 fix-permissions ./
diff --git a/src/s2i/bin/assemble b/src/s2i/bin/assemble
index d305dea..58f5f0f 100755
--- a/src/s2i/bin/assemble
+++ b/src/s2i/bin/assemble
@@ -2,9 +2,11 @@
 
 set -e
 
-echo "---> Copying varnish configuration files..."
+shopt -s dotglob
+echo "---> Installing application source..."
 rm -rf "${VARNISH_CONFIGURATION_PATH}/default.vcl"
-cp -Rfv /tmp/src/. "${VARNISH_CONFIGURATION_PATH}"
+rm -fR /tmp/src/.git
+mv /tmp/src/* "${VARNISH_CONFIGURATION_PATH}"
 
 # Fix source directory permissions
 fix-permissions ./