diff --git a/backend/Dockerfile b/backend/Dockerfile
index 9b871773e..8034cc6f5 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -66,8 +66,8 @@ ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
 # Copy backend source and build release
 COPY . /home/uxbox/backend
 RUN set -ex; \
-    ls -l backend; \
-    bash -c "/home/uxbox/backend/scripts/dist"
+    rm -f Dockerfile docker-entrypoint.sh; \
+    bash -c "/home/uxbox/backend/scripts/dist.sh"
 
 
 
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 3827d7f6d..37ac5457c 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -68,10 +68,10 @@ ENV API_URL http://127.0.0.1:6060/api
 # Copy frontend source and build release
 COPY . /home/uxbox/frontend
 RUN set -ex; \
-    ls -l frontend; \
+    rm -f Dockerfile; \
     cd frontend; \
     sed -i \
-        -e 's/"uxbox.config.url" ".*"/"uxbox.config.url" "${API_URL}/api"/g' \
+        -e 's|"uxbox.config.url" ".*"|"uxbox.config.url" "${API_URL}/api"|g' \
         scripts/figwheel.clj; \
     npm install; \
     npm run dist; \