diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed28216e..b961882e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -127,7 +127,8 @@
   * Syntactically Correct handling of '<?' (processing instructions) and '<?xml' (XML declaration)
   * XML prolog syntax for 'well-formed' XML
   * `<!DOCTYPE` (ie DTD) is not supported.
-* Added Clixon example full system docker container, see [docker/system].
+* Added Clixon example full system docker container, see [docker/system](docker/system).
+* Changed clixon base system container to use Alpine [docker/base](docker/base).
 * clixon-config YAML file has new revision: 2019-02-06.
 * Replaced all calls to (obsolete) `cli_output` with `fprintf`
 * Added _experimental_ config option `CLICON_CLI_UTF8` default set to 0.
diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index 031459dd..73dc1783 100644
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -31,14 +31,14 @@
 # ***** END LICENSE BLOCK *****
 #
 
-FROM debian
+FROM alpine
 MAINTAINER Olof Hagsand <olof@hagsand.se>
-ENV DEBIAN_FRONTEND noninteractive
 
-RUN apt-get update && apt-get install -y \
-  git make gcc flex bison \
-  libfcgi-dev \
-  libcurl4-openssl-dev
+# For clixon and cligen
+RUN apk add --update git make build-base gcc flex bison fcgi-dev curl-dev
+
+# For debug
+RUN apk add --update bash nano
 
 # Create a directory to hold source-code, dependencies etc
 RUN mkdir /clixon
@@ -58,15 +58,12 @@ RUN mkdir /clixon/clixon
 WORKDIR /clixon/clixon
 COPY clixon .
 
-# Build clixon
-RUN ./configure
+# Build clixon (without restconf if you dont have nginx)
+RUN ./configure --without-restconf
 RUN make
 RUN make install
 RUN make install-include
 
-RUN rm -rf /clixon
-
-RUN ldconfig
 
 
 
diff --git a/docker/base/Makefile.in b/docker/base/Makefile.in
index d5984bbd..87f1889d 100644
--- a/docker/base/Makefile.in
+++ b/docker/base/Makefile.in
@@ -39,7 +39,7 @@ LDFLAGS 	= @LDFLAGS@
 LIBS    	= @LIBS@
 
 # docker.hub image. PLEASE CHANGE THIS IF YOU PUSH YOUR OWN
-IMG   = olofhagsand/clixon # base image
+IMG   = clixon/clixon # base image
 
 SHELL	= /bin/sh
 
@@ -53,6 +53,7 @@ clixon:
 	git clone file://$(realpath ${top_srcdir})
 
 clean:
+	rm -rf clixon # clone of top-srcdir
 
 distclean: clean
 	rm -f Makefile *~ .depend
@@ -61,7 +62,7 @@ docker: clixon Dockerfile
 	sudo docker build -t $(IMG) .  # --no-cache
 
 push:
-
+	sudo docker push $(IMG)
 depend:
 
 install-include:
diff --git a/docker/base/README.md b/docker/base/README.md
index b9062bb5..7b4fa61a 100644
--- a/docker/base/README.md
+++ b/docker/base/README.md
@@ -1,7 +1,7 @@
 # Clixon base docker image
 
 This directory contains code for building and pushing the clixon base docker
-container. By default it is pushed to olofhagsand/clixon, but you can change
+container. By default it is pushed to docker hub clixon/clixon, but you can change
 the IMAGE in Makefile.in and push it to another name.
 
 The clixon docker base image can be used to build clixon