diff --git a/docker/cyborg/cyborg-base/Dockerfile.j2 b/docker/cyborg/cyborg-base/Dockerfile.j2
index 36b0aa0072..51d39fd0fe 100644
--- a/docker/cyborg/cyborg-base/Dockerfile.j2
+++ b/docker/cyborg/cyborg-base/Dockerfile.j2
@@ -23,7 +23,9 @@ ADD cyborg-base-archive /cyborg-base-source
 ] %}
 
 RUN ln -s cyborg-base-source/* cyborg \
-    && {{ macros.install_pip(cyborg_base_pip_packages | customizable("pip_packages")) }}
+    && {{ macros.install_pip(cyborg_base_pip_packages | customizable("pip_packages")) }} \
+    && mkdir -p /etc/cyborg/ \
+    && cp -r /cyborg/etc/cyborg/* /etc/cyborg/
 
 {% endif %}
 
diff --git a/docker/masakari/masakari-base/Dockerfile.j2 b/docker/masakari/masakari-base/Dockerfile.j2
index 3bd6a988c4..841d46dc27 100644
--- a/docker/masakari/masakari-base/Dockerfile.j2
+++ b/docker/masakari/masakari-base/Dockerfile.j2
@@ -52,6 +52,7 @@ ADD masakari-base-archive /masakari-base-source
 RUN ln -s masakari-base-source/* masakari \
     && {{ macros.install_pip(masakari_base_pip_packages | customizable("pip_packages")) }} \
     && mkdir -p /etc/masakari /var/www/cgi-bin/masakari \
+    && cp -r /masakari/etc/masakari/* /etc/masakari/ \
     && chown -R masakari: /etc/masakari /var/www/cgi-bin/masakari
 
 {% endif %}