diff --git a/.gitmodules b/.gitmodules
index a53f01aa07fbb015ca7e19fcbe473dbc4c1d1de6..5a08e490e039f1b23134ebd8b714ebc91338e7fe 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,12 +7,12 @@
 [submodule "magma/hackfest_magma-agw-enb_vnfd/charms/magmagw/mod/charms.osm"]
 	path = magma/hackfest_magma-agw-enb_vnfd/charms/magmagw/mod/charms.osm
 	url = https://github.com/charmed-osm/charms.osm
-[submodule "magma/hackfest_gateway_pnf/charms/vyos-config/mod/charms.osm"]
+[submodule "magma/hackfest_gateway_vnfd/charms/vyos-config/mod/charms.osm"]
 	path = magma/hackfest_gateway_vnfd/charms/vyos-config/mod/charms.osm
 	url = https://github.com/charmed-osm/charms.osm
-[submodule "magma/hackfest_gateway_pnf/charms/vyos-config/mod/operator"]
+[submodule "magma/hackfest_gateway_vnfd/charms/vyos-config/mod/operator"]
 	path = magma/hackfest_gateway_vnfd/charms/vyos-config/mod/operator
 	url = https://github.com/canonical/operator
-[submodule "magma/hackfest_gateway_pnf/charms/vyos-config/mod/charm-helpers"]
+[submodule "magma/hackfest_gateway_vnfd/charms/vyos-config/mod/charm-helpers"]
 	path = magma/hackfest_gateway_vnfd/charms/vyos-config/mod/charm-helpers
 	url = https://github.com/juju/charm-helpers.git
diff --git a/magma/hackfest_gateway_pnf/charms/vyos-config/mod/charm-helpers b/magma/hackfest_gateway_pnf/charms/vyos-config/mod/charm-helpers
deleted file mode 160000
index 8a90d2cc3aa0ba170756bdc87b4499903ac86fe5..0000000000000000000000000000000000000000
--- a/magma/hackfest_gateway_pnf/charms/vyos-config/mod/charm-helpers
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8a90d2cc3aa0ba170756bdc87b4499903ac86fe5
diff --git a/magma/hackfest_gateway_pnf/charms/vyos-config/mod/charms.osm b/magma/hackfest_gateway_pnf/charms/vyos-config/mod/charms.osm
deleted file mode 160000
index 623ba0d8e6d3ff7a01067a0e09f15fc98ef6bec5..0000000000000000000000000000000000000000
--- a/magma/hackfest_gateway_pnf/charms/vyos-config/mod/charms.osm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 623ba0d8e6d3ff7a01067a0e09f15fc98ef6bec5
diff --git a/magma/hackfest_gateway_pnf/charms/vyos-config/mod/operator b/magma/hackfest_gateway_pnf/charms/vyos-config/mod/operator
deleted file mode 160000
index a3918e1db40edac88a5250c46d7ef3156e8853d3..0000000000000000000000000000000000000000
--- a/magma/hackfest_gateway_pnf/charms/vyos-config/mod/operator
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a3918e1db40edac88a5250c46d7ef3156e8853d3