diff --git a/docker_templates/murano/murano-api/Dockerfile.j2 b/docker_templates/murano/murano-api/Dockerfile.j2
index 704743b4dd..3136c77ad0 100644
--- a/docker_templates/murano/murano-api/Dockerfile.j2
+++ b/docker_templates/murano/murano-api/Dockerfile.j2
@@ -2,7 +2,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-murano-base:{{ tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 COPY config-external.sh /opt/kolla/
-
 COPY start.sh /
 
 CMD ["/start.sh"]
diff --git a/docker_templates/murano/murano-base/Dockerfile.j2 b/docker_templates/murano/murano-base/Dockerfile.j2
index bca9b6d033..bb762dd101 100644
--- a/docker_templates/murano/murano-base/Dockerfile.j2
+++ b/docker_templates/murano/murano-base/Dockerfile.j2
@@ -8,16 +8,16 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 
 {% elif install_type == 'source' %}
 
-ADD ./murano.tar /
+ADD murano.tar /
 RUN ln -s /murano-* /murano
 
 RUN cd /murano \
+    && useradd --user-group murano \
     && pip install -r requirements.txt \
-    && pip install /murano \
-    && mkdir /etc/murano \
-    && cd /murano \
-    && tox -e genconfig \
-    && cp -r etc/murano/* /etc/murano/ \
+    && pip install --install-option="--install-scripts=/usr/bin" /murano \
+    && mkdir -p /etc/murano /var/log/murano /home/murano \
+    && cp -r /murano/etc/murano/* /etc/murano/ \
+    && chown -R murano: /etc/murano /var/log/murano /home/murano \
     && rm -rf /root/.cache
 
 {% endif %}
diff --git a/docker_templates/murano/murano-engine/Dockerfile.j2 b/docker_templates/murano/murano-engine/Dockerfile.j2
index 704743b4dd..3136c77ad0 100644
--- a/docker_templates/murano/murano-engine/Dockerfile.j2
+++ b/docker_templates/murano/murano-engine/Dockerfile.j2
@@ -2,7 +2,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-murano-base:{{ tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 COPY config-external.sh /opt/kolla/
-
 COPY start.sh /
 
 CMD ["/start.sh"]