diff --git a/docker/clixon-dev/Dockerfile b/docker/clixon-dev/Dockerfile
index 26748594..4c7bae43 100644
--- a/docker/clixon-dev/Dockerfile
+++ b/docker/clixon-dev/Dockerfile
@@ -52,9 +52,9 @@ RUN git clone https://github.com/clicon/cligen.git
 
 # Build cligen
 WORKDIR /clixon/cligen
-RUN ./configure --prefix=/clixon/build
+RUN ./configure --prefix=/usr/local
 RUN make
-RUN make install
+RUN make DESTDIR=/clixon/build install
 
 # Need to add www user manually
 RUN adduser -D -H -G www-data www-data
@@ -65,8 +65,8 @@ WORKDIR /clixon/clixon
 COPY clixon .
 
 # Configure, build and install clixon
-RUN ./configure --prefix=/clixon/build --with-cligen=/clixon/build --with-restconf=native --enable-nghttp2 --enable-http1
+RUN ./configure --prefix=/usr/local --with-cligen=/clixon/build/usr/local --with-restconf=native --enable-nghttp2 --enable-http1
 
 RUN make
-RUN make install
+RUN make DESTDIR=/clixon/build install
 
diff --git a/docker/example/Dockerfile b/docker/example/Dockerfile
index 9ddb9cce..147d032f 100644
--- a/docker/example/Dockerfile
+++ b/docker/example/Dockerfile
@@ -64,7 +64,7 @@ WORKDIR /clixon/clixon
 COPY clixon .
 
 # Configure, build and install clixon
-RUN ./configure --prefix=/usr/local --with-cligen=/clixon/build --with-restconf=native --enable-nghttp2 --enable-http1
+RUN ./configure --prefix=/usr/local --with-cligen=/clixon/build/usr/local --with-restconf=native --enable-nghttp2 --enable-http1
 
 RUN make
 RUN make DESTDIR=/clixon/build install
diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile
index 789b00d5..ad95eb14 100644
--- a/docker/test/Dockerfile
+++ b/docker/test/Dockerfile
@@ -74,7 +74,7 @@ WORKDIR /clixon/clixon
 COPY clixon .
 
 # Configure, build and install clixon
-RUN ./configure --prefix=/usr/local --sysconfdir=/etc --with-cligen=/clixon/build --with-yang-standard-dir=/usr/local/share/yang/standard --enable-netsnmp --with-mib-generated-yang-dir=/usr/local/share/mib-yangs/ -without-restconf
+RUN ./configure --prefix=/usr/local --sysconfdir=/etc --with-cligen=/clixon/build/usr/local --with-yang-standard-dir=/usr/local/share/yang/standard --enable-netsnmp --with-mib-generated-yang-dir=/usr/local/share/mib-yangs/ -without-restconf
 RUN make
 RUN make DESTDIR=/clixon/build install
 
diff --git a/docker/test/Dockerfile.fcgi b/docker/test/Dockerfile.fcgi
index fe0d6952..496831e0 100644
--- a/docker/test/Dockerfile.fcgi
+++ b/docker/test/Dockerfile.fcgi
@@ -82,7 +82,7 @@ RUN adduser -D -H -G www-data www-data
 RUN apk add --update nginx
 
 # Configure, build and install clixon
-RUN ./configure --prefix=/usr/local --sysconfdir=/etc --with-cligen=/clixon/build --with-yang-standard-dir=/usr/local/share/yang/standard --enable-netsnmp --with-mib-generated-yang-dir=/usr/local/share/mib-yangs/ --with-restconf=fcgi 
+RUN ./configure --prefix=/usr/local --sysconfdir=/etc --with-cligen=/clixon/build/usr/include --with-yang-standard-dir=/usr/local/share/yang/standard --enable-netsnmp --with-mib-generated-yang-dir=/usr/local/share/mib-yangs/ --with-restconf=fcgi
 RUN make
 RUN make DESTDIR=/clixon/build install
 
diff --git a/docker/test/Dockerfile.native b/docker/test/Dockerfile.native
index 01350ee2..820b0264 100644
--- a/docker/test/Dockerfile.native
+++ b/docker/test/Dockerfile.native
@@ -79,7 +79,7 @@ WORKDIR /clixon/clixon
 COPY clixon .
 
 # Configure, build and install clixon
-RUN ./configure --prefix=/usr/local --sysconfdir=/etc --with-cligen=/clixon/build --with-restconf=native --enable-nghttp2 --enable-http1 --with-yang-standard-dir=/usr/local/share/yang/standard --enable-netsnmp --with-mib-generated-yang-dir=/usr/local/share/mib-yangs/
+RUN ./configure --prefix=/usr/local --sysconfdir=/etc --with-cligen=/clixon/build/usr/local --with-restconf=native --enable-nghttp2 --enable-http1 --with-yang-standard-dir=/usr/local/share/yang/standard --enable-netsnmp --with-mib-generated-yang-dir=/usr/local/share/mib-yangs/
 
 RUN make
 RUN make DESTDIR=/clixon/build install