diff --git a/Makefile b/Makefile
index 8fca853..647ab90 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,7 @@
 VNFD_BUILD_PKGS := $(addprefix $(VNFD_BUILD_DIR)_pkgs/, $(VNFD_PKGS))
 
 IMS_GITHUB="https://github.com/Metaswitch/clearwater-juju.git"
+CHARM_REPO="https://osm.etsi.org/gerrit/osm/juju-charms.git"
 
 all: $(VNFD_BUILD_PKGS) ${NSD_BUILD_PKGS}
 	echo $@
@@ -50,9 +51,14 @@
 
 	src/gen_vnfd_pkg.sh $< $@
 
-$(BUILD_DIR)/clearwater-juju: $(VNFD_BUILD_DIR)/ims_allin1_2p_vnf
+$(BUILD_DIR)/clearwater-juju:
+	mkdir -p $(BUILD_DIR)
 	-cd $(BUILD_DIR) && (test -e clearwater-juju || git clone $(IMS_GITHUB))
 
+$(BUILD_DIR)/juju-charms:
+	mkdir -p $(BUILD_DIR)
+	-cd $(BUILD_DIR) && (test -e juju-charms || git clone $(CHARM_REPO))
+
 $(NSD_BUILD_DIR)/%: $(NSD_SRC_DIR)/%
 	mkdir -p $(NSD_BUILD_DIR)
 	cp -rf $< $(NSD_BUILD_DIR)
@@ -62,9 +68,13 @@
 $(BUILD_DIR)/nsd_pkgs/%.tar.gz: $(NSD_BUILD_DIR)/%
 	src/generate_descriptor_pkg.sh $(BUILD_DIR)/nsd_pkgs $<
 
-$(VNFD_BUILD_DIR)/ims_allin1_2p_vnf/charms/clearwater-aio-proxy: $(BUILD_DIR)/clearwater-juju
-	# Copy the IMS Charm into the IMS vnf package directory before
+$(VNFD_BUILD_DIR)/ims_allin1_2p_vnf/charms/clearwater-aio-proxy: $(VNFD_BUILD_DIR)/ims_allin1_2p_vnf $(BUILD_DIR)/clearwater-juju
+	# Copy the IMS Charm into the IMS vnf package directory before packaging
 	cp -rf $(BUILD_DIR)/clearwater-juju/charms/trusty/clearwater-aio-proxy $(VNFD_BUILD_DIR)/ims_allin1_2p_vnf/charms
 
-$(BUILD_DIR)/vnfd_pkgs/%.tar.gz: $(VNFD_BUILD_DIR)/% $(VNFD_BUILD_DIR)/ims_allin1_2p_vnf/charms/clearwater-aio-proxy
+$(VNFD_BUILD_DIR)/6wind_vnf/charms/vpe-router: $(VNFD_BUILD_DIR)/6wind_vnf $(BUILD_DIR)/juju-charms
+	# Copy the IMS Charm into the IMS vnf package directory before packaging
+	cp -rf $(BUILD_DIR)/juju-charms/vpe-router $(VNFD_BUILD_DIR)/6wind_vnf/charms
+
+$(BUILD_DIR)/vnfd_pkgs/%.tar.gz: $(VNFD_BUILD_DIR)/% $(VNFD_BUILD_DIR)/ims_allin1_2p_vnf/charms/clearwater-aio-proxy $(VNFD_BUILD_DIR)/6wind_vnf/charms/vpe-router
 	src/generate_descriptor_pkg.sh $(BUILD_DIR)/vnfd_pkgs $<