diff --git a/docker/sourcecode/Dockerfile b/Dockerfile-Source
similarity index 91%
rename from docker/sourcecode/Dockerfile
rename to Dockerfile-Source
index 91d7eab..81b5777 100644
--- a/docker/sourcecode/Dockerfile
+++ b/Dockerfile-Source
@@ -11,7 +11,7 @@
 
 FROM ubuntu:14.04
 
-ADD entrypoint.sh   /entrypoint.sh
+ADD bin/entrypoint.sh   /entrypoint.sh
 
 RUN mkdir -p /docker/code/
 RUN chmod -R 777 /docker/code/
diff --git a/Makefile b/Makefile
index 51de897..1a14bb1 100644
--- a/Makefile
+++ b/Makefile
@@ -37,8 +37,6 @@ rebuild:
 #############################
 
 cloud-build:
-	mkdir -p docker/sourcecode/code
-	rsync -a code/ docker/sourcecode/code/
 	docker-compose --file docker-compose-cloud.yml build
 	docker-compose --file docker-compose-cloud.yml build --no-cache sourcecode
 	docker-compose --file docker-compose-cloud.yml stop
diff --git a/docker/sourcecode/entrypoint.sh b/bin/entrypoint.sh
similarity index 100%
rename from docker/sourcecode/entrypoint.sh
rename to bin/entrypoint.sh
diff --git a/docker-compose-cloud.yml b/docker-compose-cloud.yml
index 6cf123c..b4a6b0a 100644
--- a/docker-compose-cloud.yml
+++ b/docker-compose-cloud.yml
@@ -136,7 +136,8 @@ mysql:
 # sourcecode
 #######################################
 sourcecode:
-  build: docker/sourcecode/
+  build: .
+  dockerfile: Dockerfile-Source
   volumes:
     - /docker/code/
   env_file:
diff --git a/docker/sourcecode/code/.gitkeep b/docker/sourcecode/code/.gitkeep
deleted file mode 100644
index e69de29..0000000