diff --git a/.github/workflows/k3d.yaml b/.github/workflows/k3d.yaml
index 61e50e6..cfd728e 100644
--- a/.github/workflows/k3d.yaml
+++ b/.github/workflows/k3d.yaml
@@ -28,18 +28,6 @@ jobs:
           kubectl get sc
       - name: Checkout repository
         uses: actions/checkout@v2
-      - name: Install OpenEBS
-        run: |
-          kubectl apply -f https://openebs.github.io/charts/openebs-operator.yaml
-          kubectl wait --for=condition=available deployment/openebs-localpv-provisioner -n openebs --timeout=300s
-          kubectl get sc
-          kubectl get po -A -o wide
-      - name: Create storage class
-        id: create-storage-class
-        run: |
-          kubectl apply -f ./base/ssd-hostpath-storageclass-openebs.yaml
-          kubectl wait --for=jsonpath='{.metadata.name}'=ssd-hostpath storageclass/ssd-hostpath --timeout=60s
-          kubectl get sc
       - name: Install Prometheus operator
         id: install-prometheus-operator
         run: |
@@ -47,64 +35,12 @@ jobs:
           kubectl wait --for=condition=available deployment/prometheus-operator -n default --timeout=300s
           kubectl get crd
           kubectl get po -A -o wide
-      - name: Install Minio
-        id: install-minio
-        run: |
-          git clone --depth 1 --branch v6.0.1 https://github.com/minio/operator.git && kubectl apply -k operator/
-          kubectl apply -f ./base/minio/minio-tenant-base.yaml
-          echo "Waiting for resources to be created..."
-          sleep 10
-          kubectl wait --for=jsonpath='{.status.readyReplicas}'=1 statefulset/myminio-pool-0 -n minio-tenant --timeout=300s
-          kubectl get po -A -o wide
-          kubectl get po -A -o wide | grep myminio-pool-0-0 | awk '{print $3}' | grep -q '2/2' && echo "myminio-pool-0-0 pod is running with status 2/2" || (echo "myminio-pool-0-0 pod is not running with status 2/2" && exit 1)
-      - name: Install MongoDB
-        id: install-mongodb
-        run: |
-          helm repo add bitnami https://charts.bitnami.com/bitnami
-          kubectl create namespace mongodb
-          helm install mongodb -n mongodb bitnami/mongodb --values ./base/mongodb/mongodb-values.yaml --wait --timeout=5m
-          kubectl get pods -A -o wide
-      - name: Install RabbitMQ
-        id: install-rabbitmq
-        run: |
-          helm repo add bitnami https://charts.bitnami.com/bitnami
-          kubectl create namespace rabbitmq
-          helm install rabbitmq -n rabbitmq bitnami/rabbitmq --values ./base/rabbitmq/rabbitmq-values.yaml --wait --timeout=5m
-          kubectl get pods -A -o wide
-          kubectl exec --namespace rabbitmq rabbitmq-0 -- rabbitmqctl status
-      - name: Install Vernemq (MQTT Broker)
-        id: install-vernemq
-        run: |
-          kubectl create namespace vernemq
-          helm repo add vernemq https://vernemq.github.io/docker-vernemq
-          helm install vernemq vernemq/vernemq --values ./base/vernemq/vernemq-values.yaml -n vernemq --create-namespace --wait --timeout=5m
-          kubectl get pods -A -o wide
-          kubectl exec --namespace vernemq vernemq-0 -- /vernemq/bin/vmq-admin cluster show
-      - name: Install Vault
-        id: install-vault
-        run: |
-          kubectl create namespace kerberos-vault
-          kubectl apply -f ./base/vault/mongodb-configmap.yaml -n kerberos-vault
-          kubectl apply -f ./base/vault/kerberos-vault-deployment.yaml -n kerberos-vault
-          kubectl apply -f ./base/vault/kerberos-vault-service.yaml -n kerberos-vault
-          sleep 10
-          kubectl wait --for=condition=available deployment/vault -n kerberos-vault --timeout=300s
-          kubectl get pods -A -o wide 
-          kubectl get pods -A -o wide | grep vault | awk '{print $3}' | grep -q '1/1' && echo "vault pod is running with status 1/1" || (echo "vault pod is not running with status 1/1" && exit 1)
-      - name: Install Agent
-        id: install-agent
-        run: |
-          kubectl create namespace kerberos-agent
-          kubectl apply -f ./base/agent/kerberos-agent-deployment.yaml -n kerberos-agent
-          kubectl wait --for=condition=available deployment/agent1 -n kerberos-agent --timeout=300s
-          kubectl get pods -A -o wide
-          kubectl get pods -A -o wide | grep agent1 | awk '{print $3}' | grep -q '1/1' && echo "agent1 pod is running with status 1/1" || (echo "agent1 pod is not running with status 1/1" && exit 1)
       - name: Install Hub Helm chart
         id: install-hub
         run: |
           helm repo add kerberos https://charts.kerberos.io
           kubectl create namespace kerberos-hub
-          helm install hub kerberos/hub --values ./base/hub/kerberos-hub-values.yaml -n kerberos-hub --create-namespace
+          helm install hub ./charts/hub --values charts/hub/values.yaml -n kerberos-hub --create-namespace
           sleep 10
           kubectl wait --for=condition=available deployment/admin -n kerberos-hub --timeout=300s
           kubectl wait --for=condition=available deployment/hub-api -n kerberos-hub --timeout=300s
diff --git a/.github/workflows/kind.yaml b/.github/workflows/kind.yaml
index 9a737ba..b0702d5 100644
--- a/.github/workflows/kind.yaml
+++ b/.github/workflows/kind.yaml
@@ -24,18 +24,6 @@ jobs:
           kubectl get sc
       - name: Checkout repository
         uses: actions/checkout@v2
-      - name: Install OpenEBS
-        run: |
-          kubectl apply -f https://openebs.github.io/charts/openebs-operator.yaml
-          kubectl wait --for=condition=available deployment/openebs-localpv-provisioner -n openebs --timeout=300s
-          kubectl get sc
-          kubectl get po -A -o wide
-      - name: Create storage class
-        id: create-storage-class
-        run: |
-          kubectl apply -f ./base/ssd-hostpath-storageclass-openebs.yaml
-          kubectl wait --for=jsonpath='{.metadata.name}'=ssd-hostpath storageclass/ssd-hostpath --timeout=60s
-          kubectl get sc
       - name: Install Prometheus operator
         id: install-prometheus-operator
         run: |
diff --git a/.github/workflows/microk8s.yaml b/.github/workflows/microk8s.yaml
index 2f493ad..8be17aa 100644
--- a/.github/workflows/microk8s.yaml
+++ b/.github/workflows/microk8s.yaml
@@ -24,12 +24,6 @@ jobs:
           kubectl get pods -A -o wide
       - name: Checkout repository
         uses: actions/checkout@v2
-      - name: Create storage class
-        id: create-storage-class
-        run: |
-          kubectl apply -f ./base/ssd-hostpath-storageclass.yaml
-          echo "Sleeping for 30 seconds, give time for the storage class to be created" && sleep 30
-          kubectl get sc
       - name: Install Prometheus operator
         id: install-prometheus-operator
         run: |