diff --git a/.gitignore b/.gitignore
index 747d78b7..f76c0083 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@ lex.*_parse.c
 Makefile
 apps/Makefile
 apps/*/Makefile
-datastore/Makefile
 docker/Makefile
 docker/*/Makefile
 etc/Makefile
@@ -34,11 +33,9 @@ apps/backend/test.c
 apps/cli/clixon_cli
 apps/cli/test
 apps/cli/test.c
-apps/dbctrl/clixon_dbctrl
 apps/netconf/clixon_netconf
 apps/restconf/clixon_restconf
 apps/restconf/clixon_restconf_libhttp
-apps/xmldb/clixon_xmldb
 
 etc/clixonrc
 
diff --git a/docker/main/Dockerfile b/docker/main/Dockerfile
index bb9b0eff..ec17437e 100644
--- a/docker/main/Dockerfile
+++ b/docker/main/Dockerfile
@@ -96,6 +96,7 @@ WORKDIR /clixon/clixon/test
 RUN install -d /clixon/build/bin/test
 RUN install *.sh /clixon/build/bin/test
 RUN install *.exp /clixon/build/bin/test
+RUN install clixon.png /clixon/build/bin/test
 
 # Copy startscript
 WORKDIR /clixon
diff --git a/docker/main/Dockerfile.fcgi b/docker/main/Dockerfile.fcgi
index ba8a5d88..704d7b28 100644
--- a/docker/main/Dockerfile.fcgi
+++ b/docker/main/Dockerfile.fcgi
@@ -97,6 +97,7 @@ WORKDIR /clixon/clixon/test
 RUN install -d /clixon/build/bin/test
 RUN install *.sh /clixon/build/bin/test
 RUN install *.exp /clixon/build/bin/test
+RUN install clixon.png /clixon/build/bin/test
 
 # Copy startscript
 WORKDIR /clixon
diff --git a/docker/main/Dockerfile.native b/docker/main/Dockerfile.native
index ebc3759b..228f9af8 100644
--- a/docker/main/Dockerfile.native
+++ b/docker/main/Dockerfile.native
@@ -104,11 +104,12 @@ RUN make
 RUN make install
 RUN install example.xml /clixon/build/etc/clixon.xml
 
-# Copy tests
+# Copy tests (why not everything?)
 WORKDIR /clixon/clixon/test
 RUN install -d /clixon/build/bin/test
 RUN install *.sh /clixon/build/bin/test
 RUN install *.exp /clixon/build/bin/test
+RUN install clixon.png /clixon/build/bin/test
 
 # Copy startscript
 WORKDIR /clixon