diff --git a/juju-charms/.gitignore b/juju-charms/.gitignore
new file mode 100644
index 0000000..9f751ef
--- /dev/null
+++ b/juju-charms/.gitignore
@@ -0,0 +1,2 @@
+deps/
+builds/
diff --git a/juju-charms/Dockerfile b/juju-charms/Dockerfile
new file mode 100644
index 0000000..36248e2
--- /dev/null
+++ b/juju-charms/Dockerfile
@@ -0,0 +1,4 @@
+FROM ubuntu:16.04
+
+RUN  apt-get update && apt install -y charm-tools
+
diff --git a/juju-charms/Makefile b/juju-charms/Makefile
index a579390..76d21ac 100644
--- a/juju-charms/Makefile
+++ b/juju-charms/Makefile
@@ -17,12 +17,13 @@
 
 BUILD_DIR = .
 
-CHARMS:= vpe-router vyos-proxy pingpong flownac sandvine-pts-proxy
+CHARMS:= pingpong vyos-proxy netutils
 CHARM_SRC_DIR := layers
 CHARM_BUILD_DIR := $(BUILD_DIR)/builds
 
 CHARM_SRC_DIRS := $(addprefix $(CHARM_SRC_DIR)/, $(CHARMS))
 CHARM_BUILD_DIRS := $(addprefix $(CHARM_BUILD_DIR)/, $(CHARMS))
+CHARM_DOCKER_TAG := charm-tools
 
 all: $(CHARM_BUILD_DIRS)
 
@@ -30,4 +31,5 @@
 	-@ $(RM) -rf $(CHARM_BUILD_DIR)
 
 $(CHARM_BUILD_DIR)/%: $(CHARM_SRC_DIR)/%
-	charm-build -o $(BUILD_DIR) $<
+	docker build -t $(CHARM_DOCKER_TAG) .
+	docker run -u $$(id -u):$$(id -g) -v$$(pwd):$$(pwd) -w$$(pwd) $(CHARM_DOCKER_TAG) charm-build -o $(BUILD_DIR) $<