diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2cfcbe30..a3031083 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -11,7 +11,7 @@ updates:
       interval: daily
 
   - package-ecosystem: docker
-    directory: /docker/vpp-centos-userspace-cni
+    directory: /docker/userspacecni/
     schedule:
       interval: daily
 
diff --git a/ci/ci.sh b/ci/ci.sh
index 99d69b6b..286f049f 100755
--- a/ci/ci.sh
+++ b/ci/ci.sh
@@ -41,7 +41,7 @@ esac
 kind create cluster --image "kindest/node:$kubectl_version"
 kubectl get all --all-namespaces
 
-#docker run -itd --device=/dev/hugepages:/dev/hugepages --privileged -v "$(pwd)/docker/vpp-centos-userspace-cni/:/etc/vpp/" --name vpp ligato/vpp-base
+#docker run -itd --device=/dev/hugepages:/dev/hugepages --privileged -v "$(pwd)/example/sample-vpp-host-config:/etc/vpp/" --name vpp ligato/vpp-base
 sleep 10
 cd $USERSPACEDIR
 
diff --git a/ci/vpp_test_setup/vpp_host.sh b/ci/vpp_test_setup/vpp_host.sh
index 6bed0e96..656864a8 100755
--- a/ci/vpp_test_setup/vpp_host.sh
+++ b/ci/vpp_test_setup/vpp_host.sh
@@ -5,7 +5,7 @@ USERSPACEDIR="${USERSPACEDIR:=/runner/_work/userspace-cni-network-plugin/userspa
 
 kubectl delete ns vpp
 kubectl create ns vpp
-kubectl create -n vpp configmap vpp-startup-config --from-file="${USERSPACEDIR}/docker/vpp-centos-userspace-cni/startup.conf"
+kubectl create -n vpp configmap vpp-startup-config --from-file="${USERSPACEDIR}/examples/sample-vpp-host-config/startup.conf"
 
 worker="kind-control-plane"
 
diff --git a/cnivpp/README.md b/cnivpp/README.md
index 23d8a49a..307b9bc2 100644
--- a/cnivpp/README.md
+++ b/cnivpp/README.md
@@ -17,10 +17,6 @@ few notes regarding packages in this sub-folder.
 The **usrsp-app** is intended to run in a container. It leverages the VPP CNI code
 to consume interfaces in the container.
 
-## docker/vpp-centos-userspace-cni/
-The docker image **vpp-centos-userspace-cni** runs a VPP instance and the
-usrsp-app at startup. 
-
 ## cnivpp/localdb.go
 **localdb** is use to store data in a DB. For the local VPP instance, the localdb
 is used to store the swIndex generated when the interface is created. It is used
diff --git a/docker/vpp-centos-userspace-cni/startup.conf b/examples/sample-vpp-host-config/startup.conf
similarity index 100%
rename from docker/vpp-centos-userspace-cni/startup.conf
rename to examples/sample-vpp-host-config/startup.conf