diff --git a/.github/actions/go-lint/Dockerfile b/.github/actions/go-lint/Dockerfile
index df8621810..aed96deaf 100644
--- a/.github/actions/go-lint/Dockerfile
+++ b/.github/actions/go-lint/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15.1-buster
+FROM golang:1.21-buster
 
 LABEL author="Everton Haise Taques<everton.taques@encora.com>"
 LABEL maintainer="netboxlabs"
diff --git a/.github/actions/go-report/Dockerfile b/.github/actions/go-report/Dockerfile
index 8e45517b6..40e0b4657 100644
--- a/.github/actions/go-report/Dockerfile
+++ b/.github/actions/go-report/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20-alpine
+FROM golang:1.21-alpine
 
 LABEL author="Everton Haise Taques<everton.taques@encora.com>"
 LABEL maintainer="netboxlabs"
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 7903615fb..5a65ef62a 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,73 +1,92 @@
 documentation:
-  - docs/*
-  - docs/**/*
-  - mkdocs.yml
+  - changed-files:
+    - any-glob-to-any-file: ['docs/*', 'docs/**/*', 'mkdocs.yml']
 
 github-actions:
-  - .github/workflows/*
-  - .github/workflows/**/*
-  - .github/dependabot.yml
-  - .github/boring-cyborg.yml
-  - .github/release-drafter.yml
-  - .github/semantic.yml
-  - .github/stale.yml
-  - .github/mergify.yml
-  - .github/labeler.yml
+  - changed-files:
+      - any-glob-to-any-file: ['.github/workflows/*',
+       '.github/workflows/**/*',
+       '.github/dependabot.yml',
+       '.github/boring-cyborg.yml',
+       '..github/release-drafter.yml',
+       '.github/semantic.yml',
+       '.github/stale.yml',
+       '.github/mergify.yml',
+       '.github/labeler.yml']
 
 github-templates:
-  - .github/ISSUE_TEMPLATE/*
-  - .github/PULL_REQUEST_TEMPLATE.md
-  - .github/.chglog/*
-  - .github/.chglog/**/*
+  - changed-files:
+      - any-glob-to-any-file: ['.github/ISSUE_TEMPLATE/*',
+       '.github/PULL_REQUEST_TEMPLATE.md',
+       '.github/.chglog/*',
+       '.github/.chglog/**/*']
 
 internal:
-  - .flake8
-  - .bandit.baseline
-  - .gitignore
-  - .pre-commit-config.yaml
-  - MANIFEST.in
-  - Makefile
-  - CONTRIBUTING.md
-  - MAINTAINERS.md
-  - CODE_OF_CONDUCT.md
-  - LICENSE
-  - THIRD-PARTY-LICENSES
-  - .dockerignore
-  - .editorconfig
-  - setup.cfg
+  - changed-files:
+      - any-glob-to-any-file: ['.flake8',
+       '.bandit.baseline',
+       '.gitignore',
+       '.pre-commit-config.yaml',
+       'MANIFEST.in',
+       'Makefile',
+       'CONTRIBUTING.md',
+       'MAINTAINERS.md',
+       'CODE_OF_CONDUCT.md',
+       'LICENSE',
+       'THIRD-PARTY-LICENSES',
+       '.dockerignore',
+       '.editorconfig',
+       'setup.cfg']
 
 dependencies:
-  - pyproject.toml
-  - poetry.lock
-  - requirements.txt
+  - changed-files:
+      - any-glob-to-any-file: ['pyproject.toml',
+      'poetry.lock',
+      'requirements.txt']
 
 tests:
-  - automated_tests/*
-  - automated_tests/**/*
-  - tests/*
-  - tests/**/*
+  - changed-files:
+      - any-glob-to-any-file: ['automated_tests/*',
+       'automated_tests/**/*',
+       'tests/*',
+       'tests/**/*']
 
 build:
-  - Dockerfile
+  - changed-files:
+        - any-glob-to-any-file: ['Dockerfile',
+        'Dockerfile.*',
+        'docker-compose.yml',
+        'docker-compose.*.yml',
+        'docker-compose.*.yaml',
+        'docker-compose.*.yaml',
+        'docker-compose']
 
 golang:
-  - "**/*.go"
+  - changed-files:
+      - any-glob-to-any-file: ['go.mod',
+      'go.sum',
+      '**/*.go']
 
 javascript:
-  - "**/*.json"
+  - changed-files:
+      - any-glob-to-any-file: '**/*.json'
 
 json:
-  - "**/*.json"
+  - changed-files:
+      - any-glob-to-any-file: '**/*.json'
 
 markdown:
-  - "**/*.md"
+  - changed-files:
+      - any-glob-to-any-file: '**/*.md'
 
 python:
-  - "**/*.py"
+  - changed-files:
+      - any-glob-to-any-file: ['requirements.txt', '**/*.py']
 
 sql:
-  - "**/*.py"
+  - changed-files:
+      - any-glob-to-any-file: '**/*.sql'
 
 typescript:
-  - "**/*.ts"
-  - "**/*.tsx"
+  - changed-files:
+      - any-glob-to-any-file: ['**/*.ts', '**/*.tsx']
diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml
index 89a7adc40..4ff3756c9 100644
--- a/.github/workflows/agent.yml
+++ b/.github/workflows/agent.yml
@@ -21,12 +21,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21.x
 
       - name: Get branch name
         shell: bash
@@ -61,7 +61,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get branch name
         shell: bash
@@ -129,7 +129,7 @@ jobs:
           
       - name: Login to Docker Hub orbcommunity
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
           password: ${{ secrets.ORB_DOCKERHUB_TOKEN }}
@@ -144,7 +144,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get branch name
         shell: bash
@@ -210,7 +210,7 @@ jobs:
           
       - name: Login to Docker Hub orbcommunity
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
           password: ${{ secrets.ORB_DOCKERHUB_TOKEN }}
diff --git a/.github/workflows/go-develop.yml b/.github/workflows/go-develop.yml
index 984b20d0c..6bea4bd22 100644
--- a/.github/workflows/go-develop.yml
+++ b/.github/workflows/go-develop.yml
@@ -21,7 +21,7 @@ jobs:
       docs: ${{ steps.filter.outputs.docs }}
       VERSION: ${{ env.VERSION }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dorny/paths-filter@v2
         id: filter
         with:
@@ -80,7 +80,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           name: workspace
 
@@ -112,11 +112,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: prebuild
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21.x
 
       - name: Go unit tests
         if: ${{ needs.prebuild.outputs.agent == 'true' || github.event_name != 'pull_request' }}
@@ -151,11 +151,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: prebuild
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21.x
 
       - name: Go unit tests
         if: ${{ needs.prebuild.outputs.orb == 'true' || github.event_name != 'pull_request' }}
@@ -190,11 +190,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: prebuild
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21.x
 
       - name: Go unit tests
         if: ${{ needs.prebuild.outputs.orb == 'true' || github.event_name != 'pull_request' }}
@@ -229,11 +229,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: prebuild
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21.x
 
       - name: Go unit tests
         if: ${{ needs.prebuild.outputs.orb == 'true' || github.event_name != 'pull_request' }}
@@ -268,11 +268,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: prebuild
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21.x
 
       - name: Go unit tests
         if: ${{ needs.prebuild.outputs.orb == 'true' || github.event_name != 'pull_request' }}
@@ -307,11 +307,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: prebuild
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21.x
 
       - name: Go unit tests
         if: ${{ needs.prebuild.outputs.orb == 'true' || github.event_name != 'pull_request' }}
@@ -348,7 +348,7 @@ jobs:
       - test-agent
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get short commit hash to a variable
         id: commit_hash
         run: |
@@ -389,7 +389,7 @@ jobs:
        
       - name: Login to Docker Hub orbcommunity
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
           password: ${{ secrets.ORB_DOCKERHUB_TOKEN }}
@@ -404,7 +404,7 @@ jobs:
       - test-fleet
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get short commit hash to a variable
         id: commit_hash
         run: |
@@ -415,7 +415,7 @@ jobs:
         run: SERVICE=fleet make build_docker
 
       - name: Login to Docker Hub orbcommunity
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
@@ -431,7 +431,7 @@ jobs:
       - test-policies
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get short commit hash to a variable
         id: commit_hash
         run: |
@@ -442,7 +442,7 @@ jobs:
         run: SERVICE=policies make build_docker
         
       - name: Login to Docker Hub orbcommunity
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
@@ -458,7 +458,7 @@ jobs:
       - test-sinker
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get short commit hash to a variable
         id: commit_hash
         run: |
@@ -469,7 +469,7 @@ jobs:
         run: SERVICE=sinker make build_docker
        
       - name: Login to Docker Hub orbcommunity
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
@@ -485,7 +485,7 @@ jobs:
       - test-sinks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get short commit hash to a variable
         id: commit_hash
         run: |
@@ -496,7 +496,7 @@ jobs:
         run: SERVICE=sinks make build_docker
         
       - name: Login to Docker Hub orbcommunity
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
@@ -512,7 +512,7 @@ jobs:
       - test-maestro
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get short commit hash to a variable
         id: commit_hash
         run: |
@@ -523,7 +523,7 @@ jobs:
         run: SERVICE=maestro make build_docker      
 
       - name: Login to Docker Hub orbcommunity
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
@@ -538,7 +538,7 @@ jobs:
       - prebuild
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dorny/paths-filter@v2
         id: filter
         with:
@@ -553,7 +553,7 @@ jobs:
           
       - name: Login to Docker Hub orbcommunity
         if: ${{ steps.filter.outputs.yarn == 'true' }}
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
           password: ${{ secrets.ORB_DOCKERHUB_TOKEN }}
@@ -569,7 +569,7 @@ jobs:
       - package-ui-dependencies
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get short commit hash to a variable
         id: commit_hash
         run: |
@@ -599,7 +599,7 @@ jobs:
           git push origin develop
           
       - name: Login to Docker Hub orbcommunity
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
@@ -616,7 +616,7 @@ jobs:
       - package-ui
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Build orb migrate service image
         if: ${{ needs.prebuild.outputs.migrate == 'true' }}
@@ -625,7 +625,7 @@ jobs:
 
       - name: Login to Docker Hub orbcommunity
         if: ${{ needs.prebuild.outputs.migrate == 'true' }}
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
           password: ${{ secrets.ORB_DOCKERHUB_TOKEN }}
@@ -643,12 +643,13 @@ jobs:
       - package-policies
       - package-sinker
       - package-sinks
+      - package-maestro
       - package-ui
 
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Debug values
         run: |
diff --git a/.github/workflows/go-main.yml b/.github/workflows/go-main.yml
index 108fbe466..9fe90359d 100644
--- a/.github/workflows/go-main.yml
+++ b/.github/workflows/go-main.yml
@@ -20,7 +20,7 @@ jobs:
       ui: ${{ steps.filter.outputs.ui }}
       VERSION: ${{ env.VERSION }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dorny/paths-filter@v2
         id: filter
         with:
@@ -61,11 +61,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: prebuild
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21.x
 
       - name: Go unit tests
         run: SERVICE=agent make test_service
@@ -74,11 +74,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: prebuild
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21.x
 
       - name: Go unit tests
         if: ${{ needs.prebuild.outputs.orb == 'true' }}
@@ -88,11 +88,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: prebuild
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21.x
 
       - name: Go unit tests
         if: ${{ needs.prebuild.outputs.orb == 'true' }}
@@ -102,11 +102,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: prebuild
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21.x
 
       - name: Go unit tests
         if: ${{ needs.prebuild.outputs.orb == 'true' }}
@@ -116,11 +116,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: prebuild
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21.x
 
       - name: Go unit tests
         if: ${{ needs.prebuild.outputs.orb == 'true' }}
@@ -130,11 +130,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: prebuild
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21.x
 
       - name: Go unit tests
         if: ${{ needs.prebuild.outputs.orb == 'true' }}
@@ -148,7 +148,7 @@ jobs:
       - test-agent
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get short commit hash to a variable
         id: commit_hash
         run: |
@@ -187,7 +187,7 @@ jobs:
         
       - name: Login to Docker Hub orbcommunity
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
           password: ${{ secrets.ORB_DOCKERHUB_TOKEN }}
@@ -202,7 +202,7 @@ jobs:
       - test-fleet
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get short commit hash to a variable
         id: commit_hash
         run: |
@@ -212,7 +212,7 @@ jobs:
         run: SERVICE=fleet make build_docker
         
       - name: Login to Docker Hub orbcommunity
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
@@ -228,7 +228,7 @@ jobs:
       - test-policies
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get short commit hash to a variable
         id: commit_hash
         run: |
@@ -238,7 +238,7 @@ jobs:
         run: SERVICE=policies make build_docker
         
       - name: Login to Docker Hub orbcommunity
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
@@ -254,7 +254,7 @@ jobs:
       - test-sinker
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get short commit hash to a variable
         id: commit_hash
         run: |
@@ -264,7 +264,7 @@ jobs:
         run: SERVICE=sinker make build_docker
        
       - name: Login to Docker Hub orbcommunity
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
@@ -280,7 +280,7 @@ jobs:
       - test-sinks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get short commit hash to a variable
         id: commit_hash
         run: |
@@ -290,7 +290,7 @@ jobs:
         run: SERVICE=sinks make build_docker
         
       - name: Login to Docker Hub orbcommunity
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
@@ -306,7 +306,7 @@ jobs:
       - test-maestro
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get short commit hash to a variable
         id: commit_hash
         run: |
@@ -316,7 +316,7 @@ jobs:
         run: SERVICE=maestro make build_docker      
 
       - name: Login to Docker Hub orbcommunity
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
@@ -331,7 +331,7 @@ jobs:
       - prebuild
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dorny/paths-filter@v2
         id: filter
         with:
@@ -346,7 +346,7 @@ jobs:
           
       - name: Login to Docker Hub orbcommunity
         if: ${{ steps.filter.outputs.yarn == 'true' }}
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
           password: ${{ secrets.ORB_DOCKERHUB_TOKEN }}
@@ -362,7 +362,7 @@ jobs:
       - package-ui-dependencies
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get short commit hash to a variable
         id: commit_hash
         run: |
@@ -373,7 +373,7 @@ jobs:
         run: make ui
         
       - name: Login to Docker Hub orbcommunity
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
@@ -397,7 +397,7 @@ jobs:
     if: github.event_name != 'pull_request'
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/go-production.yml b/.github/workflows/go-production.yml
index 1b43dff8a..f61383eb0 100644
--- a/.github/workflows/go-production.yml
+++ b/.github/workflows/go-production.yml
@@ -20,7 +20,7 @@ jobs:
       ui: ${{ steps.filter.outputs.ui }}
       VERSION: ${{ env.VERSION }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dorny/paths-filter@v2
         id: filter
         with:
@@ -66,11 +66,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: prebuild
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21.x
 
       - name: Go unit tests
         if: ${{ needs.prebuild.outputs.agent == 'true' }}
@@ -80,11 +80,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: prebuild
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21.x
 
       - name: Go unit tests
         run: |
@@ -96,11 +96,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: prebuild
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21.x
 
       - name: Go unit tests
         if: ${{ needs.prebuild.outputs.orb == 'true' }}
@@ -110,11 +110,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: prebuild
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21.x
 
       - name: Go unit tests
         if: ${{ needs.prebuild.outputs.orb == 'true' }}
@@ -124,11 +124,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: prebuild
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21.x
 
       - name: Go unit tests
         if: ${{ needs.prebuild.outputs.orb == 'true' }}
@@ -138,11 +138,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: prebuild
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21.x
 
       - name: Go unit tests
         run: |
@@ -157,7 +157,7 @@ jobs:
       - test-agent
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get short commit hash to a variable
         id: commit_hash
         run: |
@@ -197,7 +197,7 @@ jobs:
           fi
       - name: Login to Docker Hub orbcommunity
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -208,7 +208,7 @@ jobs:
 
       - name: Login to Docker Hub orbcommunity 
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
           password: ${{ secrets.ORB_DOCKERHUB_TOKEN }}
@@ -223,7 +223,7 @@ jobs:
       - test-fleet
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get short commit hash to a variable
         id: commit_hash
         run: |
@@ -233,7 +233,7 @@ jobs:
         run: SERVICE=fleet make build_docker
         
       - name: Login to Docker Hub orbcommunity
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
@@ -249,7 +249,7 @@ jobs:
       - test-policies
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get short commit hash to a variable
         id: commit_hash
         run: |
@@ -259,7 +259,7 @@ jobs:
         run: SERVICE=policies make build_docker
 
       - name: Login to Docker Hub orbcommunity
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
@@ -275,7 +275,7 @@ jobs:
       - test-sinker
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get short commit hash to a variable
         id: commit_hash
         run: |
@@ -285,7 +285,7 @@ jobs:
         run: SERVICE=sinker make build_docker
         
       - name: Login to Docker Hub orbcommunity
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
@@ -301,7 +301,7 @@ jobs:
       - test-sinks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get short commit hash to a variable
         id: commit_hash
         run: |
@@ -311,7 +311,7 @@ jobs:
         run: SERVICE=sinks make build_docker
        
       - name: Login to Docker Hub orbcommunity
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
@@ -327,7 +327,7 @@ jobs:
       - test-maestro
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get short commit hash to a variable
         id: commit_hash
         run: |
@@ -337,7 +337,7 @@ jobs:
         run: SERVICE=maestro make build_docker
 
       - name: Login to Docker Hub orbcommunity
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
@@ -352,7 +352,7 @@ jobs:
       - prebuild
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dorny/paths-filter@v2
         id: filter
         with:
@@ -367,7 +367,7 @@ jobs:
 
       - name: Login to Docker Hub orbcommunity
         if: ${{ steps.filter.outputs.yarn == 'true' }}
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
           password: ${{ secrets.ORB_DOCKERHUB_TOKEN }}
@@ -383,7 +383,7 @@ jobs:
       - package-ui-dependencies
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get short commit hash to a variable
         id: commit_hash
         run: |
@@ -412,7 +412,7 @@ jobs:
           git push origin main
           
       - name: Login to Docker Hub orbcommunity
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
@@ -435,7 +435,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Debug values
         run: |
@@ -480,7 +480,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Generating changelog and post it in slack channel
         uses: ./.github/actions/slack-post
         with:
@@ -495,7 +495,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set branch name
         shell: bash
@@ -519,16 +519,16 @@ jobs:
           echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: all
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to Docker Hub orbcommunity
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
           password: ${{ secrets.ORB_DOCKERHUB_TOKEN }}
@@ -559,7 +559,7 @@ jobs:
           IMAGE_NAME: orbcommunity/orb-agent:latest
           IMAGE_NAME_2: orbcommunity/orb-agent:${{ env.VERSION }}-${{ steps.commit_hash.outputs.sha_short }}
 
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
diff --git a/.github/workflows/labeler.yaml b/.github/workflows/labeler.yaml
index 857cfb4a7..ab2292824 100644
--- a/.github/workflows/labeler.yaml
+++ b/.github/workflows/labeler.yaml
@@ -9,4 +9,4 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@v4
+      - uses: actions/labeler@v5
diff --git a/.gitignore b/.gitignore
index 2f0e947e4..7c7bff44b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,5 @@ docker/otel-collector-config.yaml
 
 kind/*
 !kind/README.md
+
+otelcol-contrib
\ No newline at end of file
diff --git a/.idea/runConfigurations/orb_agent.xml b/.idea/runConfigurations/orb_agent_visor.xml
similarity index 81%
rename from .idea/runConfigurations/orb_agent.xml
rename to .idea/runConfigurations/orb_agent_visor.xml
index 9f9c71328..e968c3e85 100644
--- a/.idea/runConfigurations/orb_agent.xml
+++ b/.idea/runConfigurations/orb_agent_visor.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="orb-agent" type="GoApplicationRunConfiguration" factoryName="Go Application">
+  <configuration default="false" name="orb-agent-visor" type="GoApplicationRunConfiguration" factoryName="Go Application">
     <module name="orb" />
     <working_directory value="$PROJECT_DIR$/cmd/agent" />
-    <parameters value="run -d -c $PROJECT_DIR$/localconfig/config.yaml" />
+    <parameters value="run -d -c $PROJECT_DIR$/localconfig/visor_run.yaml" />
     <sudo value="true" />
     <EXTENSION ID="net.ashald.envfile">
       <option name="IS_ENABLED" value="false" />
diff --git a/Makefile b/Makefile
index 746989174..f07c3ef7c 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,12 @@ DOCKERS = $(addprefix docker_,$(SERVICES))
 DOCKERS_DEV = $(addprefix docker_dev_,$(SERVICES))
 CGO_ENABLED ?= 0
 GOARCH ?= $(shell dpkg-architecture -q DEB_BUILD_ARCH)
+GOOS ?= $(shell dpkg-architecture -q DEB_TARGET_ARCH_OS)
+DIODE_TAG ?= develop
 ORB_VERSION = $(shell cat VERSION)
 COMMIT_HASH = $(shell git rev-parse --short HEAD)
+OTEL_COLLECTOR_CONTRIB_VERSION ?= 0.91.0
+OTEL_CONTRIB_URL ?= "https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v$(OTEL_COLLECTOR_CONTRIB_VERSION)/otelcol-contrib_$(OTEL_COLLECTOR_CONTRIB_VERSION)_$(GOOS)_$(GOARCH).tar.gz"
 
 define compile_service
     echo "ORB_VERSION: $(ORB_VERSION)"
@@ -153,7 +157,7 @@ install-helm:
 
 install-kubectl:
 	cd /tmp && \
-	curl -LO "https://dl.k8s.io/release/v1.22.1/bin/linux/amd64/kubectl" && \
+	curl -LO "https://dl.k8s.io/release/v1.27.4/bin/linux/amd64/kubectl" && \
 	chmod a+x ./kubectl && \
 	sudo mv ./kubectl /usr/local/bin/kubectl
 
@@ -182,7 +186,7 @@ kind-create-all: kind-create-cluster kind-install-orb
 kind-upgrade-all: kind-load-images kind-upgrade-orb
 
 kind-create-cluster:
-	kind create cluster --image kindest/node:v1.22.15 --config=./kind/config.yaml
+	kind create cluster --image kindest/node:v1.24.0 --config=./kind/config.yaml
 
 kind-delete-cluster:
 	kind delete cluster
@@ -228,6 +232,7 @@ agent_bin:
 
 agent:
 	docker build --no-cache \
+	  --build-arg GOARCH=$(GOARCH) \
 	  --build-arg PKTVISOR_TAG=$(PKTVISOR_TAG) \
 	  --tag=$(ORB_DOCKERHUB_REPO)/$(DOCKER_IMAGE_NAME_PREFIX)-agent:$(REF_TAG) \
 	  --tag=$(ORB_DOCKERHUB_REPO)/$(DOCKER_IMAGE_NAME_PREFIX)-agent:$(ORB_VERSION) \
@@ -236,9 +241,11 @@ agent:
 	  
 agent_full:
 	docker build --no-cache \
+	  --build-arg GOARCH=$(GOARCH) \
 	  --build-arg PKTVISOR_TAG=$(PKTVISOR_TAG) \
 	  --build-arg DIODE_TAG=$(DIODE_TAG) \
-	  --build-arg ORB_TAG=${ORB_TAG} \
+	  --build-arg ORB_TAG=${REF_TAG} \
+	  --build-arg OTEL_TAG=${OTEL_COLLECTOR_CONTRIB_VERSION} \
 	  --tag=$(ORB_DOCKERHUB_REPO)/$(DOCKER_IMAGE_NAME_PREFIX)-agent-full:$(REF_TAG) \
 	  --tag=$(ORB_DOCKERHUB_REPO)/$(DOCKER_IMAGE_NAME_PREFIX)-agent-full:$(ORB_VERSION) \
 	  --tag=$(ORB_DOCKERHUB_REPO)/$(DOCKER_IMAGE_NAME_PREFIX)-agent-full:$(ORB_VERSION)-$(COMMIT_HASH) \
@@ -284,3 +291,11 @@ ui:
 		-f docker/Dockerfile .
 
 platform: dockers_dev agent ui
+
+pull-latest-otel-collector-contrib:
+	wget -O ./agent/backend/otel/otelcol_contrib.tar.gz $(OTEL_CONTRIB_URL)
+	tar -xvf ./agent/backend/otel/otelcol_contrib.tar.gz -C ./agent/backend/otel/
+	cp ./agent/backend/otel/otelcol-contrib .
+	rm ./agent/backend/otel/otelcol_contrib.tar.gz
+	rm ./agent/backend/otel/LICENSE
+	rm ./agent/backend/otel/README.md
diff --git a/VERSION b/VERSION
index 1b58cc101..ae6dd4e20 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.27.0
+0.29.0
diff --git a/agent/agent_prof.go b/agent/agent.go
similarity index 91%
rename from agent/agent_prof.go
rename to agent/agent.go
index 6a704344f..2e4cf4b80 100644
--- a/agent/agent_prof.go
+++ b/agent/agent.go
@@ -15,6 +15,7 @@ import (
 	"github.com/fatih/structs"
 	"github.com/google/uuid"
 	"github.com/jmoiron/sqlx"
+	_ "github.com/mattn/go-sqlite3"
 	"github.com/orb-community/orb/agent/backend"
 	"github.com/orb-community/orb/agent/cloud_config"
 	"github.com/orb-community/orb/agent/config"
@@ -39,12 +40,13 @@ type orbAgent struct {
 	logger            *zap.Logger
 	config            config.Config
 	client            mqtt.Client
+	agent_id          string
 	db                *sqlx.DB
 	backends          map[string]backend.Backend
 	backendState      map[string]*backend.State
 	cancelFunction    context.CancelFunc
 	rpcFromCancelFunc context.CancelFunc
-	// TODO: look for a better way to do this, context shouldn't be inside structs
+
 	asyncContext context.Context
 
 	hbTicker *time.Ticker
@@ -91,6 +93,11 @@ func New(logger *zap.Logger, c config.Config) (Agent, error) {
 
 	pm, err := manager.New(logger, c, db)
 	if err != nil {
+		logger.Error("error during create policy manager, exiting", zap.Error(err))
+		return nil, err
+	}
+	if pm.GetRepo() == nil {
+		logger.Error("policy manager failed to get repository", zap.Error(err))
 		return nil, err
 	}
 	return &orbAgent{logger: logger, config: c, policyManager: pm, db: db, groupsInfos: make(map[string]GroupInfo)}, nil
@@ -112,6 +119,7 @@ func (a *orbAgent) startBackends(agentCtx context.Context) error {
 		configuration := structs.Map(a.config.OrbAgent.Otel)
 		configuration["agent_tags"] = a.config.OrbAgent.Tags
 		if err := be.Configure(a.logger, a.policyManager.GetRepo(), configurationEntry, configuration); err != nil {
+			a.logger.Info("failed to configure backend", zap.String("backend", name), zap.Error(err))
 			return err
 		}
 		backendCtx := context.WithValue(agentCtx, "routine", name)
@@ -120,14 +128,25 @@ func (a *orbAgent) startBackends(agentCtx context.Context) error {
 		} else {
 			backendCtx = context.WithValue(backendCtx, "agent_id", "auto-provisioning-without-id")
 		}
-		if err := be.Start(context.WithCancel(backendCtx)); err != nil {
-			return err
-		}
 		a.backends[name] = be
+		initialState := be.GetInitialState()
 		a.backendState[name] = &backend.State{
-			Status:        backend.Unknown,
+			Status:        initialState,
 			LastRestartTS: time.Now(),
 		}
+		if err := be.Start(context.WithCancel(backendCtx)); err != nil {
+			a.logger.Info("failed to start backend", zap.String("backend", name), zap.Error(err))
+			var errMessage string
+			if initialState == backend.BackendError {
+				errMessage = err.Error()
+			}
+			a.backendState[name] = &backend.State{
+				Status:        initialState,
+				LastError:     errMessage,
+				LastRestartTS: time.Now(),
+			}
+			return err
+		}
 	}
 	return nil
 }
@@ -151,10 +170,6 @@ func (a *orbAgent) Start(ctx context.Context, cancelFunc context.CancelFunc) err
 		mqtt.DEBUG = &agentLoggerDebug{a: a}
 	}
 
-	if err := a.startBackends(ctx); err != nil {
-		return err
-	}
-
 	ccm, err := cloud_config.New(a.logger, a.config, a.db)
 	if err != nil {
 		return err
@@ -170,6 +185,10 @@ func (a *orbAgent) Start(ctx context.Context, cancelFunc context.CancelFunc) err
 		return err
 	}
 
+	if err := a.startBackends(ctx); err != nil {
+		return err
+	}
+
 	a.logonWithHearbeat()
 
 	return nil
@@ -184,7 +203,9 @@ func (a *orbAgent) logonWithHearbeat() {
 
 func (a *orbAgent) logoffWithHeartbeat(ctx context.Context) {
 	a.logger.Debug("stopping heartbeat, going offline status", zap.Any("routine", ctx.Value("routine")))
-	a.hbTicker.Stop()
+	if a.hbTicker != nil {
+		a.hbTicker.Stop()
+	}
 	if a.rpcFromCancelFunc != nil {
 		a.rpcFromCancelFunc()
 	}
@@ -253,9 +274,9 @@ func (a *orbAgent) RestartBackend(ctx context.Context, name string, reason strin
 		a.backendState[name].LastError = fmt.Sprintf("failed to reset backend: %v", err)
 		a.logger.Error("failed to reset backend", zap.String("backend", name), zap.Error(err))
 	}
-	be.SetCommsClient(a.config.OrbAgent.Cloud.MQTT.Id, &a.client, fmt.Sprintf("%s/?/%s", a.baseTopic, name))
-	err := a.sendAgentPoliciesReq()
-	if err != nil {
+	be.SetCommsClient(a.agent_id, &a.client, fmt.Sprintf("%s/?/%s", a.baseTopic, name))
+
+	if err := a.sendAgentPoliciesReq(); err != nil {
 		a.logger.Error("failed to send agent policies request", zap.Error(err))
 	}
 	return nil
@@ -288,7 +309,11 @@ func (a *orbAgent) RestartAll(ctx context.Context, reason string) error {
 	} else {
 		ctx = context.WithValue(ctx, "agent_id", "auto-provisioning-without-id")
 	}
-	a.logger.Info("restarting all backends", zap.String("reason", reason))
+	a.logoffWithHeartbeat(ctx)
+	a.logger.Info("restarting comms", zap.String("reason", reason))
+	if err := a.restartComms(ctx); err != nil {
+		a.logger.Error("failed to restart comms", zap.Error(err))
+	}
 	for name := range a.backends {
 		a.logger.Info("restarting backend", zap.String("backend", name), zap.String("reason", reason))
 		err := a.RestartBackend(ctx, name, reason)
@@ -296,12 +321,6 @@ func (a *orbAgent) RestartAll(ctx context.Context, reason string) error {
 			a.logger.Error("failed to restart backend", zap.Error(err))
 		}
 	}
-	a.logger.Info("restarting comms", zap.String("reason", reason))
-	a.logoffWithHeartbeat(ctx)
-	err := a.restartComms(ctx)
-	if err != nil {
-		a.logger.Error("failed to restart comms", zap.Error(err))
-	}
 	a.logonWithHearbeat()
 	a.logger.Info("all backends and comms were restarted")
 
diff --git a/agent/backend/backend.go b/agent/backend/backend.go
index a82fba891..5c21b63f5 100644
--- a/agent/backend/backend.go
+++ b/agent/backend/backend.go
@@ -19,6 +19,7 @@ const (
 	BackendError
 	AgentError
 	Offline
+	Waiting
 )
 
 type RunningStatus int
@@ -29,6 +30,7 @@ var runningStatusMap = [...]string{
 	"backend_error",
 	"agent_error",
 	"offline",
+	"waiting",
 }
 
 var runningStatusRevMap = map[string]RunningStatus{
@@ -37,6 +39,7 @@ var runningStatusRevMap = map[string]RunningStatus{
 	"backend_error": BackendError,
 	"agent_error":   AgentError,
 	"offline":       Offline,
+	"waiting":       Waiting,
 }
 
 type State struct {
@@ -62,6 +65,7 @@ type Backend interface {
 	GetStartTime() time.Time
 	GetCapabilities() (map[string]interface{}, error)
 	GetRunningStatus() (RunningStatus, string, error)
+	GetInitialState() RunningStatus
 
 	ApplyPolicy(data policies.PolicyData, updatePolicy bool) error
 	RemovePolicy(data policies.PolicyData) error
diff --git a/agent/backend/diode/diode.go b/agent/backend/diode/diode.go
index 12d362092..7cbbc6fe8 100644
--- a/agent/backend/diode/diode.go
+++ b/agent/backend/diode/diode.go
@@ -97,6 +97,10 @@ func (d *diodeBackend) GetStartTime() time.Time {
 	return d.startTime
 }
 
+func (d *diodeBackend) GetInitialState() backend.RunningStatus {
+	return backend.Unknown
+}
+
 func (d *diodeBackend) GetCapabilities() (map[string]interface{}, error) {
 	return make(map[string]interface{}), nil
 }
diff --git a/agent/backend/diode/scrape.go b/agent/backend/diode/scrape.go
index 854707f91..eb6fd95de 100644
--- a/agent/backend/diode/scrape.go
+++ b/agent/backend/diode/scrape.go
@@ -74,6 +74,9 @@ func (d *diodeBackend) receiveOtlp() {
 						Logger:         d.logger,
 						TracerProvider: trace.NewNoopTracerProvider(),
 						MeterProvider:  metric.NewMeterProvider(),
+						ReportComponentStatus: func(*component.StatusEvent) error {
+							return nil
+						},
 					},
 					BuildInfo: component.NewDefaultBuildInfo(),
 				}
diff --git a/agent/backend/diode/utils.go b/agent/backend/diode/utils.go
index 9ec65ae82..7180f4087 100644
--- a/agent/backend/diode/utils.go
+++ b/agent/backend/diode/utils.go
@@ -9,7 +9,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"time"
 
@@ -47,7 +46,7 @@ func (d *diodeBackend) request(url string, payload interface{}, method string, b
 	}
 
 	if (res.StatusCode < 200) || (res.StatusCode > 299) {
-		body, err := ioutil.ReadAll(res.Body)
+		body, err := io.ReadAll(res.Body)
 		if err != nil {
 			return errors.New(fmt.Sprintf("non 2xx HTTP error code from diode, no or invalid body: %d", res.StatusCode))
 		}
diff --git a/agent/backend/otel/comms.go b/agent/backend/otel/comms.go
new file mode 100644
index 000000000..33a5f397b
--- /dev/null
+++ b/agent/backend/otel/comms.go
@@ -0,0 +1,15 @@
+package otel
+
+import (
+	"fmt"
+	mqtt "github.com/eclipse/paho.mqtt.golang"
+	"strings"
+)
+
+func (o *openTelemetryBackend) SetCommsClient(agentID string, client *mqtt.Client, baseTopic string) {
+	o.mqttClient = client
+	otelBaseTopic := strings.Replace(baseTopic, "?", "otlp", 1)
+	o.otlpMetricsTopic = fmt.Sprintf("%s/m/%c", otelBaseTopic, agentID[0])
+	o.otlpTracesTopic = fmt.Sprintf("%s/t/%c", otelBaseTopic, agentID[0])
+	o.otlpLogsTopic = fmt.Sprintf("%s/l/%c", otelBaseTopic, agentID[0])
+}
diff --git a/agent/backend/otel/exporter_builder.go b/agent/backend/otel/exporter_builder.go
new file mode 100644
index 000000000..7914cb8c8
--- /dev/null
+++ b/agent/backend/otel/exporter_builder.go
@@ -0,0 +1,154 @@
+package otel
+
+import (
+	"go.uber.org/zap"
+	"gopkg.in/yaml.v3"
+	"strconv"
+)
+
+type ExporterBuilder interface {
+	GetStructFromYaml(yamlString string) (openTelemetryConfig, error)
+	MergeDefaultValueWithPolicy(config openTelemetryConfig, policyName string) (openTelemetryConfig, error)
+}
+
+type openTelemetryConfig struct {
+	Receivers  map[string]interface{} `yaml:"receivers"`
+	Processors map[string]interface{} `yaml:"processors,omitempty"`
+	Extensions map[string]interface{} `yaml:"extensions,omitempty"`
+	Exporters  map[string]interface{} `yaml:"exporters"`
+	Service    *service               `yaml:"service"`
+}
+
+type defaultOtlpExporter struct {
+	Endpoint string `yaml:"endpoint"`
+	Tls      *tls   `yaml:"tls"`
+}
+
+type tls struct {
+	Insecure bool `yaml:"insecure"`
+}
+
+type service struct {
+	Pipelines *pipelines `yaml:"pipelines"`
+	Telemetry *telemetry `yaml:"telemetry,omitempty"`
+}
+
+type telemetry struct {
+	Metrics *metrics `yaml:"metrics,omitempty"`
+	Logs    *logs    `yaml:"logs,omitempty"`
+	Traces  *traces  `yaml:"traces,omitempty"`
+}
+
+type metrics struct {
+	Level   string `yaml:"level,omitempty"`
+	Address string `yaml:"address,omitempty"`
+}
+
+type traces struct {
+	Enabled bool `yaml:"enabled"`
+}
+
+type logs struct {
+	Enabled bool `yaml:"enabled"`
+}
+
+type pipelines struct {
+	Metrics *pipeline `yaml:"metrics,omitempty"`
+	Traces  *pipeline `yaml:"traces,omitempty"`
+	Logs    *pipeline `yaml:"logs,omitempty"`
+}
+
+type pipeline struct {
+	Exporters  []string `yaml:"exporters,omitempty"`
+	Receivers  []string `yaml:"receivers,omitempty"`
+	Processors []string `yaml:"processors,omitempty"`
+}
+
+func getExporterBuilder(logger *zap.Logger, host string, port int) *exporterBuilder {
+	return &exporterBuilder{logger: logger, host: host, port: port}
+}
+
+type exporterBuilder struct {
+	logger *zap.Logger
+	host   string
+	port   int
+}
+
+func (e *exporterBuilder) GetStructFromYaml(yamlString string) (openTelemetryConfig, error) {
+	var config openTelemetryConfig
+	if err := yaml.Unmarshal([]byte(yamlString), &config); err != nil {
+		e.logger.Error("failed to unmarshal yaml string", zap.Error(err))
+		return config, err
+	}
+	return config, nil
+}
+
+func (e *exporterBuilder) MergeDefaultValueWithPolicy(config openTelemetryConfig, policyId string, policyName string) (openTelemetryConfig, error) {
+	endpoint := e.host + ":" + strconv.Itoa(e.port)
+	defaultOtlpExporter := defaultOtlpExporter{
+		Endpoint: endpoint,
+		Tls: &tls{
+			Insecure: true,
+		},
+	}
+
+	// Override any openTelemetry exporter that may come, to connect to agent's otlp receiver
+	config.Exporters = map[string]interface{}{
+		"otlp": &defaultOtlpExporter,
+	}
+	if config.Processors == nil {
+		config.Processors = make(map[string]interface{})
+	}
+	config.Processors["transform/policy_data"] = map[string]interface{}{
+		"metric_statements": map[string]interface{}{
+			"context": "scope",
+			"statements": []string{
+				`set(attributes["policy_id"], "` + policyId + `")`,
+				`set(attributes["policy_name"], "` + policyName + `")`,
+			},
+		},
+	}
+	if config.Extensions == nil {
+		config.Extensions = make(map[string]interface{})
+	}
+	tel := &telemetry{
+		Metrics: &metrics{Level: "none"},
+	}
+	config.Service.Telemetry = tel
+	// Override metrics exporter and append attributes/policy_data processor
+	if config.Service.Pipelines.Metrics != nil {
+		config.Service.Pipelines.Metrics.Exporters = []string{"otlp"}
+		config.Service.Pipelines.Metrics.Processors = append(config.Service.Pipelines.Metrics.Processors, "transform/policy_data")
+	}
+	if config.Service.Pipelines.Traces != nil {
+		config.Service.Pipelines.Traces.Exporters = []string{"otlp"}
+		config.Service.Pipelines.Traces.Processors = append(config.Service.Pipelines.Traces.Processors, "transform/policy_data")
+	}
+	if config.Service.Pipelines.Logs != nil {
+		config.Service.Pipelines.Logs.Exporters = []string{"otlp"}
+		config.Service.Pipelines.Logs.Processors = append(config.Service.Pipelines.Logs.Processors, "transform/policy_data")
+	}
+	return config, nil
+}
+
+func (o *openTelemetryBackend) buildDefaultExporterAndProcessor(policyYaml string, policyId string, policyName string, telemetryPort int) (openTelemetryConfig, error) {
+	defaultPolicyYaml, err := yaml.Marshal(policyYaml)
+	if err != nil {
+		o.logger.Warn("yaml policy marshal failure", zap.String("policy_id", policyId))
+		return openTelemetryConfig{}, err
+	}
+	defaultPolicyString := string(defaultPolicyYaml)
+	builder := getExporterBuilder(o.logger, o.otelReceiverHost, o.otelReceiverPort)
+	defaultPolicyStruct, err := builder.GetStructFromYaml(defaultPolicyString)
+	if err != nil {
+		return openTelemetryConfig{}, err
+	}
+	defaultPolicyStruct, err = builder.MergeDefaultValueWithPolicy(
+		defaultPolicyStruct,
+		policyId,
+		policyName)
+	if err != nil {
+		return openTelemetryConfig{}, err
+	}
+	return defaultPolicyStruct, nil
+}
diff --git a/agent/backend/otel/exporter_builder_test.go b/agent/backend/otel/exporter_builder_test.go
new file mode 100644
index 000000000..c12ad0258
--- /dev/null
+++ b/agent/backend/otel/exporter_builder_test.go
@@ -0,0 +1,68 @@
+package otel
+
+import (
+	"go.uber.org/zap"
+	"testing"
+)
+
+func TestBuildDefaultPolicy(t *testing.T) {
+	testCases := []struct {
+		caseName        string
+		inputString     string
+		policyId        string
+		policyName      string
+		expectedStruct  openTelemetryConfig
+		processedString string
+		wantErr         error
+	}{
+		{
+			caseName: "success default policy test",
+			inputString: `
+---
+receivers:
+  httpcheck:
+    targets:
+      - endpoint: http://orb.live
+        method: GET
+      - endpoint: http://orb.community
+        method: GET
+    collection_interval: 60s
+exporters:
+  otlp:
+    endpoint: localhost:4317
+    tls:
+      insecure: true
+  logging:
+    verbosity: detailed
+    sampling_initial: 5
+service:
+  pipelines:
+    metrics:
+      exporters: 
+        - otlp
+      receivers: 
+        - httpcheck
+`,
+			policyId:   "test-policy-id",
+			policyName: "test-policy",
+		},
+	}
+	for _, testCase := range testCases {
+		t.Run(testCase.caseName, func(t *testing.T) {
+			logger := zap.NewNop()
+			exporterBuilder := getExporterBuilder(logger, "localhost", 4317)
+			gotOtelConfig, err := exporterBuilder.GetStructFromYaml(testCase.inputString)
+			if err != nil {
+				t.Errorf("failed to merge default value with policy: %v", err)
+			}
+			expectedStruct, err := exporterBuilder.MergeDefaultValueWithPolicy(gotOtelConfig, testCase.policyId, testCase.policyName)
+			if err != nil {
+				t.Errorf("failed to merge default value with policy: %v", err)
+			}
+			if _, ok := expectedStruct.Processors["transform/policy_data"]; !ok {
+				t.Error("missing required attributes/policy_data processor", err)
+			}
+
+		})
+	}
+}
diff --git a/agent/backend/otel/otel.go b/agent/backend/otel/otel.go
new file mode 100644
index 000000000..68dff2454
--- /dev/null
+++ b/agent/backend/otel/otel.go
@@ -0,0 +1,288 @@
+package otel
+
+import (
+	"context"
+	_ "embed"
+	"fmt"
+	mqtt "github.com/eclipse/paho.mqtt.golang"
+	"github.com/go-cmd/cmd"
+	"github.com/orb-community/orb/agent/backend"
+	"github.com/orb-community/orb/agent/config"
+	"github.com/orb-community/orb/agent/otel"
+	"github.com/orb-community/orb/agent/otel/otlpmqttexporter"
+	"github.com/orb-community/orb/agent/policies"
+	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/exporter"
+	"go.opentelemetry.io/collector/receiver"
+	"go.uber.org/zap"
+	"os"
+	"strconv"
+	"time"
+)
+
+var _ backend.Backend = (*openTelemetryBackend)(nil)
+
+const DefaultPath = "/usr/local/bin/otelcol-contrib"
+const DefaultHost = "localhost"
+const DefaultPort = 4317
+
+type openTelemetryBackend struct {
+	logger    *zap.Logger
+	startTime time.Time
+
+	//policies
+	policyRepo            policies.PolicyRepo
+	policyConfigDirectory string
+	agentTags             map[string]string
+
+	// Context for controlling the context cancellation
+	mainContext        context.Context
+	runningCollectors  map[string]runningPolicy
+	mainCancelFunction context.CancelFunc
+
+	// MQTT Config for OTEL MQTT Exporter
+	mqttConfig config.MQTTConfig
+	mqttClient *mqtt.Client
+
+	otlpMetricsTopic string
+	otlpTracesTopic  string
+	otlpLogsTopic    string
+	otelReceiverTaps []string
+	otelCurrVersion  string
+
+	otelReceiverHost   string
+	otelReceiverPort   int
+	otelExecutablePath string
+
+	metricsReceiver receiver.Metrics
+	metricsExporter exporter.Metrics
+	tracesReceiver  receiver.Traces
+	tracesExporter  exporter.Traces
+	logsReceiver    receiver.Logs
+	logsExporter    exporter.Logs
+}
+
+// Configure initializes the backend with the given configuration
+func (o *openTelemetryBackend) Configure(logger *zap.Logger, repo policies.PolicyRepo,
+	config map[string]string, otelConfig map[string]interface{}) error {
+	o.logger = logger
+	o.logger.Info("configuring OpenTelemetry backend")
+	o.policyRepo = repo
+	var err error
+	o.otelReceiverTaps = []string{"otelcol-contrib", "receivers", "processors", "extensions"}
+	o.policyConfigDirectory, err = os.MkdirTemp("", "otel-policies")
+	if path, ok := config["binary"]; ok {
+		o.otelExecutablePath = path
+	} else {
+		o.otelExecutablePath = DefaultPath
+	}
+	if err != nil {
+		o.logger.Error("failed to create temporary directory for policy configs", zap.Error(err))
+		return err
+	}
+	if agentTags, ok := otelConfig["agent_tags"]; ok {
+		o.agentTags = agentTags.(map[string]string)
+	}
+	if otelPort, ok := config["otlp_port"]; ok {
+		o.otelReceiverPort, err = strconv.Atoi(otelPort)
+		if err != nil {
+			o.logger.Error("failed to parse otlp port using default", zap.Error(err))
+			o.otelReceiverPort = DefaultPort
+		}
+	} else {
+		o.otelReceiverPort = DefaultPort
+	}
+	if otelHost, ok := config["otlp_host"]; ok {
+		o.otelReceiverHost = otelHost
+	} else {
+		o.otelReceiverHost = DefaultHost
+	}
+
+	return nil
+}
+
+func (o *openTelemetryBackend) GetInitialState() backend.RunningStatus {
+	return backend.Waiting
+}
+
+func (o *openTelemetryBackend) Version() (string, error) {
+	if o.otelCurrVersion != "" {
+		return o.otelCurrVersion, nil
+	}
+	ctx, cancel := context.WithTimeout(o.mainContext, 60*time.Second)
+	var versionOutput string
+	command := cmd.NewCmd(o.otelExecutablePath, "--version")
+	status := command.Start()
+	select {
+	case finalStatus := <-status:
+		if finalStatus.Error != nil {
+			o.logger.Error("error during call of otelcol-contrib version", zap.Error(finalStatus.Error))
+			return "", finalStatus.Error
+		} else {
+			output := finalStatus.Stdout
+			o.otelCurrVersion = output[0]
+			versionOutput = output[0]
+		}
+	case <-ctx.Done():
+		o.logger.Error("timeout during getting version", zap.Error(ctx.Err()))
+	}
+
+	cancel()
+	o.logger.Info("running opentelemetry-contrib version", zap.String("version", versionOutput))
+
+	return versionOutput, nil
+
+}
+
+func (o *openTelemetryBackend) Start(ctx context.Context, cancelFunc context.CancelFunc) (err error) {
+	o.runningCollectors = make(map[string]runningPolicy)
+	o.mainCancelFunction = cancelFunc
+	o.mainContext = ctx
+	o.startTime = time.Now()
+	currentWd, err := os.Getwd()
+	if err != nil {
+		o.otelExecutablePath = currentWd + "/otelcol-contrib"
+	}
+	currentVersion, err := o.Version()
+	if err != nil {
+		cancelFunc()
+		o.logger.Error("error during getting current version", zap.Error(err))
+		return err
+	}
+	o.receiveOtlp()
+	o.logger.Info("starting open-telemetry backend using version", zap.String("version", currentVersion))
+	policiesData, err := o.policyRepo.GetAll()
+	if err != nil {
+		cancelFunc()
+		o.logger.Error("failed to start otel backend, policies are absent")
+		return err
+	}
+	for _, policyData := range policiesData {
+		if err := o.ApplyPolicy(policyData, true); err != nil {
+			o.logger.Error("failed to start otel backend, failed to apply policy", zap.Error(err))
+			cancelFunc()
+			return err
+		}
+		o.logger.Info("policy applied successfully", zap.String("policy_id", policyData.ID))
+	}
+
+	return nil
+}
+
+func (o *openTelemetryBackend) Stop(_ context.Context) error {
+	o.logger.Info("stopping all running policies")
+	o.mainCancelFunction()
+	for policyID, policyEntry := range o.runningCollectors {
+		o.logger.Debug("stopping policy context", zap.String("policy_id", policyID))
+		policyEntry.ctx.Done()
+	}
+	return nil
+}
+
+func (o *openTelemetryBackend) FullReset(ctx context.Context) error {
+	o.logger.Info("resetting all policies and restarting, skipping if already killed", zap.Int("policies", len(o.runningCollectors)))
+	for policyID, policyEntry := range o.runningCollectors {
+		o.logger.Debug("stopping policy context", zap.String("policy_id", policyID))
+		policyEntry.ctx.Done()
+		if err := o.ApplyPolicy(policyEntry.policyData, true); err != nil {
+			o.logger.Error("failed to apply policy", zap.Error(err))
+			return err
+		}
+	}
+	backendCtx, cancelFunc := context.WithCancel(context.WithValue(ctx, "routine", "otel"))
+	if err := o.Start(backendCtx, cancelFunc); err != nil {
+		return err
+	}
+	return nil
+}
+
+func Register() bool {
+	backend.Register("otel", &openTelemetryBackend{})
+	return true
+}
+
+func (o *openTelemetryBackend) GetStartTime() time.Time {
+	return o.startTime
+}
+
+// GetCapabilities this will only print a default backend config
+func (o *openTelemetryBackend) GetCapabilities() (capabilities map[string]interface{}, err error) {
+	capabilities = make(map[string]interface{})
+	capabilities["taps"] = o.otelReceiverTaps
+	return
+}
+
+// GetRunningStatus returns cross-reference the Processes using the os, with the policies and contexts
+func (o *openTelemetryBackend) GetRunningStatus() (backend.RunningStatus, string, error) {
+	amountCollectors := len(o.runningCollectors)
+	if amountCollectors > 0 {
+		return backend.Running, fmt.Sprintf("opentelemetry backend running with %d policies", amountCollectors), nil
+	}
+	return backend.Waiting, "opentelemetry backend is waiting for policy to come to start running", nil
+}
+
+func (o *openTelemetryBackend) createOtlpMetricMqttExporter(ctx context.Context, cancelFunc context.CancelFunc) (exporter.Metrics, error) {
+	bridgeService := otel.NewBridgeService(ctx, cancelFunc, &o.policyRepo, o.agentTags)
+	var cfg component.Config
+	if o.mqttClient != nil {
+		cfg = otlpmqttexporter.CreateConfigClient(o.mqttClient, o.otlpMetricsTopic, "", bridgeService)
+	} else {
+		cfg = otlpmqttexporter.CreateConfig(o.mqttConfig.Address, o.mqttConfig.Id, o.mqttConfig.Key,
+			o.mqttConfig.ChannelID, "", o.otlpMetricsTopic, bridgeService)
+	}
+
+	set := otlpmqttexporter.CreateDefaultSettings(o.logger)
+	// Create the OTLP metrics exporter that'll receive and verify the metrics produced.
+	return otlpmqttexporter.CreateMetricsExporter(ctx, set, cfg)
+
+}
+
+func (o *openTelemetryBackend) createOtlpTraceMqttExporter(ctx context.Context, cancelFunc context.CancelFunc) (exporter.Traces, error) {
+	bridgeService := otel.NewBridgeService(ctx, cancelFunc, &o.policyRepo, o.agentTags)
+	if o.mqttClient != nil {
+		cfg := otlpmqttexporter.CreateConfigClient(o.mqttClient, o.otlpTracesTopic, "", bridgeService)
+		set := otlpmqttexporter.CreateDefaultSettings(o.logger)
+		// Create the OTLP metrics metricsExporter that'll receive and verify the metrics produced.
+		tracerExporter, err := otlpmqttexporter.CreateTracesExporter(ctx, set, cfg)
+		if err != nil {
+			return nil, err
+		}
+		return tracerExporter, nil
+	} else {
+		cfg := otlpmqttexporter.CreateConfig(o.mqttConfig.Address, o.mqttConfig.Id, o.mqttConfig.Key,
+			o.mqttConfig.ChannelID, "", o.otlpTracesTopic, bridgeService)
+		set := otlpmqttexporter.CreateDefaultSettings(o.logger)
+		// Create the OTLP metrics exporter that'll receive and verify the metrics produced.
+		tracerExporter, err := otlpmqttexporter.CreateTracesExporter(ctx, set, cfg)
+		if err != nil {
+			return nil, err
+		}
+		return tracerExporter, nil
+	}
+
+}
+
+func (o *openTelemetryBackend) createOtlpLogsMqttExporter(ctx context.Context, cancelFunc context.CancelFunc) (exporter.Logs, error) {
+	bridgeService := otel.NewBridgeService(ctx, cancelFunc, &o.policyRepo, o.agentTags)
+	if o.mqttClient != nil {
+		cfg := otlpmqttexporter.CreateConfigClient(o.mqttClient, o.otlpLogsTopic, "", bridgeService)
+		set := otlpmqttexporter.CreateDefaultSettings(o.logger)
+		// Create the OTLP metrics metricsExporter that'll receive and verify the metrics produced.
+		exporter, err := otlpmqttexporter.CreateLogsExporter(ctx, set, cfg)
+		if err != nil {
+			return nil, err
+		}
+		return exporter, nil
+	} else {
+		cfg := otlpmqttexporter.CreateConfig(o.mqttConfig.Address, o.mqttConfig.Id, o.mqttConfig.Key,
+			o.mqttConfig.ChannelID, "", o.otlpLogsTopic, bridgeService)
+		set := otlpmqttexporter.CreateDefaultSettings(o.logger)
+		// Create the OTLP metrics exporter that'll receive and verify the metrics produced.
+		exporter, err := otlpmqttexporter.CreateLogsExporter(ctx, set, cfg)
+		if err != nil {
+			return nil, err
+		}
+		return exporter, nil
+	}
+
+}
diff --git a/agent/backend/otel/policy.go b/agent/backend/otel/policy.go
new file mode 100644
index 000000000..0a2df10a0
--- /dev/null
+++ b/agent/backend/otel/policy.go
@@ -0,0 +1,177 @@
+package otel
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"os"
+
+	"github.com/go-cmd/cmd"
+	"github.com/orb-community/orb/agent/policies"
+	"go.uber.org/zap"
+	"golang.org/x/exp/slices"
+	"gopkg.in/yaml.v3"
+)
+
+const tempFileNamePattern = "otel-%s-config.yml"
+
+type runningPolicy struct {
+	ctx           context.Context
+	cancel        context.CancelFunc
+	policyId      string
+	telemetryPort int
+	policyData    policies.PolicyData
+	statusChan    *cmd.Status
+}
+
+func (o *openTelemetryBackend) ApplyPolicy(newPolicyData policies.PolicyData, updatePolicy bool) error {
+	o.logger.Debug("applying policy", zap.String("policy_id", newPolicyData.ID))
+	policyYaml, err := yaml.Marshal(newPolicyData.Data)
+	if err != nil {
+		o.logger.Warn("yaml policy marshal failure", zap.String("policy_id", newPolicyData.ID), zap.Any("policy", newPolicyData.Data))
+		return err
+	}
+	builder := getExporterBuilder(o.logger, o.otelReceiverHost, o.otelReceiverPort)
+	otelConfig, err := builder.GetStructFromYaml(string(policyYaml))
+	if err != nil {
+		return err
+	}
+	if err = o.ValidatePolicy(otelConfig); err != nil {
+		return err
+	}
+	otelConfig, err = builder.MergeDefaultValueWithPolicy(otelConfig, newPolicyData.ID, newPolicyData.Name)
+	if err != nil {
+		return err
+	}
+	newPolicyYaml, err := yaml.Marshal(otelConfig)
+	if err != nil {
+		return err
+	}
+	if !updatePolicy || !o.policyRepo.Exists(newPolicyData.ID) {
+		newPolicyPath := fmt.Sprintf("%s/%s", o.policyConfigDirectory, fmt.Sprintf(tempFileNamePattern, newPolicyData.ID))
+		o.logger.Info("received new policy",
+			zap.String("policy_id", newPolicyData.ID),
+			zap.Int32("version", newPolicyData.Version),
+			zap.String("policy_path", newPolicyPath))
+		if err := os.WriteFile(newPolicyPath, newPolicyYaml, os.ModeTemporary); err != nil {
+			return err
+		}
+		if err = o.addRunner(newPolicyData, newPolicyPath); err != nil {
+			return err
+		}
+	} else {
+		currentPolicyData, err := o.policyRepo.Get(newPolicyData.ID)
+		if err != nil {
+			return err
+		}
+		if currentPolicyData.Version <= newPolicyData.Version {
+			currentPolicyPath := fmt.Sprintf("%s/%s", o.policyConfigDirectory, fmt.Sprintf(tempFileNamePattern, currentPolicyData.ID))
+			o.logger.Info("received new policy version",
+				zap.String("policy_id", newPolicyData.ID),
+				zap.Int32("version", newPolicyData.Version),
+				zap.String("policy_path", currentPolicyPath))
+
+			o.removePolicyControl(currentPolicyData.ID)
+
+			if err := os.WriteFile(currentPolicyPath, newPolicyYaml, os.ModeTemporary); err != nil {
+				return err
+			}
+			if err := o.addRunner(newPolicyData, currentPolicyPath); err != nil {
+				return err
+			}
+			if err := o.policyRepo.Update(newPolicyData); err != nil {
+				return err
+			}
+
+			o.otelReceiverTaps = append(o.otelReceiverTaps, newPolicyData.ID)
+		} else {
+			o.logger.Info("current policy version is newer than the one being applied, skipping",
+				zap.String("policy_id", newPolicyData.ID),
+				zap.Int32("current_version", currentPolicyData.Version),
+				zap.Int32("incoming_version", newPolicyData.Version))
+		}
+	}
+
+	return nil
+}
+
+func (o *openTelemetryBackend) addRunner(policyData policies.PolicyData, policyFilePath string) error {
+	policyContext, policyCancel := context.WithCancel(context.WithValue(o.mainContext, "policy_id", policyData.ID))
+	command := cmd.NewCmdOptions(cmd.Options{Buffered: false, Streaming: true}, o.otelExecutablePath, "--config", policyFilePath)
+	go func(ctx context.Context, logger *zap.Logger) {
+		status := command.Start()
+		o.logger.Info("starting otel policy", zap.String("policy_id", policyData.ID),
+			zap.Any("status", command.Status()), zap.Int("process id", command.Status().PID))
+		for command.Status().Complete == false {
+			select {
+			case v := <-ctx.Done():
+				err := command.Stop()
+				if err != nil && !slices.Contains([]string{"command not running", "no such process"}, err.Error()) {
+					logger.Error("failed to stop otel", zap.String("policy_id", policyData.ID),
+						zap.Any("value", v), zap.Error(err))
+				}
+				return
+			case line := <-command.Stdout:
+				if line != "" {
+					logger.Info("otel stdout", zap.String("policy_id", policyData.ID), zap.String("line", line))
+				}
+			case line := <-command.Stderr:
+				if line != "" {
+					logger.Warn("otel stderr", zap.String("policy_id", policyData.ID), zap.String("line", line))
+				}
+			case finalStatus := <-status:
+				logger.Info("otel finished", zap.String("policy_id", policyData.ID), zap.Any("status", finalStatus))
+			}
+		}
+	}(policyContext, o.logger)
+	status := command.Status()
+	policyEntry := runningPolicy{
+		ctx:        policyContext,
+		cancel:     policyCancel,
+		policyId:   policyData.ID,
+		policyData: policyData,
+		statusChan: &status,
+	}
+	o.addPolicyControl(policyEntry, policyData.ID)
+
+	return nil
+}
+
+func (o *openTelemetryBackend) addPolicyControl(policyEntry runningPolicy, policyID string) {
+	o.runningCollectors[policyID] = policyEntry
+}
+
+func (o *openTelemetryBackend) removePolicyControl(policyID string) {
+	policy, ok := o.runningCollectors[policyID]
+	if !ok {
+		o.logger.Error("did not find a running collector for policy id", zap.String("policy_id", policyID))
+		return
+	}
+	policy.cancel()
+}
+
+func (o *openTelemetryBackend) RemovePolicy(data policies.PolicyData) error {
+	if o.policyRepo.Exists(data.ID) {
+		o.removePolicyControl(data.ID)
+		policyPath := fmt.Sprintf("%s/%s", o.policyConfigDirectory, fmt.Sprintf(tempFileNamePattern, data.ID))
+		o.logger.Info("removing policy", zap.String("policy_id", data.ID), zap.String("policy_path", policyPath))
+		// This is a temp file, if it fails to remove, it will be erased once the container is restarted
+		if err := os.Remove(policyPath); err != nil {
+			o.logger.Warn("failed to remove policy file, this won't fail policy removal", zap.String("policy_id", data.ID), zap.Error(err))
+		}
+	}
+	return nil
+}
+
+func (o *openTelemetryBackend) ValidatePolicy(otelConfig openTelemetryConfig) error {
+	if otelConfig.Service.Pipelines.Logs == nil &&
+		otelConfig.Service.Pipelines.Metrics == nil &&
+		otelConfig.Service.Pipelines.Traces == nil {
+		return errors.New("no pipelines defined")
+	}
+	if len(otelConfig.Receivers) == 0 {
+		return errors.New("no receivers defined")
+	}
+
+	return nil
+}
diff --git a/agent/backend/otel/scrape.go b/agent/backend/otel/scrape.go
new file mode 100644
index 000000000..7af68401e
--- /dev/null
+++ b/agent/backend/otel/scrape.go
@@ -0,0 +1,213 @@
+package otel
+
+import (
+	"context"
+	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/config/configgrpc"
+	"go.opentelemetry.io/collector/config/confignet"
+	"go.opentelemetry.io/collector/receiver"
+	"go.opentelemetry.io/collector/receiver/otlpreceiver"
+	"go.opentelemetry.io/otel/sdk/metric"
+	"go.opentelemetry.io/otel/trace"
+	"go.uber.org/zap"
+	"strconv"
+	"time"
+)
+
+func (o *openTelemetryBackend) receiveOtlp() {
+	exeCtx, execCancelF := context.WithCancel(o.mainContext)
+	go func() {
+		defer execCancelF()
+		count := 0
+		maxRetries := 20
+		for {
+			if o.mqttClient != nil {
+				if ok := o.startOtelMetric(exeCtx, execCancelF); !ok {
+					o.logger.Error("failed to start otel metric")
+					return
+				}
+				//if o.startOtelTraces(exeCtx, execCancelF) {
+				//	return
+				//}
+				//if ok := o.startOtelLogs(exeCtx, execCancelF); !ok {
+				//	return
+				//}
+				break
+			} else {
+				count++
+				o.logger.Info("waiting until mqtt client is connected try " + strconv.Itoa(count) + " from " + strconv.Itoa(maxRetries))
+				time.Sleep(time.Second * time.Duration(count))
+				if count >= maxRetries {
+					execCancelF()
+					o.mainCancelFunction()
+					break
+				}
+			}
+		}
+		for {
+			select {
+			case <-exeCtx.Done():
+				o.mainContext.Done()
+				o.mainCancelFunction()
+			case <-o.mainContext.Done():
+				o.logger.Info("stopped Orb OpenTelemetry agent collector")
+				o.mainCancelFunction()
+				return
+			}
+		}
+	}()
+}
+
+func (o *openTelemetryBackend) startOtelMetric(exeCtx context.Context, execCancelF context.CancelFunc) bool {
+	if o.metricsExporter != nil {
+		return true
+	}
+	var err error
+	o.metricsExporter, err = o.createOtlpMetricMqttExporter(exeCtx, execCancelF)
+	if err != nil {
+		o.logger.Error("failed to create a exporter", zap.Error(err))
+		return false
+	}
+	pFactory := otlpreceiver.NewFactory()
+	cfg := pFactory.CreateDefaultConfig()
+	cfg.(*otlpreceiver.Config).Protocols = otlpreceiver.Protocols{
+		GRPC: &configgrpc.GRPCServerSettings{
+			NetAddr: confignet.NetAddr{
+				Endpoint:  o.otelReceiverHost + ":" + strconv.Itoa(o.otelReceiverPort),
+				Transport: "tcp",
+			},
+		},
+	}
+	set := receiver.CreateSettings{
+		TelemetrySettings: component.TelemetrySettings{
+			Logger:         o.logger,
+			TracerProvider: trace.NewNoopTracerProvider(),
+			MeterProvider:  metric.NewMeterProvider(),
+			ReportComponentStatus: func(*component.StatusEvent) error {
+				return nil
+			},
+		},
+		BuildInfo: component.NewDefaultBuildInfo(),
+	}
+	o.metricsReceiver, err = pFactory.CreateMetricsReceiver(exeCtx, set, cfg, o.metricsExporter)
+	if err != nil {
+		o.logger.Error("failed to create a receiver", zap.Error(err))
+		return false
+	}
+	err = o.metricsExporter.Start(exeCtx, nil)
+	if err != nil {
+		o.logger.Error("otel mqtt exporter startup error", zap.Error(err))
+		return false
+	}
+	o.logger.Info("Started receiver for OTLP in orb-agent",
+		zap.String("host", o.otelReceiverHost), zap.Int("port", o.otelReceiverPort))
+	err = o.metricsReceiver.Start(exeCtx, nil)
+	if err != nil {
+		o.logger.Error("otel receiver startup error", zap.Error(err))
+		return false
+	}
+	return true
+}
+
+// TODO fix when create otlpmqtt trace
+//func (o *openTelemetryBackend) startOtelTraces(exeCtx context.Context, execCancelF context.CancelFunc) bool {
+//	if o.tracesExporter != nil {
+//		return true
+//	}
+//	var err error
+//	o.tracesExporter, err = o.createOtlpTraceMqttExporter(exeCtx, execCancelF)
+//	if err != nil {
+//		o.logger.Error("failed to create a exporter", zap.Error(err))
+//		return true
+//	}
+//	pFactory := otlpreceiver.NewFactory()
+//	cfg := pFactory.CreateDefaultConfig()
+//	cfg.(*otlpreceiver.Config).Protocols = otlpreceiver.Protocols{
+//		GRPC: &configgrpc.GRPCServerSettings{
+//			NetAddr: confignet.NetAddr{
+//				Endpoint:  o.otelReceiverHost + ":" + strconv.Itoa(o.otelReceiverPort),
+//				Transport: "tcp",
+//			},
+//		},
+//	}
+//	set := receiver.CreateSettings{
+//		TelemetrySettings: component.TelemetrySettings{
+//			Logger:         o.logger,
+//			TracerProvider: trace.NewNoopTracerProvider(),
+//			MeterProvider:  metric.NewMeterProvider(),
+//			ReportComponentStatus: func(*component.StatusEvent) error {
+//				return nil
+//			},
+//		},
+//		BuildInfo: component.NewDefaultBuildInfo(),
+//	}
+//	o.tracesReceiver, err = pFactory.CreateTracesReceiver(exeCtx, set, cfg, o.tracesExporter)
+//	if err != nil {
+//		o.logger.Error("failed to create a receiver", zap.Error(err))
+//		return true
+//	}
+//	err = o.metricsExporter.Start(exeCtx, nil)
+//	if err != nil {
+//		o.logger.Error("otel mqtt exporter startup error", zap.Error(err))
+//		return true
+//	}
+//	o.logger.Info("Started receiver for OTLP in orb-agent",
+//		zap.String("host", o.otelReceiverHost), zap.Int("port", o.otelReceiverPort))
+//	err = o.metricsReceiver.Start(exeCtx, nil)
+//	if err != nil {
+//		o.logger.Error("otel receiver startup error", zap.Error(err))
+//		return true
+//	}
+//	return false
+//}
+//
+//func (o *openTelemetryBackend) startOtelLogs(exeCtx context.Context, execCancelF context.CancelFunc) bool {
+//	if o.logsExporter != nil {
+//		return true
+//	}
+//	var err error
+//	o.logsExporter, err = o.createOtlpLogsMqttExporter(exeCtx, execCancelF)
+//	if err != nil {
+//		o.logger.Error("failed to create a exporter", zap.Error(err))
+//		return false
+//	}
+//	pFactory := otlpreceiver.NewFactory()
+//	cfg := pFactory.CreateDefaultConfig()
+//	cfg.(*otlpreceiver.Config).Protocols = otlpreceiver.Protocols{
+//		GRPC: &configgrpc.GRPCServerSettings{
+//			NetAddr: confignet.NetAddr{
+//				Endpoint:  o.otelReceiverHost + ":" + strconv.Itoa(o.otelReceiverPort),
+//				Transport: "tcp",
+//			},
+//		},
+//	}
+//	set := receiver.CreateSettings{
+//		TelemetrySettings: component.TelemetrySettings{
+//			Logger:         o.logger,
+//			TracerProvider: trace.NewNoopTracerProvider(),
+//			MeterProvider:  metric.NewMeterProvider(),
+//			ReportComponentStatus: func(*component.StatusEvent) error {
+//				return nil
+//			},
+//		},
+//		BuildInfo: component.NewDefaultBuildInfo(),
+//	}
+//	o.metricsReceiver, err = pFactory.CreateLogsReceiver(exeCtx, set, cfg, o.logsExporter)
+//	if err != nil {
+//		o.logger.Error("failed to create a receiver", zap.Error(err))
+//		return false
+//	}
+//	err = o.metricsExporter.Start(exeCtx, nil)
+//	if err != nil {
+//		o.logger.Error("otel mqtt exporter startup error", zap.Error(err))
+//		return false
+//	}
+//	o.logger.Info("Started receiver for OTLP in orb-agent",
+//		zap.String("host", o.otelReceiverHost), zap.Int("port", o.otelReceiverPort))
+//	err = o.metricsReceiver.Start(exeCtx, nil)
+//	if err != nil {
+//		o.logger.Error("otel receiver startup error", zap.Error(err))
+//		return false
+//	}
+//	return true
+//}
diff --git a/agent/backend/otel/vars.go b/agent/backend/otel/vars.go
new file mode 100644
index 000000000..bf7401fe9
--- /dev/null
+++ b/agent/backend/otel/vars.go
@@ -0,0 +1,7 @@
+package otel
+
+import "github.com/spf13/viper"
+
+func RegisterBackendSpecificVariables(v *viper.Viper) {
+	v.SetDefault("orb.backends.otel.otlp_port", "4316")
+}
diff --git a/agent/backend/pktvisor/pktvisor.go b/agent/backend/pktvisor/pktvisor.go
index 0e8b70894..478cc8bbe 100644
--- a/agent/backend/pktvisor/pktvisor.go
+++ b/agent/backend/pktvisor/pktvisor.go
@@ -37,6 +37,9 @@ const (
 	VersionTimeout      = 2
 	ScrapeTimeout       = 5
 	TapsTimeout         = 5
+	DefaultConfigPath   = "/opt/orb/agent.yaml"
+	DefaultAPIHost      = "localhost"
+	DefaultAPIPort      = "10853"
 )
 
 // AppInfo represents server application information
@@ -99,6 +102,10 @@ func (p *pktvisorBackend) GetStartTime() time.Time {
 	return p.startTime
 }
 
+func (p *pktvisorBackend) GetInitialState() backend.RunningStatus {
+	return backend.Unknown
+}
+
 func (p *pktvisorBackend) SetCommsClient(agentID string, client *mqtt.Client, baseTopic string) {
 	p.mqttClient = client
 	metricsTopic := strings.Replace(baseTopic, "?", "be", 1)
@@ -282,22 +289,23 @@ func (p *pktvisorBackend) Stop(ctx context.Context) error {
 	return nil
 }
 
+// Configure this will set configurations, but if not set, will use the following defaults
 func (p *pktvisorBackend) Configure(logger *zap.Logger, repo policies.PolicyRepo, config map[string]string, otelConfig map[string]interface{}) error {
 	p.logger = logger
 	p.policyRepo = repo
 
 	var prs bool
 	if p.binary, prs = config["binary"]; !prs {
-		return errors.New("you must specify pktvisor binary")
+		p.binary = DefaultBinary
 	}
 	if p.configFile, prs = config["config_file"]; !prs {
-		p.configFile = ""
+		p.configFile = DefaultConfigPath
 	}
 	if p.adminAPIHost, prs = config["api_host"]; !prs {
-		return errors.New("you must specify pktvisor admin API host")
+		p.adminAPIHost = DefaultAPIHost
 	}
 	if p.adminAPIPort, prs = config["api_port"]; !prs {
-		return errors.New("you must specify pktvisor admin API port")
+		p.adminAPIPort = DefaultAPIPort
 	}
 	if agentTags, ok := otelConfig["agent_tags"]; ok {
 		p.agentTags = agentTags.(map[string]string)
@@ -313,9 +321,19 @@ func (p *pktvisorBackend) Configure(logger *zap.Logger, repo policies.PolicyRepo
 		case "Host":
 			p.otelReceiverHost = v.(string)
 		case "Port":
-			p.otelReceiverPort = v.(int)
+			if v.(int) == 0 {
+				var err error
+				p.otelReceiverPort, err = p.getFreePort()
+				if err != nil {
+					p.logger.Error("pktvisor otlp startup error", zap.Error(err))
+					return err
+				}
+			} else {
+				p.otelReceiverPort = v.(int)
+			}
 		}
 	}
+	p.logger.Info("configured otel receiver host", zap.String("host", p.otelReceiverHost), zap.Int("port", p.otelReceiverPort))
 
 	return nil
 }
diff --git a/agent/backend/pktvisor/policy.go b/agent/backend/pktvisor/policy.go
index 3f79e6895..5e4a3dd6a 100644
--- a/agent/backend/pktvisor/policy.go
+++ b/agent/backend/pktvisor/policy.go
@@ -18,8 +18,7 @@ func (p *pktvisorBackend) ApplyPolicy(data policies.PolicyData, updatePolicy boo
 
 	if updatePolicy {
 		// To update a policy it's necessary first remove it and then apply a new version
-		err := p.RemovePolicy(data)
-		if err != nil {
+		if err := p.RemovePolicy(data); err != nil {
 			p.logger.Warn("policy failed to remove", zap.String("policy_id", data.ID), zap.String("policy_name", data.Name), zap.Error(err))
 		}
 	}
diff --git a/agent/backend/pktvisor/scrape.go b/agent/backend/pktvisor/scrape.go
index d1d8b9fb0..9fc825e91 100644
--- a/agent/backend/pktvisor/scrape.go
+++ b/agent/backend/pktvisor/scrape.go
@@ -13,7 +13,6 @@ import (
 	"time"
 
 	"github.com/orb-community/orb/agent/otel"
-
 	"github.com/orb-community/orb/agent/otel/otlpmqttexporter"
 	"github.com/orb-community/orb/fleet"
 	"go.opentelemetry.io/collector/component"
@@ -36,29 +35,70 @@ func (p *pktvisorBackend) scrapeMetrics(period uint) (map[string]interface{}, er
 }
 
 func (p *pktvisorBackend) createOtlpMqttExporter(ctx context.Context, cancelFunc context.CancelFunc) (exporter.Metrics, error) {
-
 	bridgeService := otel.NewBridgeService(ctx, cancelFunc, &p.policyRepo, p.agentTags)
+	var cfg component.Config
 	if p.mqttClient != nil {
-		cfg := otlpmqttexporter.CreateConfigClient(p.mqttClient, p.otlpMetricsTopic, p.pktvisorVersion, bridgeService)
-		set := otlpmqttexporter.CreateDefaultSettings(p.logger)
-		// Create the OTLP metrics metricsExporter that'll receive and verify the metrics produced.
-		metricsExporter, err := otlpmqttexporter.CreateMetricsExporter(ctx, set, cfg)
-		if err != nil {
-			return nil, err
-		}
-		return metricsExporter, nil
+		cfg = otlpmqttexporter.CreateConfigClient(p.mqttClient, p.otlpMetricsTopic, p.pktvisorVersion, bridgeService)
 	} else {
-		cfg := otlpmqttexporter.CreateConfig(p.mqttConfig.Address, p.mqttConfig.Id, p.mqttConfig.Key,
+		cfg = otlpmqttexporter.CreateConfig(p.mqttConfig.Address, p.mqttConfig.Id, p.mqttConfig.Key,
 			p.mqttConfig.ChannelID, p.pktvisorVersion, p.otlpMetricsTopic, bridgeService)
-		set := otlpmqttexporter.CreateDefaultSettings(p.logger)
-		// Create the OTLP metrics exporter that'll receive and verify the metrics produced.
-		metricsExporter, err := otlpmqttexporter.CreateMetricsExporter(ctx, set, cfg)
-		if err != nil {
-			return nil, err
-		}
-		return metricsExporter, nil
 	}
 
+	set := otlpmqttexporter.CreateDefaultSettings(p.logger)
+	// Create the OTLP metrics exporter that'll receive and verify the metrics produced.
+	return otlpmqttexporter.CreateMetricsExporter(ctx, set, cfg)
+}
+
+func (p *pktvisorBackend) startOtelMetric(exeCtx context.Context, execCancelF context.CancelFunc) bool {
+	if p.exporter != nil {
+		return true
+	}
+	var err error
+	p.exporter, err = p.createOtlpMqttExporter(exeCtx, execCancelF)
+	if err != nil {
+		p.logger.Error("failed to create a exporter", zap.Error(err))
+		return false
+	}
+	pFactory := otlpreceiver.NewFactory()
+	cfg := pFactory.CreateDefaultConfig()
+	cfg.(*otlpreceiver.Config).Protocols = otlpreceiver.Protocols{
+		HTTP: &otlpreceiver.HTTPConfig{
+			HTTPServerSettings: &confighttp.HTTPServerSettings{
+				Endpoint: p.otelReceiverHost + ":" + strconv.Itoa(p.otelReceiverPort),
+			},
+			MetricsURLPath: "/v1/metrics",
+		},
+	}
+	set := receiver.CreateSettings{
+		TelemetrySettings: component.TelemetrySettings{
+			Logger:         p.logger,
+			TracerProvider: trace.NewNoopTracerProvider(),
+			MeterProvider:  metric.NewMeterProvider(),
+			ReportComponentStatus: func(*component.StatusEvent) error {
+				return nil
+			},
+		},
+		BuildInfo: component.NewDefaultBuildInfo(),
+	}
+
+	p.receiver, err = pFactory.CreateMetricsReceiver(exeCtx, set, cfg, p.exporter)
+	if err != nil {
+		p.logger.Error("failed to create a receiver", zap.Error(err))
+		return false
+	}
+	err = p.exporter.Start(exeCtx, nil)
+	if err != nil {
+		p.logger.Error("otel mqtt exporter startup error", zap.Error(err))
+		return false
+	}
+	p.logger.Info("Started receiver for OTLP in orb-agent",
+		zap.String("host", p.otelReceiverHost), zap.Int("port", p.otelReceiverPort))
+	err = p.receiver.Start(exeCtx, nil)
+	if err != nil {
+		p.logger.Error("otel receiver startup error", zap.Error(err))
+		return false
+	}
+	return true
 }
 
 func (p *pktvisorBackend) scrapeDefault() error {
@@ -140,50 +180,18 @@ func (p *pktvisorBackend) receiveOtlp() {
 	exeCtx, execCancelF := context.WithCancel(p.ctx)
 	go func() {
 		defer execCancelF()
-		var err error
 		count := 0
 		for {
 			if p.mqttClient != nil {
-				p.exporter, err = p.createOtlpMqttExporter(exeCtx, execCancelF)
-				if err != nil {
-					p.logger.Error("failed to create a exporter", zap.Error(err))
-					return
-				}
-				pFactory := otlpreceiver.NewFactory()
-				cfg := pFactory.CreateDefaultConfig()
-				cfg.(*otlpreceiver.Config).Protocols = otlpreceiver.Protocols{
-					HTTP: &confighttp.HTTPServerSettings{
-						Endpoint: p.otelReceiverHost + ":" + strconv.Itoa(p.otelReceiverPort),
-					},
-				}
-				set := receiver.CreateSettings{
-					TelemetrySettings: component.TelemetrySettings{
-						Logger:         p.logger,
-						TracerProvider: trace.NewNoopTracerProvider(),
-						MeterProvider:  metric.NewMeterProvider(),
-					},
-					BuildInfo: component.NewDefaultBuildInfo(),
-				}
-				p.receiver, err = pFactory.CreateMetricsReceiver(exeCtx, set, cfg, p.exporter)
-				if err != nil {
-					p.logger.Error("failed to create a receiver", zap.Error(err))
-					return
-				}
-				err = p.exporter.Start(exeCtx, nil)
-				if err != nil {
-					p.logger.Error("otel mqtt exporter startup error", zap.Error(err))
-					return
-				}
-				err = p.receiver.Start(exeCtx, nil)
-				if err != nil {
-					p.logger.Error("otel receiver startup error", zap.Error(err))
+				if ok := p.startOtelMetric(exeCtx, execCancelF); !ok {
+					p.logger.Error("failed to start otel metric")
 					return
 				}
 				break
 			} else {
 				count++
 				p.logger.Info("waiting until mqtt client is connected try " + strconv.Itoa(count) + " from 10")
-				time.Sleep(time.Second * 3)
+				time.Sleep(time.Second * time.Duration(count))
 				if count >= 10 {
 					execCancelF()
 					_ = p.Stop(exeCtx)
@@ -197,15 +205,8 @@ func (p *pktvisorBackend) receiveOtlp() {
 				p.ctx.Done()
 				p.cancelFunc()
 			case <-p.ctx.Done():
-				err := p.exporter.Shutdown(exeCtx)
-				if err != nil {
-					return
-				}
-				err = p.receiver.Shutdown(exeCtx)
-				if err != nil {
-					return
-				}
 				p.logger.Info("stopped Orb OpenTelemetry agent collector")
+				p.cancelFunc()
 				return
 			}
 		}
diff --git a/agent/backend/pktvisor/utils.go b/agent/backend/pktvisor/utils.go
index 9dd4aad26..ff8543471 100644
--- a/agent/backend/pktvisor/utils.go
+++ b/agent/backend/pktvisor/utils.go
@@ -11,7 +11,6 @@ import (
 	"github.com/orb-community/orb/agent/backend"
 	"go.uber.org/zap"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"time"
 )
@@ -45,7 +44,7 @@ func (p *pktvisorBackend) request(url string, payload interface{}, method string
 	}
 
 	if (res.StatusCode < 200) || (res.StatusCode > 299) {
-		body, err := ioutil.ReadAll(res.Body)
+		body, err := io.ReadAll(res.Body)
 		if err != nil {
 			return errors.New(fmt.Sprintf("non 2xx HTTP error code from pktvisord, no or invalid body: %d", res.StatusCode))
 		}
@@ -72,6 +71,9 @@ func (p *pktvisorBackend) request(url string, payload interface{}, method string
 }
 
 func (p *pktvisorBackend) getProcRunningStatus() (backend.RunningStatus, string, error) {
+	if p.proc == nil {
+		return backend.Unknown, "backend not started yet", nil
+	}
 	status := p.proc.Status()
 
 	if status.Error != nil {
diff --git a/agent/backend/pktvisor/vars.go b/agent/backend/pktvisor/vars.go
new file mode 100644
index 000000000..c98ead661
--- /dev/null
+++ b/agent/backend/pktvisor/vars.go
@@ -0,0 +1,12 @@
+package pktvisor
+
+import (
+	"github.com/spf13/viper"
+)
+
+func RegisterBackendSpecificVariables(v *viper.Viper) {
+	v.SetDefault("orb.backends.pktvisor.binary", "/usr/local/sbin/pktvisord")
+	v.SetDefault("orb.backends.pktvisor.config_file", "/opt/orb/agent.yaml")
+	v.SetDefault("orb.backends.pktvisor.api_host", "localhost")
+	v.SetDefault("orb.backends.pktvisor.api_port", "10853")
+}
diff --git a/agent/cloud_config/cloud_config.go b/agent/cloud_config/cloud_config.go
index 61b9ee025..d80a5b397 100644
--- a/agent/cloud_config/cloud_config.go
+++ b/agent/cloud_config/cloud_config.go
@@ -15,7 +15,7 @@ import (
 	"github.com/orb-community/orb/pkg/errors"
 	migrate "github.com/rubenv/sql-migrate"
 	"go.uber.org/zap"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 	"strings"
@@ -89,7 +89,7 @@ func (cc *cloudConfigManager) request(address string, token string, response int
 		return getErr
 	}
 	if (res.StatusCode < 200) || (res.StatusCode > 299) {
-		body, err := ioutil.ReadAll(res.Body)
+		body, err := io.ReadAll(res.Body)
 		if err != nil {
 			return errors.New(fmt.Sprintf("expected 2xx status code, no or invalid body: %d", res.StatusCode))
 		}
diff --git a/agent/comms.go b/agent/comms.go
index 21425a98a..c7a634478 100644
--- a/agent/comms.go
+++ b/agent/comms.go
@@ -35,7 +35,7 @@ func (a *orbAgent) connect(ctx context.Context, config config.MQTTConfig) (mqtt.
 	opts.SetCleanSession(true)
 	opts.SetConnectTimeout(5 * time.Minute)
 	opts.SetResumeSubs(true)
-	opts.SetOnConnectHandler(func(client mqtt.Client) {
+	opts.SetReconnectingHandler(func(client mqtt.Client, options *mqtt.ClientOptions) {
 		go func() {
 			ok := false
 			for i := 1; i < 10; i++ {
@@ -43,18 +43,66 @@ func (a *orbAgent) connect(ctx context.Context, config config.MQTTConfig) (mqtt.
 				case <-ctx.Done():
 					return
 				default:
+					if len(a.backends) == 0 {
+						time.Sleep(time.Duration(i) * time.Second)
+						continue
+					}
 					for name, be := range a.backends {
 						backendStatus, s, _ := be.GetRunningStatus()
-						if backend.Running != backendStatus {
+						a.logger.Debug("backend in status", zap.String("backend", name), zap.String("status", s))
+						switch backendStatus {
+						case backend.Running:
+							ok = true
+							a.requestReconnection(ctx, client, config)
+							return
+						case backend.Waiting:
+							ok = true
+							a.requestReconnection(ctx, client, config)
+							return
+						default:
 							a.logger.Info("waiting until a backend is in running state", zap.String("backend", name),
 								zap.String("current state", s), zap.String("wait time", (time.Duration(i)*time.Second).String()))
 							time.Sleep(time.Duration(i) * time.Second)
 							continue
-						} else {
-							// connection problem, should request from control place
+						}
+					}
+				}
+			}
+			if !ok {
+				a.logger.Error("backend wasn't able to change to running, stopping connection")
+				ctx.Done()
+			}
+		}()
+	})
+	opts.SetOnConnectHandler(func(client mqtt.Client) {
+		go func() {
+			ok := false
+			for i := 1; i < 10; i++ {
+				select {
+				case <-ctx.Done():
+					return
+				default:
+					if len(a.backends) == 0 {
+						time.Sleep(time.Duration(i) * time.Second)
+						continue
+					}
+					for name, be := range a.backends {
+						backendStatus, s, _ := be.GetRunningStatus()
+						a.logger.Debug("backend in status", zap.String("backend", name), zap.String("status", s))
+						switch backendStatus {
+						case backend.Running:
 							ok = true
 							a.requestReconnection(ctx, client, config)
 							return
+						case backend.Waiting:
+							ok = true
+							a.requestReconnection(ctx, client, config)
+							return
+						default:
+							a.logger.Info("waiting until a backend is in running state", zap.String("backend", name),
+								zap.String("current state", s), zap.String("wait time", (time.Duration(i)*time.Second).String()))
+							time.Sleep(time.Duration(i) * time.Second)
+							continue
 						}
 					}
 				}
@@ -64,7 +112,6 @@ func (a *orbAgent) connect(ctx context.Context, config config.MQTTConfig) (mqtt.
 				ctx.Done()
 			}
 		}()
-
 	})
 
 	if !a.config.OrbAgent.TLS.Verify {
@@ -84,6 +131,7 @@ func (a *orbAgent) requestReconnection(ctx context.Context, client mqtt.Client,
 	for name, be := range a.backends {
 		be.SetCommsClient(config.Id, &client, fmt.Sprintf("%s/?/%s", a.baseTopic, name))
 	}
+	a.agent_id = config.Id
 
 	if token := client.Subscribe(a.rpcFromCoreTopic, 1, a.handleRPCFromCore); token.Wait() && token.Error() != nil {
 		a.logger.Error("failed to subscribe to agent control plane RPC topic", zap.String("topic", a.rpcFromCoreTopic), zap.Error(token.Error()))
@@ -148,12 +196,18 @@ func (a *orbAgent) removeDatasetFromPolicy(datasetID string, policyID string) {
 func (a *orbAgent) startComms(ctx context.Context, config config.MQTTConfig) error {
 
 	var err error
+	a.logger.Debug("starting mqtt connection")
 	if a.client == nil || !a.client.IsConnected() {
 		a.client, err = a.connect(ctx, config)
 		if err != nil {
 			a.logger.Error("connection failed", zap.String("channel", config.ChannelID), zap.String("agent_id", config.Id), zap.Error(err))
 			return ErrMqttConnection
 		}
+		// Store the data from connection to cloud config within agent.
+		a.config.OrbAgent.Cloud.MQTT.Id = config.Id
+		a.config.OrbAgent.Cloud.MQTT.Key = config.Key
+		a.config.OrbAgent.Cloud.MQTT.Address = config.Address
+		a.config.OrbAgent.Cloud.MQTT.ChannelID = config.ChannelID
 	}
 
 	return nil
diff --git a/agent/docker/Dockerfile b/agent/docker/Dockerfile
index fbb041741..6ce10d025 100644
--- a/agent/docker/Dockerfile
+++ b/agent/docker/Dockerfile
@@ -1,5 +1,5 @@
 ARG PKTVISOR_TAG=latest-develop
-FROM golang:1.19-alpine AS builder
+FROM golang:1.21-alpine AS builder
 
 WORKDIR /go/src/github.com/orbcommunity/orb
 COPY go.mod .
diff --git a/agent/docker/Dockerfile.full b/agent/docker/Dockerfile.full
index 2cdb1598c..a23fc2a92 100644
--- a/agent/docker/Dockerfile.full
+++ b/agent/docker/Dockerfile.full
@@ -1,13 +1,16 @@
+ARG ORB_TAG=develop
 ARG PKTVISOR_TAG=develop
 ARG DIODE_TAG=develop
-ARG ORB_TAG=develop
+ARG OTEL_TAG=0.91.0
+
 FROM orbcommunity/orb-agent:${ORB_TAG} AS orb
 
 FROM orbcommunity/diode-agent:${DIODE_TAG} AS diode
-RUN SQPATH=$(pip show suzieq |  sed -n 's/Location: \(.*\)/\1/p') \
-    && cp -rf "$SQPATH/suzieq" "/tmp/suzieq-patched"
+
+FROM otel/opentelemetry-collector-contrib:${OTEL_TAG} AS otelcol-contrib
 
 FROM orbcommunity/pktvisor:${PKTVISOR_TAG}
+
 # adding orb-agent
 RUN mkdir /opt/orb
 COPY --from=orb /usr/local/bin/orb-agent /usr/local/bin/orb-agent
@@ -18,16 +21,10 @@ COPY --from=orb /run-agent.sh /run-agent.sh
 # adding diode-agent
 COPY --from=diode /usr/local/bin/diode-agent /usr/local/bin/diode-agent
 
-# adding suzieq
-RUN apt-get update && apt-get install -y python3 python3-pip
-RUN python3 -m pip install --upgrade pip && pip install suzieq==0.20.1
-
 # adding suzieq patched
 COPY --from=diode /root/.suzieq /root/.suzieq
-COPY --from=diode /tmp/suzieq-patched /tmp/suzieq-patched
-RUN SQPATH=$(pip show suzieq |  sed -n 's/Location: \(.*\)/\1/p') \
-    && cp -rf /tmp/suzieq-patched/* "$SQPATH/suzieq/" \
-    && rm -rf /tmp/suzieq-patched
+
+COPY --from=otelcol-contrib /otelcol-contrib /usr/local/bin/otelcol-contrib
 
 RUN chmod a+x /run-agent.sh
 
diff --git a/agent/docker/agent_default_full.yaml b/agent/docker/agent_default_full.yaml
index 96c5f7994..2b8e9d0b4 100644
--- a/agent/docker/agent_default_full.yaml
+++ b/agent/docker/agent_default_full.yaml
@@ -11,3 +11,6 @@ orb:
     diode:
       binary: /usr/local/bin/diode-agent
       config_file: /opt/orb/agent_default.yaml
+    otel:
+      binary: /usr/local/bin/otelcol-contrib
+      config_file: /opt/orb/agent_default.yaml
diff --git a/agent/docker/orb-agent-entry.sh b/agent/docker/orb-agent-entry.sh
index 51c74e8a8..cbf354bd5 100755
--- a/agent/docker/orb-agent-entry.sh
+++ b/agent/docker/orb-agent-entry.sh
@@ -21,10 +21,6 @@ if [ -f "asn.mmdb.gz" ]; then
   gzip -d asn.mmdb.gz
   gzip -d city.mmdb.gz
 fi
-#
-
-# orb agent binary location. by default, matches orb-agent container (see Dockerfile)
-orb_agent_bin="${ORB_AGENT_BIN:-/usr/local/bin/orb-agent}"
 
 ## Cloud API Configuration ##
 # support generating API and MQTT addresses with one host name in ORB_CLOUD_ADDRESS
@@ -53,13 +49,14 @@ END
 
 # Checking agent.yaml config file
 CONFIG_FILE_EXISTS=false
-if [ -f "/opt/orb/agent.yaml" ]
-then
-  echo "Contains agent.yaml config file"
+if [ -f "/opt/orb/agent.yaml" ]; then
+  echo "Contains default config file"
+  CONFIG_FILE_EXISTS=true
+elif [[ "$2" == '-c' || "$3" == '-c' ]]; then
+  echo "Contains configuration argument parameter"
   CONFIG_FILE_EXISTS=true
 else
-  echo "Not contains agent.yaml config file, setting default config file"
-  CONFIG_FILE_EXISTS=false
+  echo "Configuration file not provided, default configuration file location is /opt/orb/agent.yaml"
 fi
 
 # Check NetFlow TAP parameters
@@ -170,7 +167,7 @@ do
         nohup /run-agent.sh "$@" &
       else
         # if none config file is set, use the built-in pktvisor configuration file and agent_default.yaml
-        echo "Running with default config file and pktvisor built-in configuration"      
+        echo "Running with default config file and pktvisor built-in configuration"
         # checking if debug mode is enabled
         DEBUG=''
         if [[ "$2" == '-d' ]]; then
diff --git a/agent/docker/run-agent.sh b/agent/docker/run-agent.sh
index 466568c39..1ffa631d5 100644
--- a/agent/docker/run-agent.sh
+++ b/agent/docker/run-agent.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 # orb agent binary location. by default, matches orb-agent container (see Dockerfile)
 orb_agent_bin="${ORB_AGENT_BIN:-/usr/local/bin/orb-agent}"
-#
+echo "Starting orb-agent : $orb_agent_bin with args $#"
+
 if [ $# -eq 0 ]; then
   "$orb_agent_bin" run &
   echo $! > /var/run/orb-agent.pid
diff --git a/agent/otel/otlpmqttexporter/factory.go b/agent/otel/otlpmqttexporter/factory.go
index 44a8a2603..57f609c78 100644
--- a/agent/otel/otlpmqttexporter/factory.go
+++ b/agent/otel/otlpmqttexporter/factory.go
@@ -90,7 +90,7 @@ func CreateConfigClient(client *mqtt.Client, topic, pktvisor string, bridgeServi
 	}
 }
 
-func createTracesExporter(
+func CreateTracesExporter(
 	ctx context.Context,
 	set exporter.CreateSettings,
 	cfg component.Config,
@@ -124,12 +124,11 @@ func CreateMetricsExporter(
 		return nil, err
 	}
 	oCfg := cfg.(*Config)
-	pFunc := oce.pushMetrics
 	return exporterhelper.NewMetricsExporter(
 		ctx,
 		set,
 		cfg,
-		pFunc,
+		oce.pushMetrics,
 		exporterhelper.WithStart(oce.start),
 		exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: false}),
 		// explicitly disable since we rely on http.Client timeout logic.
diff --git a/agent/otel/otlpmqttexporter/otlp.go b/agent/otel/otlpmqttexporter/otlp.go
index f8dc9cfa6..f2f0cb9f0 100644
--- a/agent/otel/otlpmqttexporter/otlp.go
+++ b/agent/otel/otlpmqttexporter/otlp.go
@@ -147,10 +147,11 @@ func (e *baseExporter) pushMetrics(ctx context.Context, md pmetric.Metrics) erro
 	scopes := pmetricotlp.NewExportRequestFromMetrics(md).Metrics().ResourceMetrics().At(0).ScopeMetrics()
 	for i := 0; i < scopes.Len(); i++ {
 		scope := scopes.At(i)
-		policyName := scope.Scope().Name()
-		agentData, err := e.config.OrbAgentService.RetrieveAgentInfoByPolicyName(policyName)
+		policyName, _ := scope.Scope().Attributes().Get("policy_name")
+		policyNameStr := policyName.AsString()
+		agentData, err := e.config.OrbAgentService.RetrieveAgentInfoByPolicyName(policyNameStr)
 		if err != nil {
-			e.logger.Warn("Policy is not managed by orb", zap.String("policyName", policyName))
+			e.logger.Warn("Policy is not managed by orb", zap.String("policyName", policyNameStr))
 			continue
 		}
 
@@ -167,7 +168,7 @@ func (e *baseExporter) pushMetrics(ctx context.Context, md pmetric.Metrics) erro
 		scope.Scope().Attributes().PutStr("policy_id", agentData.PolicyID)
 		scope.Scope().Attributes().PutStr("dataset_ids", datasets)
 		scope.CopyTo(ref.ScopeMetrics().AppendEmpty())
-		e.logger.Info("scraped metrics for policy", zap.String("policy", policyName), zap.String("policy_id", agentData.PolicyID))
+		e.logger.Info("scraped metrics for policy", zap.String("policy", policyNameStr), zap.String("policy_id", agentData.PolicyID))
 	}
 
 	request, err := tr.MarshalProto()
@@ -301,7 +302,9 @@ func (e *baseExporter) export(ctx context.Context, topic string, request []byte)
 		e.config.OrbAgentService.NotifyAgentDisconnection(ctx, token.Error())
 		return token.Error()
 	}
-	e.logger.Info("scraped and published telemetry", zap.String("topic", topic), zap.Int("payload_size_b", len(request)), zap.Int("compressed_payload_size_b", len(compressedPayload)))
+	e.logger.Debug("scraped and published telemetry", zap.String("topic", topic),
+		zap.Int("payload_size_b", len(request)),
+		zap.Int("compressed_payload_size_b", len(compressedPayload)))
 
 	return nil
 }
diff --git a/agent/rpc_from.go b/agent/rpc_from.go
index 638297ce8..e72c312a8 100644
--- a/agent/rpc_from.go
+++ b/agent/rpc_from.go
@@ -16,6 +16,7 @@ import (
 
 func (a *orbAgent) handleGroupMembership(rpc fleet.GroupMembershipRPCPayload) {
 	// if this is the full list, reset all group subscriptions and subscribed to this list
+	_, _ = a.extendContext("handleGroupMembership")
 	if rpc.FullList {
 		a.unsubscribeGroupChannels()
 		a.subscribeGroupChannels(rpc.Groups)
@@ -30,6 +31,7 @@ func (a *orbAgent) handleGroupMembership(rpc fleet.GroupMembershipRPCPayload) {
 }
 
 func (a *orbAgent) handleAgentPolicies(ctx context.Context, rpc []fleet.AgentPolicyRPCPayload, fullList bool) {
+	ctx, _ = a.extendContext("handleAgentPolicies")
 	if fullList {
 		policies, err := a.policyManager.GetRepo().GetAll()
 		if err != nil {
@@ -177,7 +179,7 @@ func (a *orbAgent) handleAgentReset(ctx context.Context, payload fleet.AgentRese
 }
 
 func (a *orbAgent) handleRPCFromCore(client mqtt.Client, message mqtt.Message) {
-	handleMsgCtx, handleMsgCtxCancelFunc := context.WithCancel(context.WithValue(context.Background(), "routine", "fromCore_rpc_handler"))
+	handleMsgCtx, handleMsgCtxCancelFunc := a.extendContext("handleRPCFromCore")
 	go func(ctx context.Context, cancelFunc context.CancelFunc) {
 		a.logger.Debug("RPC message from core", zap.String("topic", message.Topic()), zap.ByteString("payload", message.Payload()))
 
diff --git a/cmd/agent/main.go b/cmd/agent/main.go
index 416c42b22..3a153123f 100644
--- a/cmd/agent/main.go
+++ b/cmd/agent/main.go
@@ -7,6 +7,7 @@ package main
 import (
 	"context"
 	"fmt"
+	"github.com/orb-community/orb/agent/backend/otel"
 	"os"
 	"os/signal"
 	"strings"
@@ -34,37 +35,27 @@ var (
 
 func init() {
 	pktvisor.Register()
+	otel.Register()
 	diode.Register()
 }
 
-func Version(cmd *cobra.Command, args []string) {
+func Version(_ *cobra.Command, _ []string) {
 	fmt.Printf("orb-agent %s\n", buildinfo.GetVersion())
 	os.Exit(0)
 }
 
-func Run(cmd *cobra.Command, args []string) {
+func Run(_ *cobra.Command, _ []string) {
 
 	initConfig()
 
 	// configuration
-	var config config.Config
-	err := viper.Unmarshal(&config)
+	var configData config.Config
+	err := viper.Unmarshal(&configData)
 	if err != nil {
-		cobra.CheckErr(fmt.Errorf("agent start up error (config): %w", err))
+		cobra.CheckErr(fmt.Errorf("agent start up error (configData): %w", err))
 		os.Exit(1)
 	}
 
-	// include pktvisor backend by default if binary is at default location
-	_, err = os.Stat(pktvisor.DefaultBinary)
-	if err == nil && config.OrbAgent.Backends == nil {
-		config.OrbAgent.Backends = make(map[string]map[string]string)
-		config.OrbAgent.Backends["pktvisor"] = make(map[string]string)
-		config.OrbAgent.Backends["pktvisor"]["binary"] = pktvisor.DefaultBinary
-		if len(cfgFiles) > 0 {
-			config.OrbAgent.Backends["pktvisor"]["config_file"] = cfgFiles[0]
-		}
-	}
-
 	// logger
 	var logger *zap.Logger
 	atomicLevel := zap.NewAtomicLevel()
@@ -85,8 +76,25 @@ func Run(cmd *cobra.Command, args []string) {
 		_ = logger.Sync()
 	}(logger)
 
+	// include pktvisor backend by default if binary is at default location
+	_, err = os.Stat(pktvisor.DefaultBinary)
+	logger.Info("backends loaded", zap.Any("backends", configData.OrbAgent.Backends))
+	if err == nil && configData.OrbAgent.Backends == nil {
+		logger.Info("no backends loaded, adding pktvisor as default")
+		configData.OrbAgent.Backends = make(map[string]map[string]string)
+		configData.OrbAgent.Backends["pktvisor"] = make(map[string]string)
+		configData.OrbAgent.Backends["pktvisor"]["binary"] = pktvisor.DefaultBinary
+		configData.OrbAgent.Backends["pktvisor"]["api_host"] = "localhost"
+		if _, ok := configData.OrbAgent.Backends["pktvisor"]["api_port"]; !ok {
+			configData.OrbAgent.Backends["pktvisor"]["api_port"] = "10853"
+		}
+		if len(cfgFiles) > 0 {
+			configData.OrbAgent.Backends["pktvisor"]["config_file"] = cfgFiles[0]
+		}
+	}
+
 	// new agent
-	a, err := agent.New(logger, config)
+	a, err := agent.New(logger, configData)
 	if err != nil {
 		logger.Error("agent start up error", zap.Error(err))
 		os.Exit(1)
@@ -149,11 +157,6 @@ func mergeOrError(path string) {
 	v.SetDefault("orb.otel.port", 0)
 	v.SetDefault("orb.debug.enable", Debug)
 
-	v.SetDefault("orb.backends.pktvisor.binary", "/usr/local/sbin/pktvisord")
-	v.SetDefault("orb.backends.pktvisor.config_file", "/opt/orb/agent.yaml")
-	v.SetDefault("orb.backends.pktvisor.api_host", "localhost")
-	v.SetDefault("orb.backends.pktvisor.api_port", "10853")
-
 	if len(path) > 0 {
 		cobra.CheckErr(v.ReadInConfig())
 	}
@@ -171,12 +174,28 @@ func mergeOrError(path string) {
 		}
 	}
 
+	// load backend static functions for setting up default values
+	backendVarsFunction := make(map[string]func(*viper.Viper))
+	backendVarsFunction["pktvisor"] = pktvisor.RegisterBackendSpecificVariables
+	backendVarsFunction["otel"] = otel.RegisterBackendSpecificVariables
+
+	// check if backends are configured
+	// if not then add pktvisor as default
+	if len(path) > 0 && len(v.GetStringMap("orb.backends")) == 0 {
+		pktvisor.RegisterBackendSpecificVariables(v)
+	} else {
+		for backendName := range v.GetStringMap("orb.backends") {
+			if backend := v.GetStringMap("orb.backends." + backendName); backend != nil {
+				backendVarsFunction[backendName](v)
+			}
+		}
+	}
+
 	cobra.CheckErr(viper.MergeConfigMap(v.AllSettings()))
 }
 
 // initConfig reads in config file and ENV variables if set.
 func initConfig() {
-
 	// set defaults first
 	mergeOrError("")
 	if len(cfgFiles) == 0 {
@@ -214,5 +233,5 @@ func main() {
 
 	rootCmd.AddCommand(runCmd)
 	rootCmd.AddCommand(versionCmd)
-	rootCmd.Execute()
+	_ = rootCmd.Execute()
 }
diff --git a/cmd/fleet/main.go b/cmd/fleet/main.go
index a80ec7b5c..b491c8dde 100644
--- a/cmd/fleet/main.go
+++ b/cmd/fleet/main.go
@@ -11,8 +11,8 @@ package main
 import (
 	"context"
 	"fmt"
+	"github.com/orb-community/orb/fleet/backend/otel"
 	"io"
-	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
@@ -210,7 +210,7 @@ func connectToRedis(redisURL, redisPass, redisDB string, logger *zap.Logger) *r.
 
 func initJaeger(svcName, url string, logger *zap.Logger) (opentracing.Tracer, io.Closer) {
 	if url == "" {
-		return opentracing.NoopTracer{}, ioutil.NopCloser(nil)
+		return opentracing.NoopTracer{}, io.NopCloser(nil)
 	}
 
 	tracer, closer, err := jconfig.Configuration{
@@ -242,9 +242,10 @@ func newFleetService(auth mainflux.AuthServiceClient, db *sqlx.DB, logger *zap.L
 
 	pktvisor.Register(auth, agentRepo)
 	diode.Register(auth, agentRepo)
+	otel.Register(auth, agentRepo)
 
 	svc := fleet.NewFleetService(logger, auth, agentRepo, agentGroupRepo, agentComms, mfsdk, aDone)
-	svc = redisprod.NewEventStoreMiddleware(svc, esClient)
+	svc = redisprod.NewEventStoreMiddleware(svc, esClient, logger)
 	svc = fleethttp.NewLoggingMiddleware(svc, logger)
 	svc = fleethttp.MetricsMiddleware(
 		auth,
diff --git a/cmd/maestro/main.go b/cmd/maestro/main.go
index 97f3617c6..fc7ed5027 100644
--- a/cmd/maestro/main.go
+++ b/cmd/maestro/main.go
@@ -11,6 +11,8 @@ package main
 import (
 	"context"
 	"fmt"
+	"github.com/jmoiron/sqlx"
+	"github.com/orb-community/orb/maestro/postgres"
 	"io"
 	"os"
 	"os/signal"
@@ -36,9 +38,10 @@ import (
 )
 
 const (
-	svcName   = "maestro"
-	envPrefix = "orb_maestro"
-	httpPort  = "8500"
+	svcName    = "maestro"
+	envPrefix  = "orb_maestro"
+	sinkPrefix = "orb_sinks"
+	httpPort   = "8500"
 )
 
 func main() {
@@ -48,6 +51,9 @@ func main() {
 	svcCfg := config.LoadBaseServiceConfig(envPrefix, httpPort)
 	jCfg := config.LoadJaegerConfig(envPrefix)
 	sinksGRPCCfg := config.LoadGRPCConfig("orb", "sinks")
+	dbCfg := config.LoadPostgresConfig(envPrefix, svcName)
+	encryptionKey := config.LoadEncryptionKey(sinkPrefix)
+	svcCfg.EncryptionKey = encryptionKey.Key
 
 	// logger
 	var logger *zap.Logger
@@ -110,8 +116,10 @@ func main() {
 	}
 	sinksGRPCClient := sinksgrpc.NewClient(tracer, sinksGRPCConn, sinksGRPCTimeout, logger)
 	otelCfg := config.LoadOtelConfig(envPrefix)
+	db := connectToDB(dbCfg, logger)
+	defer db.Close()
 
-	svc := maestro.NewMaestroService(logger, streamEsClient, sinkerEsClient, sinksGRPCClient, streamEsCfg, otelCfg)
+	svc := maestro.NewMaestroService(logger, streamEsClient, sinkerEsClient, sinksGRPCClient, otelCfg, db, svcCfg)
 	errs := make(chan error, 2)
 
 	mainContext, mainCancelFunction := context.WithCancel(context.Background())
@@ -132,6 +140,15 @@ func main() {
 	logger.Error(fmt.Sprintf("Maestro service terminated: %s", err))
 }
 
+func connectToDB(cfg config.PostgresConfig, logger *zap.Logger) *sqlx.DB {
+	db, err := postgres.Connect(cfg)
+	if err != nil {
+		logger.Error("Failed to connect to postgres", zap.Error(err))
+		os.Exit(1)
+	}
+	return db
+}
+
 func connectToGRPC(cfg config.GRPCConfig, logger *zap.Logger) *grpc.ClientConn {
 	var opts []grpc.DialOption
 	tls, err := strconv.ParseBool(cfg.ClientTLS)
@@ -211,7 +228,7 @@ func loadStreamEsConfig(prefix string) config.EsConfig {
 	cfg.AllowEmptyEnv(true)
 	cfg.AutomaticEnv()
 	var esC config.EsConfig
-	cfg.Unmarshal(&esC)
+	_ = cfg.Unmarshal(&esC)
 	return esC
 }
 
@@ -226,6 +243,6 @@ func loadSinkerEsConfig(prefix string) config.EsConfig {
 	cfg.AllowEmptyEnv(true)
 	cfg.AutomaticEnv()
 	var esC config.EsConfig
-	cfg.Unmarshal(&esC)
+	_ = cfg.Unmarshal(&esC)
 	return esC
 }
diff --git a/cmd/policies/main.go b/cmd/policies/main.go
index 7af2134dc..9ec9fa3d8 100644
--- a/cmd/policies/main.go
+++ b/cmd/policies/main.go
@@ -29,7 +29,6 @@ import (
 	"go.uber.org/zap/zapcore"
 	"google.golang.org/grpc/reflection"
 	"io"
-	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
@@ -175,7 +174,7 @@ func connectToRedis(redisURL, redisPass, redisDB string, logger *zap.Logger) *r.
 
 func initJaeger(svcName, url string, logger *zap.Logger) (opentracing.Tracer, io.Closer) {
 	if url == "" {
-		return opentracing.NoopTracer{}, ioutil.NopCloser(nil)
+		return opentracing.NoopTracer{}, io.NopCloser(nil)
 	}
 
 	tracer, closer, err := jconfig.Configuration{
diff --git a/cmd/sinker/main.go b/cmd/sinker/main.go
index e1ebf79cf..4f8dcca4e 100644
--- a/cmd/sinker/main.go
+++ b/cmd/sinker/main.go
@@ -9,7 +9,6 @@
 package main
 
 import (
-	"context"
 	"fmt"
 	kitprometheus "github.com/go-kit/kit/metrics/prometheus"
 	"github.com/go-redis/redis/v8"
@@ -20,10 +19,6 @@ import (
 	"github.com/orb-community/orb/pkg/config"
 	policiesgrpc "github.com/orb-community/orb/policies/api/grpc"
 	"github.com/orb-community/orb/sinker"
-	sinkconfig "github.com/orb-community/orb/sinker/config"
-	cacheconfig "github.com/orb-community/orb/sinker/redis"
-	"github.com/orb-community/orb/sinker/redis/consumer"
-	"github.com/orb-community/orb/sinker/redis/producer"
 	sinksgrpc "github.com/orb-community/orb/sinks/api/grpc"
 	stdprometheus "github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
@@ -34,7 +29,6 @@ import (
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/insecure"
 	"io"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
@@ -102,6 +96,12 @@ func main() {
 	}
 
 	cacheClient := connectToRedis(cacheCfg.URL, cacheCfg.Pass, cacheCfg.DB, logger)
+	defer func(client *redis.Client) {
+		err := client.Close()
+		if err != nil {
+			log.Fatalf(err.Error())
+		}
+	}(cacheClient)
 
 	esClient := connectToRedis(esCfg.URL, esCfg.Pass, esCfg.DB, logger)
 	defer func(esClient *redis.Client) {
@@ -168,8 +168,6 @@ func main() {
 	}
 	sinksGRPCClient := sinksgrpc.NewClient(tracer, sinksGRPCConn, sinksGRPCTimeout, logger)
 
-	configRepo := cacheconfig.NewSinkerCache(cacheClient, logger)
-	configRepo = producer.NewEventStoreMiddleware(configRepo, esClient, logger)
 	gauge := kitprometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
 		Namespace: "sinker",
 		Subsystem: "sink",
@@ -192,7 +190,7 @@ func main() {
 	otelEnabled := otelCfg.Enable == "true"
 	otelKafkaUrl := otelCfg.KafkaUrl
 
-	svc := sinker.New(logger, pubSub, esClient, configRepo, policiesGRPCClient, fleetGRPCClient, sinksGRPCClient,
+	svc := sinker.New(logger, pubSub, esClient, cacheClient, policiesGRPCClient, fleetGRPCClient, sinksGRPCClient,
 		otelKafkaUrl, otelEnabled, gauge, counter, inputCounter, inMemoryCacheConfig.DefaultExpiration)
 	defer func(svc sinker.Service) {
 		err := svc.Stop()
@@ -204,7 +202,6 @@ func main() {
 	errs := make(chan error, 2)
 
 	go startHTTPServer(svcCfg, errs, logger)
-	go subscribeToSinksES(svc, configRepo, esClient, esCfg, logger)
 
 	err = svc.Start()
 	if err != nil {
@@ -286,7 +283,7 @@ func connectToGRPC(cfg config.GRPCConfig, logger *zap.Logger) *grpc.ClientConn {
 
 func initJaeger(svcName, url string, logger *zap.Logger) (opentracing.Tracer, io.Closer) {
 	if url == "" {
-		return opentracing.NoopTracer{}, ioutil.NopCloser(nil)
+		return opentracing.NoopTracer{}, io.NopCloser(nil)
 	}
 
 	tracer, closer, err := jconfig.Configuration{
@@ -307,11 +304,3 @@ func initJaeger(svcName, url string, logger *zap.Logger) (opentracing.Tracer, io
 
 	return tracer, closer
 }
-
-func subscribeToSinksES(svc sinker.Service, configRepo sinkconfig.ConfigRepo, client *redis.Client, cfg config.EsConfig, logger *zap.Logger) {
-	eventStore := consumer.NewEventStore(svc, configRepo, client, cfg.Consumer, logger)
-	logger.Info("Subscribed to Redis Event Store for sinks")
-	if err := eventStore.Subscribe(context.Background()); err != nil {
-		logger.Error("Bootstrap service failed to subscribe to event sourcing", zap.Error(err))
-	}
-}
diff --git a/cmd/sinks/main.go b/cmd/sinks/main.go
index be4dffe70..e57858ffa 100644
--- a/cmd/sinks/main.go
+++ b/cmd/sinks/main.go
@@ -11,6 +11,17 @@ package main
 import (
 	"context"
 	"fmt"
+	"io"
+	"log"
+	"net"
+	"net/http"
+	"os"
+	"os/signal"
+	"strconv"
+	"strings"
+	"syscall"
+	"time"
+
 	authapi "github.com/mainflux/mainflux/auth/api/grpc"
 	mfsdk "github.com/mainflux/mainflux/pkg/sdk/go"
 	opentracing "github.com/opentracing/opentracing-go"
@@ -27,17 +38,6 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"google.golang.org/grpc/reflection"
-	"io"
-	"io/ioutil"
-	"log"
-	"net"
-	"net/http"
-	"os"
-	"os/signal"
-	"strconv"
-	"strings"
-	"syscall"
-	"time"
 
 	kitprometheus "github.com/go-kit/kit/metrics/prometheus"
 	r "github.com/go-redis/redis/v8"
@@ -126,6 +126,7 @@ func main() {
 	go startHTTPServer(tracer, svc, svcCfg, logger, errs)
 	go startGRPCServer(svc, tracer, sinksGRPCCfg, logger, errs)
 	go subscribeToSinkerES(svc, esClient, esCfg, logger)
+	go subscribeToMaestroStatusES(svc, esClient, esCfg, logger)
 
 	go func() {
 		c := make(chan os.Signal)
@@ -162,7 +163,7 @@ func connectToRedis(redisURL, redisPass, redisDB string, logger *zap.Logger) *r.
 
 func initJaeger(svcName, url string, logger *zap.Logger) (opentracing.Tracer, io.Closer) {
 	if url == "" {
-		return opentracing.NoopTracer{}, ioutil.NopCloser(nil)
+		return opentracing.NoopTracer{}, io.NopCloser(nil)
 	}
 
 	tracer, closer, err := jconfig.Configuration{
@@ -193,7 +194,7 @@ func newSinkService(auth mainflux.AuthServiceClient, logger *zap.Logger, esClien
 	mfsdk := mfsdk.NewSDK(config)
 
 	svc := sinks.NewSinkService(logger, auth, repoSink, mfsdk, passwordService)
-	svc = redisprod.NewEventStoreMiddleware(svc, esClient)
+	svc = redisprod.NewSinkStreamProducerMiddleware(svc, esClient)
 	svc = sinkshttp.NewLoggingMiddleware(svc, logger)
 	svc = sinkshttp.MetricsMiddleware(
 		auth,
@@ -286,6 +287,14 @@ func subscribeToSinkerES(svc sinks.SinkService, client *r.Client, cfg config.EsC
 	eventStore := rediscons.NewEventStore(svc, client, cfg.Consumer, logger)
 	logger.Info("Subscribed to Redis Event Store for sinker")
 	if err := eventStore.Subscribe(context.Background()); err != nil {
-		logger.Error("Bootstrap service failed to subscribe to event sourcing", zap.Error(err))
+		logger.Error("Bootstrap service failed to subscribe to sinker event sourcing", zap.Error(err))
+	}
+}
+
+func subscribeToMaestroStatusES(svc sinks.SinkService, client *r.Client, cfg config.EsConfig, logger *zap.Logger) {
+	eventStore := rediscons.NewSinkStatusListener(logger, client, svc)
+	logger.Info("Subscribed to Redis Event Store for maestro")
+	if err := eventStore.SubscribeToMaestroSinkStatus(context.Background()); err != nil {
+		logger.Error("Bootstrap service failed to subscribe to maestro event sourcing", zap.Error(err))
 	}
 }
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3a740b963..2a59fa816 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19-alpine AS builder
+FROM golang:1.21-alpine AS builder
 ARG SVC
 ARG GOARCH
 ARG GOARM
@@ -13,7 +13,7 @@ RUN make $SVC \
 FROM alpine:latest
 ARG SVC
 
-RUN if [[ "maestro" == "$SVC" ]]; then apk update && apk add --no-cache docker-cli bash curl && curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl && chmod +x ./kubectl && mv ./kubectl /usr/local/bin/kubectl; fi
+RUN if [[ "maestro" == "$SVC" ]]; then apk update && apk add --no-cache docker-cli bash curl && curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.27.4/bin/linux/amd64/kubectl && chmod +x ./kubectl && mv ./kubectl /usr/local/bin/kubectl; fi
 # Certificates are needed so that mailing util can work.
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=builder /exe /
diff --git a/docker/Dockerfile.debug b/docker/Dockerfile.debug
index fa0504598..04a498ac0 100644
--- a/docker/Dockerfile.debug
+++ b/docker/Dockerfile.debug
@@ -1,4 +1,4 @@
-FROM golang:1.19-alpine AS builder
+FROM golang:1.21-alpine AS builder
 ARG SVC
 ARG GOARCH
 ARG GOARM
diff --git a/fleet/api/http/logging.go b/fleet/api/http/logging.go
index f1493a395..d578f615d 100644
--- a/fleet/api/http/logging.go
+++ b/fleet/api/http/logging.go
@@ -25,7 +25,7 @@ func (l loggingMiddleware) ViewAgentMatchingGroupsByIDInternal(ctx context.Conte
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: view_agent_matching_groups_by_idinternal",
+			l.logger.Debug("method call: view_agent_matching_groups_by_idinternal",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -39,7 +39,7 @@ func (l loggingMiddleware) ResetAgent(ct context.Context, token string, agentID
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: reset_agent",
+			l.logger.Debug("method call: reset_agent",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -53,7 +53,7 @@ func (l loggingMiddleware) ViewAgentInfoByChannelIDInternal(ctx context.Context,
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: view_owner_by_channel_id",
+			l.logger.Debug("method call: view_owner_by_channel_id",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -67,7 +67,7 @@ func (l loggingMiddleware) ViewAgentBackend(ctx context.Context, token string, n
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: view_agent_backend",
+			l.logger.Debug("method call: view_agent_backend",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -81,7 +81,7 @@ func (l loggingMiddleware) ListAgentBackends(ctx context.Context, token string)
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: list_agent_backends",
+			l.logger.Debug("method call: list_agent_backends",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -95,7 +95,7 @@ func (l loggingMiddleware) ViewAgentByIDInternal(ctx context.Context, ownerID st
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: view_agent_by_id_internal",
+			l.logger.Debug("method call: view_agent_by_id_internal",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -109,7 +109,7 @@ func (l loggingMiddleware) ViewAgentByID(ctx context.Context, token string, thin
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: view_agent_by_id",
+			l.logger.Debug("method call: view_agent_by_id",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -123,7 +123,7 @@ func (l loggingMiddleware) ViewAgentMatchingGroupsByID(ctx context.Context, toke
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: view_agent_matching_groups_by_id",
+			l.logger.Debug("method call: view_agent_matching_groups_by_id",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -137,7 +137,7 @@ func (l loggingMiddleware) EditAgent(ctx context.Context, token string, agent fl
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: edit_agent_by_id",
+			l.logger.Debug("method call: edit_agent_by_id",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -151,7 +151,7 @@ func (l loggingMiddleware) ViewAgentGroupByIDInternal(ctx context.Context, group
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: view_agent_group_by_id_internal",
+			l.logger.Debug("method call: view_agent_group_by_id_internal",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -165,7 +165,7 @@ func (l loggingMiddleware) ViewAgentGroupByID(ctx context.Context, groupID strin
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: view_agent_group_by_id",
+			l.logger.Debug("method call: view_agent_group_by_id",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -179,7 +179,7 @@ func (l loggingMiddleware) ListAgentGroups(ctx context.Context, token string, pm
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: list_agent_groups",
+			l.logger.Debug("method call: list_agent_groups",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -193,7 +193,7 @@ func (l loggingMiddleware) EditAgentGroup(ctx context.Context, token string, ag
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: edit_agent_groups",
+			l.logger.Debug("method call: edit_agent_groups",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -207,7 +207,7 @@ func (l loggingMiddleware) ListAgents(ctx context.Context, token string, pm flee
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: list_agents",
+			l.logger.Debug("method call: list_agents",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -222,7 +222,7 @@ func (l loggingMiddleware) CreateAgent(ctx context.Context, token string, a flee
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: create_agent",
+			l.logger.Debug("method call: create_agent",
 				zap.String("name", a.Name.String()),
 				zap.Duration("duration", time.Since(begin)))
 		}
@@ -238,7 +238,7 @@ func (l loggingMiddleware) CreateAgentGroup(ctx context.Context, token string, s
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: create_agent_group",
+			l.logger.Debug("method call: create_agent_group",
 				zap.String("name", s.Name.String()),
 				zap.Duration("duration", time.Since(begin)))
 		}
@@ -253,7 +253,7 @@ func (l loggingMiddleware) RemoveAgentGroup(ctx context.Context, token, groupID
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: delete_agent_groups",
+			l.logger.Debug("method call: delete_agent_groups",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -268,7 +268,7 @@ func (l loggingMiddleware) ValidateAgentGroup(ctx context.Context, token string,
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: validate_agent_group",
+			l.logger.Debug("method call: validate_agent_group",
 				zap.String("name", s.Name.String()),
 				zap.Duration("duration", time.Since(begin)))
 		}
@@ -284,7 +284,7 @@ func (l loggingMiddleware) ValidateAgent(ctx context.Context, token string, a fl
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: validate_agent",
+			l.logger.Debug("method call: validate_agent",
 				zap.String("name", a.Name.String()),
 				zap.Duration("duration", time.Since(begin)))
 		}
@@ -299,7 +299,7 @@ func (l loggingMiddleware) RemoveAgent(ctx context.Context, token, thingID strin
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: delete_agent",
+			l.logger.Debug("method call: delete_agent",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -314,7 +314,7 @@ func (l loggingMiddleware) GetPolicyState(ctx context.Context, agent fleet.Agent
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: get_policy_state",
+			l.logger.Debug("method call: get_policy_state",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
diff --git a/fleet/backend/otel/endpoint.go b/fleet/backend/otel/endpoint.go
new file mode 100644
index 000000000..a3d9dfd1e
--- /dev/null
+++ b/fleet/backend/otel/endpoint.go
@@ -0,0 +1,175 @@
+package otel
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/go-kit/kit/endpoint"
+	"github.com/mainflux/mainflux"
+	"github.com/orb-community/orb/pkg/errors"
+	"github.com/orb-community/orb/pkg/types"
+)
+
+func viewAgentBackendHandlerEndpoint(dio otelBackend) endpoint.Endpoint {
+	return func(ctx context.Context, request interface{}) (response interface{}, err error) {
+		req := request.(viewResourceReq)
+		if err := req.validate(); err != nil {
+			return nil, err
+		}
+		_, err = dio.auth.Identify(ctx, &mainflux.Token{Value: req.token})
+		if err != nil {
+			return "", errors.Wrap(errors.ErrUnauthorizedAccess, err)
+		}
+
+		bk, err := dio.handlers()
+		if err != nil {
+			return nil, err
+		}
+		return bk, nil
+	}
+}
+
+func viewAgentBackendInputEndpoint(dio otelBackend) endpoint.Endpoint {
+	return func(ctx context.Context, request interface{}) (response interface{}, err error) {
+		req := request.(viewResourceReq)
+		if err := req.validate(); err != nil {
+			return nil, err
+		}
+
+		_, err = dio.auth.Identify(ctx, &mainflux.Token{Value: req.token})
+		if err != nil {
+			return "", errors.Wrap(errors.ErrUnauthorizedAccess, err)
+		}
+
+		bk, err := dio.inputs()
+		if err != nil {
+			return nil, err
+		}
+		return bk, nil
+	}
+}
+
+func viewAgentBackendTapsEndpoint(dio otelBackend) endpoint.Endpoint {
+	return func(ctx context.Context, request interface{}) (response interface{}, err error) {
+		req := request.(viewResourceReq)
+		if err := req.validate(); err != nil {
+			return nil, err
+		}
+		r, err := dio.auth.Identify(ctx, &mainflux.Token{Value: req.token})
+		if err != nil {
+			return "", errors.Wrap(errors.ErrUnauthorizedAccess, err)
+		}
+
+		metadataList, err := dio.taps(ctx, r.Id)
+		if err != nil {
+			return nil, err
+		}
+
+		var list []types.Metadata
+		for _, mt := range metadataList {
+			extractTaps(mt, &list)
+		}
+
+		res, err := toBackendTaps(list)
+		if err != nil {
+			return nil, err
+		}
+		tapsGroup := groupTaps(res)
+
+		var tpRes []agentBackendTapsRes
+		for _, v := range tapsGroup {
+			tpRes = append(tpRes, agentBackendTapsRes{
+				Name:             v.Name,
+				InputType:        v.InputType,
+				ConfigPredefined: v.ConfigPredefined,
+				TotalAgents:      totalAgents{Total: v.TotalAgents},
+			})
+		}
+		return tpRes, nil
+	}
+}
+
+// Used to get the taps from policy json - CHECK IF STILL NEEDED
+func extractTaps(mt map[string]interface{}, list *[]types.Metadata) {
+	for k, v := range mt {
+		if k == "taps" {
+			m, _ := v.(map[string]interface{})
+			*list = append(*list, m)
+		} else {
+			m, _ := v.(map[string]interface{})
+			extractTaps(m, list)
+		}
+	}
+}
+
+// Used to cast the map[string]interface for a concrete struct - CHECK IF STILL NEEDED
+func toBackendTaps(list []types.Metadata) ([]BackendTaps, error) {
+	var bkTaps []BackendTaps
+	for _, tc := range list {
+		bkTap := BackendTaps{}
+		var idx int
+		for k, v := range tc {
+			bkTap.Name = k
+			m, ok := v.(map[string]interface{})
+			if !ok {
+				return nil, errors.New("Error to group taps")
+			}
+			for k, v := range m {
+				switch k {
+				case "config":
+					m, ok := v.(map[string]interface{})
+					if !ok {
+						return nil, errors.New("Error to group taps")
+					}
+					for k, _ := range m {
+						bkTap.ConfigPredefined = append(bkTap.ConfigPredefined, []string{k}...)
+					}
+				case "input_type":
+					bkTap.InputType = fmt.Sprintf("%v", v)
+				}
+			}
+			idx++
+			bkTap.TotalAgents += uint64(idx)
+			bkTaps = append(bkTaps, bkTap)
+		}
+	}
+	return bkTaps, nil
+}
+
+// Used to aggregate and summarize the taps and return a slice of BackendTaps - CHECK IF STILL NEEDED
+func groupTaps(taps []BackendTaps) []BackendTaps {
+	tapsMap := make(map[string]BackendTaps)
+	for _, tap := range taps {
+		key := key(tap.Name, tap.InputType)
+		if v, ok := tapsMap[key]; ok {
+			v.ConfigPredefined = append(v.ConfigPredefined, tap.ConfigPredefined...)
+			v.TotalAgents += 1
+			tapsMap[key] = v
+		} else {
+			tapsMap[key] = BackendTaps{
+				Name:             tap.Name,
+				InputType:        tap.InputType,
+				ConfigPredefined: tap.ConfigPredefined,
+				TotalAgents:      tap.TotalAgents,
+			}
+		}
+	}
+	var bkTaps []BackendTaps
+	keys := make(map[string]bool)
+	for _, v := range tapsMap {
+		list := []string{}
+		for _, config := range v.ConfigPredefined {
+			if _, ok := keys[config]; !ok {
+				keys[config] = true
+				list = append(list, config)
+			}
+		}
+		v.ConfigPredefined = list
+		bkTaps = append(bkTaps, v)
+	}
+	return bkTaps
+}
+
+func key(name string, inputType string) string {
+	return fmt.Sprintf("%s-%s", name, inputType)
+}
diff --git a/fleet/backend/otel/otel.go b/fleet/backend/otel/otel.go
new file mode 100644
index 000000000..63c1c8582
--- /dev/null
+++ b/fleet/backend/otel/otel.go
@@ -0,0 +1,70 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+package otel
+
+import (
+	"context"
+	kithttp "github.com/go-kit/kit/transport/http"
+	"github.com/go-zoo/bone"
+	"github.com/mainflux/mainflux"
+	"github.com/opentracing/opentracing-go"
+	"github.com/orb-community/orb/fleet"
+	"github.com/orb-community/orb/fleet/backend"
+	"github.com/orb-community/orb/pkg/types"
+)
+
+var _ backend.Backend = (*otelBackend)(nil)
+
+type otelBackend struct {
+	auth        mainflux.AuthServiceClient
+	agentRepo   fleet.AgentRepository
+	Backend     string
+	Description string
+}
+
+type BackendTaps struct {
+	Name             string
+	InputType        string
+	ConfigPredefined []string
+	TotalAgents      uint64
+}
+
+func (p otelBackend) Metadata() interface{} {
+	return struct {
+		Backend       string `json:"backend"`
+		Description   string `json:"description"`
+		SchemaVersion string `json:"schema_version"`
+	}{
+		Backend:       p.Backend,
+		Description:   p.Description,
+		SchemaVersion: CurrentSchemaVersion,
+	}
+}
+
+func (p otelBackend) MakeHandler(tracer opentracing.Tracer, opts []kithttp.ServerOption, r *bone.Mux) {
+	MakeOtelHandler(tracer, p, opts, r)
+}
+
+func (p otelBackend) handlers() (metadata types.Metadata, err error) {
+	return
+}
+
+func (p otelBackend) inputs() (metadata types.Metadata, err error) {
+	return
+}
+
+func (p otelBackend) taps(ctx context.Context, ownerID string) ([]types.Metadata, error) {
+	return nil, nil
+}
+
+func Register(auth mainflux.AuthServiceClient, agentRepo fleet.AgentRepository) bool {
+	backend.Register("otel", &otelBackend{
+		Backend:     "otel",
+		Description: "OpenTelemetry configuration YAML",
+		auth:        auth,
+		agentRepo:   agentRepo,
+	})
+	return true
+}
diff --git a/sinker/redis/consumer/events.go b/fleet/backend/otel/requests.go
similarity index 61%
rename from sinker/redis/consumer/events.go
rename to fleet/backend/otel/requests.go
index 9d1639e90..0148289b9 100644
--- a/sinker/redis/consumer/events.go
+++ b/fleet/backend/otel/requests.go
@@ -6,17 +6,19 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-package consumer
+package otel
 
 import (
-	"time"
-
-	"github.com/orb-community/orb/pkg/types"
+	"github.com/orb-community/orb/pkg/errors"
 )
 
-type UpdateSinkEvent struct {
-	SinkID    string
-	Owner     string
-	Config    types.Metadata
-	Timestamp time.Time
+type viewResourceReq struct {
+	token string
+}
+
+func (req viewResourceReq) validate() error {
+	if req.token == "" {
+		return errors.ErrUnauthorizedAccess
+	}
+	return nil
 }
diff --git a/fleet/backend/otel/responses.go b/fleet/backend/otel/responses.go
new file mode 100644
index 000000000..0ac6cbeb1
--- /dev/null
+++ b/fleet/backend/otel/responses.go
@@ -0,0 +1,32 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+package otel
+
+import (
+	"net/http"
+)
+
+type totalAgents struct {
+	Total uint64 `json:"total"`
+}
+
+type agentBackendTapsRes struct {
+	Name             string      `json:"name"`
+	InputType        string      `json:"input_type"`
+	ConfigPredefined []string    `json:"config_predefined"`
+	TotalAgents      totalAgents `json:"agents"`
+}
+
+func (res agentBackendTapsRes) Code() int {
+	return http.StatusOK
+}
+
+func (res agentBackendTapsRes) Headers() map[string]string {
+	return map[string]string{}
+}
+
+func (res agentBackendTapsRes) Empty() bool {
+	return true
+}
diff --git a/fleet/backend/otel/transport.go b/fleet/backend/otel/transport.go
new file mode 100644
index 000000000..a8a9d604f
--- /dev/null
+++ b/fleet/backend/otel/transport.go
@@ -0,0 +1,47 @@
+package otel
+
+import (
+	"context"
+	"net/http"
+	"strings"
+
+	"github.com/go-zoo/bone"
+	"github.com/opentracing/opentracing-go"
+	"github.com/orb-community/orb/pkg/types"
+
+	kitot "github.com/go-kit/kit/tracing/opentracing"
+	kithttp "github.com/go-kit/kit/transport/http"
+)
+
+func MakeOtelHandler(tracer opentracing.Tracer, dio otelBackend, opts []kithttp.ServerOption, r *bone.Mux) {
+
+	r.Get("/agents/backends/otel/handlers", kithttp.NewServer(
+		kitot.TraceServer(tracer, "view_agent_backend_handler")(viewAgentBackendHandlerEndpoint(dio)),
+		decodeBackendView,
+		types.EncodeResponse,
+		opts...))
+	r.Get("/agents/backends/otel/inputs", kithttp.NewServer(
+		kitot.TraceServer(tracer, "view_agent_backend_input")(viewAgentBackendInputEndpoint(dio)),
+		decodeBackendView,
+		types.EncodeResponse,
+		opts...))
+	r.Get("/agents/backends/otel/taps", kithttp.NewServer(
+		kitot.TraceServer(tracer, "view_agent_backend_taps")(viewAgentBackendTapsEndpoint(dio)),
+		decodeBackendView,
+		types.EncodeResponse,
+		opts...))
+}
+
+func decodeBackendView(_ context.Context, r *http.Request) (interface{}, error) {
+	req := viewResourceReq{
+		token: parseJwt(r),
+	}
+	return req, nil
+}
+
+func parseJwt(r *http.Request) (token string) {
+	if strings.HasPrefix(r.Header.Get("Authorization"), "Bearer ") {
+		token = r.Header.Get("Authorization")[7:]
+	}
+	return
+}
diff --git a/fleet/backend/otel/types.go b/fleet/backend/otel/types.go
new file mode 100644
index 000000000..c2cdff640
--- /dev/null
+++ b/fleet/backend/otel/types.go
@@ -0,0 +1,3 @@
+package otel
+
+const CurrentSchemaVersion = "v0.91.0"
diff --git a/fleet/comms.go b/fleet/comms.go
index dd60c4b63..a0053cc1f 100644
--- a/fleet/comms.go
+++ b/fleet/comms.go
@@ -19,6 +19,7 @@ import (
 	"github.com/orb-community/orb/buildinfo"
 	"github.com/orb-community/orb/policies/pb"
 	"go.uber.org/zap"
+	"gopkg.in/yaml.v3"
 	"time"
 )
 
@@ -81,8 +82,14 @@ func (svc fleetCommsService) NotifyGroupDatasetEdit(ctx context.Context, ag Agen
 	}
 
 	var pdata interface{}
-	if err := json.Unmarshal(p.Data, &pdata); err != nil {
-		return err
+	if p.GetFormat() == "yaml" {
+		if err := yaml.Unmarshal(p.Data, &pdata); err != nil {
+			return err
+		}
+	} else {
+		if err := json.Unmarshal(p.Data, &pdata); err != nil {
+			return err
+		}
 	}
 
 	var action string
@@ -100,6 +107,7 @@ func (svc fleetCommsService) NotifyGroupDatasetEdit(ctx context.Context, ag Agen
 		Version:   p.Version,
 		Data:      pdata,
 		DatasetID: datasetID,
+		Format:    p.Format,
 	}}
 
 	data := AgentPolicyRPC{
@@ -133,10 +141,16 @@ func (svc fleetCommsService) NotifyGroupNewDataset(ctx context.Context, ag Agent
 	if err != nil {
 		return err
 	}
-
 	var pdata interface{}
-	if err := json.Unmarshal(p.Data, &pdata); err != nil {
-		return err
+	if p.Format == "yaml" {
+		if err := yaml.Unmarshal(p.Data, &pdata); err != nil {
+			return err
+		}
+	} else { // today we only have json and yaml as formats,
+		// once we add more, it would be best to add an enumerator to validate this in a switch
+		if err := json.Unmarshal(p.Data, &pdata); err != nil {
+			return err
+		}
 	}
 
 	payload := []AgentPolicyRPCPayload{{
@@ -239,8 +253,15 @@ func (svc fleetCommsService) NotifyAgentAllDatasets(ctx context.Context, a Agent
 		for i, policy := range p.Policies {
 
 			var pdata interface{}
-			if err := json.Unmarshal(policy.Data, &pdata); err != nil {
-				return err
+			svc.logger.Debug("policy format", zap.String("policy_id", policy.Id), zap.String("policy_format", policy.Format))
+			if policy.Format == "yaml" {
+				if err := yaml.Unmarshal(policy.Data, &pdata); err != nil {
+					return err
+				}
+			} else {
+				if err := json.Unmarshal(policy.Data, &pdata); err != nil {
+					return err
+				}
 			}
 
 			payload[i] = AgentPolicyRPCPayload{
@@ -249,6 +270,7 @@ func (svc fleetCommsService) NotifyAgentAllDatasets(ctx context.Context, a Agent
 				Name:         policy.Name,
 				Backend:      policy.Backend,
 				Version:      policy.Version,
+				Format:       policy.Format,
 				Data:         pdata,
 				DatasetID:    policy.DatasetId,
 				AgentGroupID: policy.AgentGroupId,
@@ -383,8 +405,14 @@ func (svc fleetCommsService) NotifyGroupPolicyUpdate(ctx context.Context, ag Age
 	}
 
 	var pdata interface{}
-	if err := json.Unmarshal(p.Data, &pdata); err != nil {
-		return err
+	if p.GetFormat() == "yaml" {
+		if err := yaml.Unmarshal(p.Data, &pdata); err != nil {
+			return err
+		}
+	} else {
+		if err := json.Unmarshal(p.Data, &pdata); err != nil {
+			return err
+		}
 	}
 
 	payload := []AgentPolicyRPCPayload{{
@@ -395,6 +423,7 @@ func (svc fleetCommsService) NotifyGroupPolicyUpdate(ctx context.Context, ag Age
 		Backend:      p.Backend,
 		Version:      p.Version,
 		Data:         pdata,
+		Format:       p.Format,
 	}}
 
 	data := AgentPolicyRPC{
diff --git a/fleet/comms_rpc.go b/fleet/comms_rpc.go
index 12b761996..82bcbc608 100644
--- a/fleet/comms_rpc.go
+++ b/fleet/comms_rpc.go
@@ -49,6 +49,7 @@ type AgentPolicyRPCPayload struct {
 	AgentGroupID string      `json:"agent_group_id"`
 	Name         string      `json:"name"`
 	Backend      string      `json:"backend"`
+	Format       string      `json:"format"`
 	Version      int32       `json:"version"`
 	Data         interface{} `json:"data"`
 }
diff --git a/fleet/redis/consumer/streams.go b/fleet/redis/consumer/streams.go
index ffc22d266..61a99f63b 100644
--- a/fleet/redis/consumer/streams.go
+++ b/fleet/redis/consumer/streams.go
@@ -75,7 +75,6 @@ func (es eventStore) Subscribe(context context.Context) error {
 
 		for _, msg := range streams[0].Messages {
 			event := msg.Values
-
 			var err error
 			switch event["operation"] {
 			case datasetCreate:
@@ -127,6 +126,7 @@ func (es eventStore) handleDatasetCreate(ctx context.Context, e createDatasetEve
 
 	ag, err := es.fleetService.ViewAgentGroupByIDInternal(ctx, e.agentGroupID, e.ownerID)
 	if err != nil {
+		es.logger.Error("Failed to retrieve dataset", zap.String("group_id", e.agentGroupID), zap.String("owner_id", e.ownerID), zap.Error(err))
 		return err
 	}
 
diff --git a/fleet/redis/producer/streams.go b/fleet/redis/producer/streams.go
index 07e2d431d..efe10214b 100644
--- a/fleet/redis/producer/streams.go
+++ b/fleet/redis/producer/streams.go
@@ -136,9 +136,11 @@ func (es eventStore) GetPolicyState(ctx context.Context, agent fleet.Agent) (map
 
 // NewEventStoreMiddleware returns wrapper around fleet service that sends
 // events to event store.
-func NewEventStoreMiddleware(svc fleet.Service, client *redis.Client) fleet.Service {
+func NewEventStoreMiddleware(svc fleet.Service, client *redis.Client, logger *zap.Logger) fleet.Service {
+	l := logger.Named("event_store_middleware")
 	return eventStore{
 		svc:    svc,
 		client: client,
+		logger: l,
 	}
 }
diff --git a/go.mod b/go.mod
index 38bb62ea0..a76d79c88 100644
--- a/go.mod
+++ b/go.mod
@@ -1,178 +1,193 @@
 module github.com/orb-community/orb
 
-go 1.19
+go 1.21
 
 require (
 	github.com/andybalholm/brotli v1.0.5
-	github.com/aws/aws-sdk-go v1.44.232
+	github.com/aws/aws-sdk-go v1.45.26
 	github.com/benbjohnson/immutable v0.4.3
 	github.com/eclipse/paho.mqtt.golang v1.4.2
 	github.com/fatih/structs v1.1.0
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-cmd/cmd v1.4.1
 	github.com/go-co-op/gocron v1.9.0
-	github.com/go-kit/kit v0.12.0
+	github.com/go-kit/kit v0.13.0
 	github.com/go-redis/redis/v8 v8.11.4
 	github.com/go-zoo/bone v1.3.0
 	github.com/gofrs/uuid v4.2.0+incompatible
 	github.com/golang/protobuf v1.5.3
-	github.com/golang/snappy v0.0.4
 	github.com/hashicorp/go-version v1.6.0
 	github.com/jmoiron/sqlx v1.3.4
 	github.com/lib/pq v1.10.7
 	github.com/mainflux/mainflux v0.0.0-20220415135135-92d8fb99bf82
-	github.com/mattn/go-sqlite3 v1.14.16
-	github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4
-	github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.81.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.91.0
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/ory/dockertest/v3 v3.10.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pkg/profile v1.7.0
-	github.com/prometheus/client_golang v1.16.0
-	github.com/prometheus/prometheus v0.43.0
+	github.com/prometheus/client_golang v1.17.0
 	github.com/rubenv/sql-migrate v1.1.1
 	github.com/spf13/cobra v1.7.0
-	github.com/spf13/viper v1.15.0
+	github.com/spf13/viper v1.18.1
 	github.com/stretchr/testify v1.8.4
 	github.com/uber/jaeger-client-go v2.30.0+incompatible
-	go.opentelemetry.io/collector/component v0.81.0
-	go.opentelemetry.io/collector/config/confighttp v0.81.0
-	go.opentelemetry.io/collector/config/configtelemetry v0.81.0
-	go.opentelemetry.io/collector/config/configtls v0.81.0
-	go.opentelemetry.io/collector/confmap v0.81.0
-	go.opentelemetry.io/collector/consumer v0.81.0
-	go.opentelemetry.io/collector/exporter v0.81.0
-	go.opentelemetry.io/collector/processor v0.81.0
-	go.opentelemetry.io/collector/receiver v0.81.0
-	go.opentelemetry.io/otel/sdk/metric v0.39.0
+	go.opentelemetry.io/collector/component v0.91.0
+	go.opentelemetry.io/collector/config/configgrpc v0.91.0
+	go.opentelemetry.io/collector/config/confighttp v0.91.0
+	go.opentelemetry.io/collector/config/confignet v0.91.0
+	go.opentelemetry.io/collector/config/configtelemetry v0.91.0
+	go.opentelemetry.io/collector/config/configtls v0.91.0
+	go.opentelemetry.io/collector/confmap v0.91.0
+	go.opentelemetry.io/collector/consumer v0.91.0
+	go.opentelemetry.io/collector/exporter v0.91.0
+	go.opentelemetry.io/collector/processor v0.91.0
+	go.opentelemetry.io/collector/receiver v0.91.0
+	go.opentelemetry.io/otel/sdk/metric v1.21.0
 	go.uber.org/multierr v1.11.0
-	go.uber.org/zap v1.24.0
-	golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc
-	google.golang.org/grpc v1.56.1
+	go.uber.org/zap v1.26.0
+	golang.org/x/exp v0.0.0-20231127185646-65229373498e
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4
+	google.golang.org/grpc v1.59.0
 	google.golang.org/protobuf v1.31.0
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.26.3
 	k8s.io/apimachinery v0.26.3
+	modernc.org/sqlite v1.28.0
 )
 
 //These libs are used to allow orb extend opentelemetry features
 require (
 	github.com/gogo/protobuf v1.3.2
-	github.com/google/uuid v1.3.0
-	github.com/prometheus/common v0.44.0 // indirect
-	go.opentelemetry.io/collector v0.81.0
-	go.opentelemetry.io/collector/pdata v1.0.0-rcv0013
-	go.opentelemetry.io/otel/metric v1.16.0 // indirect
-	go.opentelemetry.io/otel/trace v1.16.0
-	google.golang.org/genproto v0.0.0-20230525234025-438c736192d0 // indirect
+	github.com/google/uuid v1.4.0
+	github.com/prometheus/common v0.45.0 // indirect
+	go.opentelemetry.io/collector v0.91.0 // indirect
+	go.opentelemetry.io/collector/pdata v1.0.0
+	go.opentelemetry.io/otel/metric v1.21.0 // indirect
+	go.opentelemetry.io/otel/trace v1.21.0
+	google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f // indirect
 	k8s.io/client-go v0.26.3
 )
 
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
-	github.com/Microsoft/go-winio v0.6.0 // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
-	github.com/alecthomas/participle/v2 v2.0.0 // indirect
+	github.com/alecthomas/participle/v2 v2.1.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/containerd/continuity v0.3.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/docker/cli v24.0.2+incompatible // indirect
-	github.com/docker/docker v24.0.2+incompatible // indirect
+	github.com/docker/docker v24.0.7+incompatible // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/felixge/fgprof v0.9.3 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.4.0 // indirect
 	github.com/go-gorp/gorp/v3 v3.1.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/gnostic v0.5.7-v3refs // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/pprof v0.0.0-20230228050547-1710fef4ab10 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/iancoleman/strcase v0.2.0 // indirect
+	github.com/iancoleman/strcase v0.3.0 // indirect
 	github.com/imdario/mergo v0.3.15 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.16.7 // indirect
+	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
+	github.com/klauspost/compress v1.17.4 // indirect
 	github.com/knadh/koanf v1.5.0 // indirect
 	github.com/knadh/koanf/v2 v2.0.1 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mainflux/senml v1.5.0 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/mattn/go-sqlite3 v1.14.19 // indirect
+	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
+	github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/moby/term v0.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/mostynb/go-grpc-compression v1.2.0 // indirect
-	github.com/nats-io/nats-server/v2 v2.9.20 // indirect
-	github.com/nats-io/nats.go v1.27.0 // indirect
-	github.com/nats-io/nkeys v0.4.4 // indirect
+	github.com/mostynb/go-grpc-compression v1.2.2 // indirect
+	github.com/nats-io/nats.go v1.31.0 // indirect
+	github.com/nats-io/nkeys v0.4.6 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
-	github.com/observiq/ctimefmt v1.0.0 // indirect
 	github.com/oklog/ulid/v2 v2.0.2 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.81.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.91.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
+	github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
 	github.com/opencontainers/runc v1.1.5 // indirect
 	github.com/ory/keto/proto/ory/keto/acl/v1alpha1 v0.0.0-20210616104402-80e043246cf9 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.4.0 // indirect
-	github.com/prometheus/procfs v0.10.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/procfs v0.11.1 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
-	github.com/spf13/afero v1.9.3 // indirect
-	github.com/spf13/cast v1.5.0 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/sagikazarmark/locafero v0.4.0 // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
+	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/subosito/gotenv v1.4.2 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/collector/config/configauth v0.81.0 // indirect
-	go.opentelemetry.io/collector/config/configcompression v0.81.0 // indirect
-	go.opentelemetry.io/collector/config/configgrpc v0.81.0 // indirect
-	go.opentelemetry.io/collector/config/confignet v0.81.0 // indirect
-	go.opentelemetry.io/collector/config/configopaque v0.81.0 // indirect
-	go.opentelemetry.io/collector/config/internal v0.81.0 // indirect
-	go.opentelemetry.io/collector/extension v0.81.0 // indirect
-	go.opentelemetry.io/collector/extension/auth v0.81.0 // indirect
-	go.opentelemetry.io/collector/featuregate v1.0.0-rcv0013 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 // indirect
-	go.opentelemetry.io/otel v1.16.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.16.0 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
-	golang.org/x/crypto v0.10.0 // indirect
-	golang.org/x/mod v0.9.0 // indirect
-	golang.org/x/net v0.11.0 // indirect
-	golang.org/x/oauth2 v0.8.0 // indirect
-	golang.org/x/sync v0.3.0 // indirect
-	golang.org/x/sys v0.9.0 // indirect
-	golang.org/x/term v0.9.0 // indirect
-	golang.org/x/text v0.10.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.7.0 // indirect
+	go.opentelemetry.io/collector/config/configauth v0.91.0 // indirect
+	go.opentelemetry.io/collector/config/configcompression v0.91.0 // indirect
+	go.opentelemetry.io/collector/config/configopaque v0.91.0 // indirect
+	go.opentelemetry.io/collector/config/internal v0.91.0 // indirect
+	go.opentelemetry.io/collector/extension v0.91.0 // indirect
+	go.opentelemetry.io/collector/extension/auth v0.91.0 // indirect
+	go.opentelemetry.io/collector/featuregate v1.0.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
+	go.opentelemetry.io/otel v1.21.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.21.0 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
+	golang.org/x/crypto v0.16.0 // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/oauth2 v0.15.0 // indirect
+	golang.org/x/sync v0.5.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/term v0.15.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
+	golang.org/x/tools v0.16.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
-	k8s.io/klog/v2 v2.90.1 // indirect
-	k8s.io/utils v0.0.0-20230308161112-d77c459e9343 // indirect
+	k8s.io/klog/v2 v2.100.1 // indirect
+	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
+	lukechampine.com/uint128 v1.2.0 // indirect
+	modernc.org/cc/v3 v3.40.0 // indirect
+	modernc.org/ccgo/v3 v3.16.13 // indirect
+	modernc.org/libc v1.29.0 // indirect
+	modernc.org/mathutil v1.6.0 // indirect
+	modernc.org/memory v1.7.2 // indirect
+	modernc.org/opt v0.1.3 // indirect
+	modernc.org/strutil v1.1.3 // indirect
+	modernc.org/token v1.0.1 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
@@ -180,41 +195,40 @@ require (
 //These libs are used to allow orb extend opentelemetry features
 require (
 	github.com/Shopify/sarama v1.37.2
-	github.com/apache/thrift v0.18.1 // indirect
-	github.com/eapache/go-resiliency v1.3.0 // indirect
-	github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
+	github.com/apache/thrift v0.19.0 // indirect
+	github.com/eapache/go-resiliency v1.4.0 // indirect
+	github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
 	github.com/eapache/queue v1.1.0 // indirect
 	github.com/emicklei/go-restful/v3 v3.10.1 // indirect
-	github.com/felixge/httpsnoop v1.0.3 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.3 // indirect
-	github.com/google/gnostic v0.6.9 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
-	github.com/jaegertracing/jaeger v1.41.0
+	github.com/jaegertracing/jaeger v1.51.0
 	github.com/jcmturner/aescts/v2 v2.0.0 // indirect
 	github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
 	github.com/jcmturner/gofork v1.7.6 // indirect
-	github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect
+	github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
 	github.com/jcmturner/rpc/v2 v2.0.3 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.81.0 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.81.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.91.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.91.0
 	github.com/orb-community/diode v0.0.0-20230419222319-4ec19ba89e9f
-	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
-	github.com/pierrec/lz4/v4 v4.1.17 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
+	github.com/pierrec/lz4/v4 v4.1.18 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
-	github.com/rs/cors v1.9.0 // indirect
+	github.com/rs/cors v1.10.1 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.2
 	github.com/xdg-go/stringprep v1.0.4 // indirect
-	go.opentelemetry.io/collector/receiver/otlpreceiver v0.81.0
-	go.opentelemetry.io/collector/semconv v0.81.0
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
+	go.opentelemetry.io/collector/receiver/otlpreceiver v0.91.0
+	go.opentelemetry.io/collector/semconv v0.91.0
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 )
diff --git a/go.sum b/go.sum
index 61394f643..7aa4276c9 100644
--- a/go.sum
+++ b/go.sum
@@ -3,7 +3,6 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
 cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
 cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
 cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
 cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
 cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
@@ -16,19 +15,20 @@ cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOY
 cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
 cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
 cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
-cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
 cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
 cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
 cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
-cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys=
+cloud.google.com/go v0.110.10 h1:LXy9GEO+timppncPIAZoOj3l58LIU9k+kn48AN7IO3Y=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
 cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
 cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/compute v1.20.0 h1:cUOcywWuowO9It2i1KX1lIb0HH7gLv6nENKuZGnlcSo=
+cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk=
+cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI=
 cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 h1:aRVqY1p2IJaBGStWMsQMpkAa83cPkCDLl80eOj0Rbz4=
+cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68/go.mod h1:1a3eRNYX12fs5UABBIXS8HXVvQbX9hRB/RkEBPORpe8=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
 cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
@@ -41,31 +41,34 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
-cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
 contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg=
+contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9fpw1KeYcjrnC1J8B+JKjsZyRQ=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM=
+github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=
-github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg=
-github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE=
-github.com/Mottl/ctimefmt v0.0.0-20190803144728-fd2ac23a585a/go.mod h1:eyj2WSIdoPMPs2eNTLpSmM6Nzqo4V80/d6jHpnJ1SAI=
+github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
+github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw=
 github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
-github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/Shopify/sarama v1.37.2 h1:LoBbU0yJPte0cE5TZCGdlzZRmMgMtZU/XgnUKZg9Cv4=
 github.com/Shopify/sarama v1.37.2/go.mod h1:Nxye/E+YPru//Bpaorfhc3JsSGYwCaDDj+R4bK52U5o=
 github.com/Shopify/toxiproxy/v2 v2.5.0 h1:i4LPT+qrSlKNtQf5QliVjdP08GyAH8+BUIc9gT0eahc=
+github.com/Shopify/toxiproxy/v2 v2.5.0/go.mod h1:yhM2epWtAmel9CB8r2+L+PCmhH6yH2pITaPAo7jxJl0=
 github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE=
-github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=
-github.com/alecthomas/participle/v2 v2.0.0 h1:Fgrq+MbuSsJwIkw3fEj9h75vDP0Er5JzepJ0/HNHv0g=
-github.com/alecthomas/participle/v2 v2.0.0/go.mod h1:rAKZdJldHu8084ojcWevWAL8KmEU+AT+Olodb+WoN2Y=
+github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
+github.com/alecthomas/assert/v2 v2.3.0 h1:mAsH2wmvjsuvyBvAmCtm7zFsBlb8mIHx5ySLVdDZXL0=
+github.com/alecthomas/assert/v2 v2.3.0/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
+github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6icjJvbsmV8=
+github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c=
 github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk=
+github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
@@ -74,14 +77,14 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5
 github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
 github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/apache/thrift v0.18.1 h1:lNhK/1nqjbwbiOPDBPFJVKxgDEGSepKuTh6OLiXW8kg=
-github.com/apache/thrift v0.18.1/go.mod h1:rdQn/dCcDKEWjjylUeueum4vQEjG2v8v2PqriUnbr+I=
+github.com/apache/thrift v0.19.0 h1:sOqkWPzMj7w6XaYbJQG7m4sGqVolaW/0D28Ln7yPzMk=
+github.com/apache/thrift v0.19.0/go.mod h1:SUALL216IiaOw2Oy+5Vs9lboJ/t9g40C+G07Dc0QC1I=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/aws/aws-sdk-go v1.44.232 h1:rZ9gv+v7GAcWspk1JMa28L3XamRwoiMzD1vphUIm8Xg=
-github.com/aws/aws-sdk-go v1.44.232/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.45.26 h1:PJ2NJNY5N/yeobLYe1Y+xLdavBi67ZI8gvph6ftwVCg=
+github.com/aws/aws-sdk-go v1.45.26/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4=
 github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw=
 github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ=
@@ -92,7 +95,6 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2/go.mod h1:72H
 github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk=
 github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g=
 github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
-github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
 github.com/benbjohnson/immutable v0.4.3 h1:GYHcksoJ9K6HyAUpGxwZURrbTkXA0Dh4otXGqbhdrjA=
 github.com/benbjohnson/immutable v0.4.3/go.mod h1:qJIKKSmdqz1tVzNtst1DZzvaqOU1onk1rc03IeM3Owk=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -101,11 +103,9 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
-github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
 github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
 github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
@@ -119,8 +119,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
+github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
 github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg=
 github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM=
@@ -131,17 +131,19 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
+github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/denisenkom/go-mssqldb v0.9.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/docker/cli v24.0.2+incompatible h1:QdqR7znue1mtkXIJ+ruQMGQhpw2JzMJLRXp6zpzF6tM=
 github.com/docker/cli v24.0.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
-github.com/docker/docker v24.0.2+incompatible h1:eATx+oLz9WdNVkQrr0qjQ8HvRJ4bOOxfzEo8R+dA3cg=
-github.com/docker/docker v24.0.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM=
+github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
@@ -149,10 +151,12 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/eapache/go-resiliency v1.3.0 h1:RRL0nge+cWGlxXbUzJ7yMcq6w2XBEr19dCN6HECGaT0=
-github.com/eapache/go-resiliency v1.3.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho=
-github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw=
-github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/eapache/go-resiliency v1.4.0 h1:3OK9bWpPk5q6pbFAaYSEwD9CLUSHG8bnZuqX2yMt3B0=
+github.com/eapache/go-resiliency v1.4.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho=
+github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4ALJ04o5Qqpdz8XLIpNA3WM/iSIXqxtqo7UGVws=
+github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0=
 github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 github.com/eclipse/paho.mqtt.golang v1.4.2 h1:66wOzfUHSSI1zamx7jR6yMEI5EuHnT1G6rNA5PM12m4=
@@ -165,25 +169,26 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/envoyproxy/protoc-gen-validate v0.10.1 h1:c0g45+xCJhdgFGw7a5QAfdS4byAbud7miNWJ1WwEVf8=
+github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA=
+github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g=
 github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw=
-github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
-github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0=
+github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
+github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
+github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
-github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/fxamacker/cbor/v2 v2.2.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
 github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88=
 github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
@@ -201,8 +206,8 @@ github.com/go-gorp/gorp/v3 v3.1.0 h1:ItKF/Vbuj31dmV4jxA1qblpSwkl9g1typ24xoe70IGs
 github.com/go-gorp/gorp/v3 v3.1.0/go.mod h1:dLEjIyyRNiXvNZ8PSmzpt1GsWAUK8kjVhEpjH8TixEw=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4=
-github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEaizzs=
+github.com/go-kit/kit v0.13.0 h1:OoneCcHKHQ03LfBpoQCUfCluwd2Vt3ohz+kvbJneZAU=
+github.com/go-kit/kit v0.13.0/go.mod h1:phqEHMMUbyrCFCTgH48JueqrM3md2HcAZ8N3XE4FKDg=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
 github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
 github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
@@ -214,8 +219,8 @@ github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi
 github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
-github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
+github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
@@ -229,10 +234,12 @@ github.com/go-redis/redis/v8 v8.11.4/go.mod h1:2Z2wHZXdQpCDXEGzqMockDpNyYvi2l4Px
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
+github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M=
+github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
 github.com/go-zoo/bone v1.3.0 h1:PY6sHq37FnQhj+4ZyqFIzJQHvrrGx0GEc3vTZZC/OsI=
 github.com/go-zoo/bone v1.3.0/go.mod h1:HI3Lhb7G3UQcAwEhOJ2WyNcsFtQX1WYHa0Hl4OBbhW8=
 github.com/gobuffalo/logger v1.0.6 h1:nnZNpxYo0zx+Aj9RfMPBm+x9zAU2OayFh/xrAWi34HU=
@@ -252,12 +259,14 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
+github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
@@ -290,8 +299,8 @@ github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0=
-github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E=
+github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54=
+github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -305,8 +314,8 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -322,7 +331,6 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf
 github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg=
@@ -332,11 +340,10 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
+github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
@@ -396,11 +403,12 @@ github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvh
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
+github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
 github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
-github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0=
-github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
+github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=
+github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
@@ -410,8 +418,8 @@ github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+h
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/jaegertracing/jaeger v1.41.0 h1:vVNky8dP46M2RjGaZ7qRENqylW+tBFay3h57N16Ip7M=
-github.com/jaegertracing/jaeger v1.41.0/go.mod h1:SIkAT75iVmA9U+mESGYuMH6UQv6V9Qy4qxo0lwfCQAc=
+github.com/jaegertracing/jaeger v1.51.0 h1:wS1vW+fG91JGgpX193nLdLOrU9QZRvpEGPm9UuMgL2U=
+github.com/jaegertracing/jaeger v1.51.0/go.mod h1:tEPEgDuAks6rbFURoZAoIrPJmUz/6TSvnh/0lkH8uRs=
 github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8=
 github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=
 github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo=
@@ -420,8 +428,8 @@ github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVET
 github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo=
 github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o=
 github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg=
-github.com/jcmturner/gokrb5/v8 v8.4.3 h1:iTonLeSJOn7MVUtyMT+arAn5AKAPrkilzhGw8wE/Tq8=
-github.com/jcmturner/gokrb5/v8 v8.4.3/go.mod h1:dqRwJGXznQrzw6cWmyo6kH+E7jksEQG/CyVWsJEsJO0=
+github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8=
+github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs=
 github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY=
 github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
@@ -446,10 +454,12 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw=
 github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=
-github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
+github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
 github.com/knadh/koanf v1.5.0 h1:q2TSd/3Pyc/5yP9ldIrSdIz26MCcyNQzW0pEAugLPNs=
 github.com/knadh/koanf v1.5.0/go.mod h1:Hgyjp4y8v44hpZtPzs7JZfRAW5AhN7KfZcwv1RYggDs=
 github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g=
@@ -463,6 +473,7 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -494,19 +505,22 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
+github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-oci8 v0.1.1/go.mod h1:wjDx6Xm9q7dFtHJvIlrI99JytznLw5wQ4R+9mNXJwGI=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
 github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
+github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI=
+github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
-github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
+github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
 github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
-github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
 github.com/mitchellh/cli v1.1.2/go.mod h1:6iaV0fGdElS6dPBx0EApTxHrcWvmJphyh2n8YBLPPZ4=
@@ -539,53 +553,53 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/mostynb/go-grpc-compression v1.2.0 h1:KJzRFSYPXlcoYjG5/xLZB8tpuOyWF2UnlW4tAuaWnfI=
-github.com/mostynb/go-grpc-compression v1.2.0/go.mod h1:oidYvYyefMmhcuvU8fLJ8FfZyTyVzJ6SkmD5fIKgRe8=
+github.com/mostynb/go-grpc-compression v1.2.2 h1:XaDbnRvt2+1vgr0b/l0qh4mJAfIxE0bKXtz2Znl3GGI=
+github.com/mostynb/go-grpc-compression v1.2.2/go.mod h1:GOCr2KBxXcblCuczg3YdLQlcin1/NfyDA348ckuCH6w=
 github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/nats-io/jwt/v2 v2.4.1 h1:Y35W1dgbbz2SQUYDPCaclXcuqleVmpbRa7646Jf2EX4=
-github.com/nats-io/nats-server/v2 v2.9.20 h1:bt1dW6xsL1hWWwv7Hovm+EJt5L6iplyqlgEFkoEUk0k=
-github.com/nats-io/nats-server/v2 v2.9.20/go.mod h1:aTb/xtLCGKhfTFLxP591CMWfkdgBmcUUSkiSOe5A3gw=
-github.com/nats-io/nats.go v1.27.0 h1:3o9fsPhmoKm+yK7rekH2GtWoE+D9jFbw8N3/ayI1C00=
-github.com/nats-io/nats.go v1.27.0/go.mod h1:XpbWUlOElGwTYbMR7imivs7jJj9GtK7ypv321Wp6pjc=
-github.com/nats-io/nkeys v0.4.4 h1:xvBJ8d69TznjcQl9t6//Q5xXuVhyYiSos6RPtvQNTwA=
-github.com/nats-io/nkeys v0.4.4/go.mod h1:XUkxdLPTufzlihbamfzQ7mw/VGx6ObUs+0bN5sNvt64=
+github.com/nats-io/nats.go v1.31.0 h1:/WFBHEc/dOKBF6qf1TZhrdEfTmOZ5JzdJ+Y3m6Y/p7E=
+github.com/nats-io/nats.go v1.31.0/go.mod h1:di3Bm5MLsoB4Bx61CBTsxuarI36WbhAwOm8QrW39+i8=
+github.com/nats-io/nkeys v0.4.6 h1:IzVe95ru2CT6ta874rt9saQRkWfe2nFj1NtvYSLqMzY=
+github.com/nats-io/nkeys v0.4.6/go.mod h1:4DxZNzenSVd1cYQoAa8948QY3QDjrHfcfVADymtkpts=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
-github.com/observiq/ctimefmt v1.0.0 h1:r7vTJ+Slkrt9fZ67mkf+mA6zAdR5nGIJRMTzkUyvilk=
-github.com/observiq/ctimefmt v1.0.0/go.mod h1:mxi62//WbSpG/roCO1c6MqZ7zQTvjVtYheqHN3eOjvc=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/oklog/ulid/v2 v2.0.2 h1:r4fFzBm+bv0wNKNh5eXTwU7i85y5x+uwkxCUTNVQqLc=
 github.com/oklog/ulid/v2 v2.0.2/go.mod h1:mtBL0Qe/0HAx6/a4Z30qxVIAL1eQDweXq5lxOEiwQ68=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs=
+github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys=
-github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.81.0 h1:sPjCHuqjn5UYDJOai4FulMCfLP+7AbspjHfv0jAtmD0=
-github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.81.0/go.mod h1:moQ6krtZ8dyziij2P+9eao5+gBfCJjiNDwN7n2MZZs4=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.81.0 h1:Rb8e1O31dgjTEn6823RsPs2RaOwl7fVuFWz2qK9DRpY=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.81.0/go.mod h1:tnyFHqiWxeNUqAAaGuKDD7XDL0KwBMSqvRB9PsKCzng=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.81.0 h1:UCF4zWe24m1+yQeYGEQjzq5c9yNAf4d1lknbR7PAoH4=
-github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.81.0/go.mod h1:/HK52N8ufi1rKuShEanBZVLVpOygLoIT9zqs0azKQ/s=
-github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.81.0 h1:sVmU1X/9txOvdQX0VbnqwetrKThnsPXlJO52dmaFng8=
-github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.81.0/go.mod h1:x71DNfrdvoQSN3AiovAsoSi4aG74Rary8oJATXzzkMw=
+github.com/onsi/gomega v1.23.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg=
+github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.91.0 h1:8nzprvG2+4BK6C5wFSgZruZpoPiGKc1kRO2rp33tpTo=
+github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.91.0/go.mod h1:Kw1ZyEtVfeOTaBeNnJ4tWFw3E5TtqGwwpNDjMqT4Zp4=
+github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.91.0 h1:I3MFZXcQdnATObbeKseHLEWOWMFt1jHhHCbeunBw3mE=
+github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.91.0/go.mod h1:xHPYTciFeEEE2HnPu65FMgsCQFYNns66mqiHsMqb+HM=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.91.0 h1:H2XRo5joSzcBhAvOrch7/p+MHighMshJpBdOWji0qh4=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.91.0/go.mod h1:+5u+yVQRH/9RmqWwKKLtmGvbopeq6uxRCZDYO7PI7tE=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.91.0 h1:cd5S+I75Yn63tjJAjBeVSJjcgk0E+Lun8n310FrAUM8=
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.91.0/go.mod h1:vmvMQG+q0sm+cncpu8Nw8Dh0heJLnypb9ElIolUS+1E=
+github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.91.0 h1:HrGxse63DjyfvqRDFYzbWyJRrCnp+SMmDqlmaiTgFtI=
+github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.91.0/go.mod h1:u7F9B1mxPiAbkw4EeRYE4QyDHFxto4On+qJvOW5RS1I=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
-github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034=
-github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ=
+github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI=
+github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
 github.com/opencontainers/runc v1.1.5 h1:L44KXEpKmfWDcS02aeGm8QNTFXTo2D+8MYGDIJ/GDEs=
 github.com/opencontainers/runc v1.1.5/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg=
 github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
@@ -605,11 +619,11 @@ github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTK
 github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o=
 github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
 github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU=
-github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek=
+github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
+github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc=
-github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ=
+github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -618,41 +632,43 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA=
 github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo=
 github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
-github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
 github.com/poy/onpar v0.0.0-20190519213022-ee068f8ea4d1/go.mod h1:nSbFQvMj97ZyhFRSJYtut+msi4sOY6zJDGCdSc+/rZU=
 github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
+github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
 github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
-github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8=
-github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc=
+github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
+github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY=
-github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
+github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
+github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
-github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
-github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
+github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM=
+github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg=
-github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
-github.com/prometheus/prometheus v0.43.0 h1:18iCSfrbAHbXvYFvR38U1Pt4uZmU9SmDcCpCrBKUiGg=
-github.com/prometheus/prometheus v0.43.0/go.mod h1:2BA14LgBeqlPuzObSEbh+Y+JwLH2GcqDlJKbF2sA6FM=
+github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI=
+github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY=
 github.com/prometheus/statsd_exporter v0.22.7 h1:7Pji/i2GuhK6Lu7DHrtTkFmNBCudCPT1pX2CziuyQR0=
+github.com/prometheus/statsd_exporter v0.22.7/go.mod h1:N/TevpjkIh9ccs6nuzY3jQn9dFqnUakOjnEuMPJJJnI=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
+github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
+github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
@@ -660,8 +676,9 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
-github.com/rs/cors v1.9.0 h1:l9HGsTsHJcvW14Nk7J9KFz8bzeAWXn3CG6bgt7LsrAE=
-github.com/rs/cors v1.9.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
+github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo=
+github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
 github.com/rubenv/sql-migrate v1.1.1 h1:haR5Hn8hbW9/SpAICrXoZqXnywS7Q5WijwkQENPeNWY=
 github.com/rubenv/sql-migrate v1.1.1/go.mod h1:/7TZymwxN8VWumcIxw1jjHEcR1djpdkMHQPT4FWdnbQ=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -669,6 +686,10 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
+github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ=
+github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
+github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
+github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
@@ -676,27 +697,27 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
+github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
-github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk=
-github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
+github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
+github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
-github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
+github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
+github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk=
 github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
 github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
-github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
-github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU=
-github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA=
+github.com/spf13/viper v1.18.1 h1:rmuU42rScKWlhhJDyXZRKJQHXFX02chSVW1IvkPGiVM=
+github.com/spf13/viper v1.18.1/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk=
 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -715,8 +736,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
-github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8=
-github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
+github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
+github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o=
 github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
@@ -763,76 +784,79 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
-go.opentelemetry.io/collector v0.81.0 h1:pF+sB8xNXlg/W0a0QTLz4mUWyool1a9toVj8LmLoFqg=
-go.opentelemetry.io/collector v0.81.0/go.mod h1:thuOTBMusXwcTPTwLbs3zwwCOLaaQX2g+Hjf8OObc/w=
-go.opentelemetry.io/collector/component v0.81.0 h1:AKsl6bss/SRrW248GFpmGiiI/4kdemW92Ai/X82CCqY=
-go.opentelemetry.io/collector/component v0.81.0/go.mod h1:+m6/yPiJ7O7Oc/OLfmgUB2mrY1xoUqRj4BsoOtIVpGs=
-go.opentelemetry.io/collector/config/configauth v0.81.0 h1:NIiJuIGOdblN0EIJv64R2mvGhthcYfWuvyCnjk8HRN4=
-go.opentelemetry.io/collector/config/configauth v0.81.0/go.mod h1:2KscbmU+8fIzwiSU9Kku0Tf4b4A1plqFIJXR1DWSaTw=
-go.opentelemetry.io/collector/config/configcompression v0.81.0 h1:Q725pvVH7tR6BP3WK7Ro3pbqMeQdZEV3KeFVHchBxCc=
-go.opentelemetry.io/collector/config/configcompression v0.81.0/go.mod h1:xhHm1sEH7BTECAJo1xn64NMxeIvZGKdVGdSKUUc+YuM=
-go.opentelemetry.io/collector/config/configgrpc v0.81.0 h1:Q2xEE2SGbg79j3TdHT+781eUu/2uUIyrHVJAG9bLpVk=
-go.opentelemetry.io/collector/config/configgrpc v0.81.0/go.mod h1:Frq/l2Ttbvm7cFH3hkxLdhl5TCNHcH6rnkpmi8U2kLY=
-go.opentelemetry.io/collector/config/confighttp v0.81.0 h1:vIdiepUT7P/WtJRdfh8mjzvSqJRVF8/vl9GWtUNQlHQ=
-go.opentelemetry.io/collector/config/confighttp v0.81.0/go.mod h1:I54THsffkpv//O7bUHw+0bXxjYdvyL6IHg5ksgYez8I=
-go.opentelemetry.io/collector/config/confignet v0.81.0 h1:Eu8m3eX8GaGhOUc//YXvV4i3cEivxUSxkLnV1U9ydhg=
-go.opentelemetry.io/collector/config/confignet v0.81.0/go.mod h1:unOg7BZvpt6T5xsf+LyeOQvUhD8ld/2AbfOsmUZ/bPM=
-go.opentelemetry.io/collector/config/configopaque v0.81.0 h1:MkCAGh0WydRWydETB9FLnuCj9hDPDiz2g4Wxnl53I0w=
-go.opentelemetry.io/collector/config/configopaque v0.81.0/go.mod h1:pM1oy6gasukw3H6jAvc9Q9OtFaaY2IbfeuwCPAjOgXc=
-go.opentelemetry.io/collector/config/configtelemetry v0.81.0 h1:j3dhWbAcrfL1n0RmShRJf99X/xIMoPfEShN/5Z8bY0k=
-go.opentelemetry.io/collector/config/configtelemetry v0.81.0/go.mod h1:KEYQRiYJdx38iZkvcLKBZWH9fK4NeafxBwGRrRKMgyA=
-go.opentelemetry.io/collector/config/configtls v0.81.0 h1:2vt+yOZUvGq5ADqFAxL5ONm1ACuGXDSs87AWT54Ez4M=
-go.opentelemetry.io/collector/config/configtls v0.81.0/go.mod h1:HMHTYBMMgqBpTvnNAhQYmjO7XuoBMe2T4qRHcKluB4Q=
-go.opentelemetry.io/collector/config/internal v0.81.0 h1:wRV2PBnJygdmKpIdt/xfG7zdQvXvHz9L+z8MhGsOji4=
-go.opentelemetry.io/collector/config/internal v0.81.0/go.mod h1:RKcLV1gQxhgwx+6rlPYsvGMq1RZNne3UeOUZkHxJnIg=
-go.opentelemetry.io/collector/confmap v0.81.0 h1:AqweoBGdF3jGM2/KgP5GS6bmN+1aVrEiCy4nPf7IBE4=
-go.opentelemetry.io/collector/confmap v0.81.0/go.mod h1:iCTnTqGgZZJumhJxpY7rrJz9UQ/0zjPmsJz2Z7Tp4RY=
-go.opentelemetry.io/collector/consumer v0.81.0 h1:8R2iCrSzD7T0RtC2Wh4GXxDiqla2vNhDokGW6Bcrfas=
-go.opentelemetry.io/collector/consumer v0.81.0/go.mod h1:jS7+gAKdOx3lD3SnaBztBjUVpUYL3ee7fpoqI4p/gT8=
-go.opentelemetry.io/collector/exporter v0.81.0 h1:GLhB8WGrBx+zZSB1HIOx2ivFUMahGtAVO2CC5xbCUHQ=
-go.opentelemetry.io/collector/exporter v0.81.0/go.mod h1:Di4RTzI8uRooVNATIeApNUgmGdNt8XiikUTQLabmZaA=
-go.opentelemetry.io/collector/extension v0.81.0 h1:Ak7AzZzxTFJxGyVbEklsGzqHyOHW5USiifJilCcRyTU=
-go.opentelemetry.io/collector/extension v0.81.0/go.mod h1:DU2bX8qulS5+OCJZGfvqIwIT/q3sFnEjI2HjJ2LDI/s=
-go.opentelemetry.io/collector/extension/auth v0.81.0 h1:UzVQSG9naJh1hX7hh+HVcvB3n+rpCJXX2BBdUoL/Ybo=
-go.opentelemetry.io/collector/extension/auth v0.81.0/go.mod h1:PaBFcFrzXV+UgM4VZKp6Kn1IiRC/MbEYWxTfIalcIwk=
-go.opentelemetry.io/collector/featuregate v1.0.0-rcv0013 h1:tiTUG9X/gEDN1oDYQOBVUFYQfhUG2CvgW9VhBc2uk1U=
-go.opentelemetry.io/collector/featuregate v1.0.0-rcv0013/go.mod h1:0mE3mDLmUrOXVoNsuvj+7dV14h/9HFl/Fy9YTLoLObo=
-go.opentelemetry.io/collector/pdata v1.0.0-rcv0013 h1:4sONXE9hAX+4Di8m0bQ/KaoH3Mi+OPt04cXkZ7A8W3k=
-go.opentelemetry.io/collector/pdata v1.0.0-rcv0013/go.mod h1:x09G/4KjEcDKNuWCjC5ZtnuDE0XEqiRwI+yrHSVjIy8=
-go.opentelemetry.io/collector/processor v0.81.0 h1:ypyNV5R0bnN3XGMAsH/q5eNARF5vXtFgSOK9rBWzsLc=
-go.opentelemetry.io/collector/processor v0.81.0/go.mod h1:ZDwO3DVg1VUSA92g0r/o0jYk+T7r9uxgZZ3LABJbC34=
-go.opentelemetry.io/collector/receiver v0.81.0 h1:0c+YtIV7fmd9ev+zmwS9qjx5ASi8cw+gSypu4I7Gugc=
-go.opentelemetry.io/collector/receiver v0.81.0/go.mod h1:q80JkMxVLnk0vWxoTRY2J7F4Qx9069Yy5yxDbZ4JVwk=
-go.opentelemetry.io/collector/receiver/otlpreceiver v0.81.0 h1:ewVbfATnAeQkwFK3r0dpFKCXcTb8HJKX4AixUioRt+c=
-go.opentelemetry.io/collector/receiver/otlpreceiver v0.81.0/go.mod h1:LGuSMVdOq5Zq+CEHF9YBHMaOIUZrzqW7DQGqo9g0dJA=
-go.opentelemetry.io/collector/semconv v0.81.0 h1:lCYNNo3powDvFIaTPP2jDKIrBiV1T92NK4QgL/aHYXw=
-go.opentelemetry.io/collector/semconv v0.81.0/go.mod h1:TlYPtzvsXyHOgr5eATi43qEMqwSmIziivJB2uctKswo=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 h1:mdcNStUIXngF/mH3xxAo4nbR4g65IXqLL1SvYMjz7JQ=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17/go.mod h1:N2Nw/UmmvQn0yCnaUzvsWzTWIeffYIdFteg6mxqCWII=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY7+onl4qN1vl0xW/V/v6OBZ0vVdH+esuJgvmM=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1:XiYsayHc36K3EByOO6nbAXnAWbrUxdjUROCEeeROOH8=
-go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s=
-go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4=
-go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA=
-go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo=
-go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4=
-go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE=
-go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4=
-go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI=
-go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI=
-go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs=
-go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0=
-go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
+go.opentelemetry.io/collector v0.91.0 h1:C7sGUJDJ5nwm+CkWpAaVP3lNsuYpwSRbkmLncFjkmO8=
+go.opentelemetry.io/collector v0.91.0/go.mod h1:YhQpIDZsn+bICAAqgBwXk9wqK8GKZDv+aogfG52zUuE=
+go.opentelemetry.io/collector/component v0.91.0 h1:aBT1i2zGyfh9PalYJLfXVvQp+osHyalwyDFselI1CtA=
+go.opentelemetry.io/collector/component v0.91.0/go.mod h1:2KBHvjNFdU7oOjsObQeC4Ta2Ef607OISU5obznW00fw=
+go.opentelemetry.io/collector/config/configauth v0.91.0 h1:SjWKimuqlpfS3sIlFpfzdkSY/AmMMCEmn9+KRcjEU+s=
+go.opentelemetry.io/collector/config/configauth v0.91.0/go.mod h1:wmmMYqv6PxwY+/h7qqvd/LP0XN/wzXoECDu6PYz2Of0=
+go.opentelemetry.io/collector/config/configcompression v0.91.0 h1:v+jEpFhLgfJDCUCPsSF03gjoFEvm77PofTCqHKKgXTs=
+go.opentelemetry.io/collector/config/configcompression v0.91.0/go.mod h1:LaavoxZsro5lL7qh1g9DMifG0qixWPEecW18Qr8bpag=
+go.opentelemetry.io/collector/config/configgrpc v0.91.0 h1:+2zPmgVOhKgelluGaGwE3OMKqwi56i6OiU0+7xWTetM=
+go.opentelemetry.io/collector/config/configgrpc v0.91.0/go.mod h1:iWDbg9vYaayewmbKfM2zEk4YvaOOwrs0eiUffypcZFk=
+go.opentelemetry.io/collector/config/confighttp v0.91.0 h1:YAOyXcDaLDnF3UqPHH4kYU8lx8BqXJ7hS3Ou8GcmqpQ=
+go.opentelemetry.io/collector/config/confighttp v0.91.0/go.mod h1:R6y8KSJzqDe6CE6JsYwt4CTZ2B4AlqRA+V74OJPX3vE=
+go.opentelemetry.io/collector/config/confignet v0.91.0 h1:3huNXh04O3wXaN4qPhmmiefyz4dYbOlNcR/OKMByqig=
+go.opentelemetry.io/collector/config/confignet v0.91.0/go.mod h1:cpO8JYWGONaViOygKVw+Hd2UoBcn2cUiyi0WWeFTwJY=
+go.opentelemetry.io/collector/config/configopaque v0.91.0 h1:bQgJPyARbuXAsU2p6h2YbEm1kHb1stS6hg42ekyMZmI=
+go.opentelemetry.io/collector/config/configopaque v0.91.0/go.mod h1:TPCHaU+QXiEV+JXbgyr6mSErTI9chwQyasDVMdJr3eY=
+go.opentelemetry.io/collector/config/configtelemetry v0.91.0 h1:mEwvqrYfwUJ7LwYfpcF9M8z7LHFoYaKhEPhnERD/88E=
+go.opentelemetry.io/collector/config/configtelemetry v0.91.0/go.mod h1:+LAXM5WFMW/UbTlAuSs6L/W72WC+q8TBJt/6z39FPOU=
+go.opentelemetry.io/collector/config/configtls v0.91.0 h1:lZromNeOslPwyVlTPMOzF2q++SY+VONvfH3cDqA0kKk=
+go.opentelemetry.io/collector/config/configtls v0.91.0/go.mod h1:E+CW5gZoH8V3z5aSlZxwiof7GAcayzn1HRM+uRILLEI=
+go.opentelemetry.io/collector/config/internal v0.91.0 h1:Yx17oFdXOPnY83Jfe1oiXhvfYW7RX/xh3/kpV/iYibM=
+go.opentelemetry.io/collector/config/internal v0.91.0/go.mod h1:42VsQ/1kP2qnvzjNi+dfNP+KyCFRADejyrJ8m2GVL3M=
+go.opentelemetry.io/collector/confmap v0.91.0 h1:7U2MT+u74oEzq/WWrpXSLKB7nX5jPNC4drwtQdYfwKk=
+go.opentelemetry.io/collector/confmap v0.91.0/go.mod h1:uxV+fZ85kG31oovL6Cl3fAMQ3RRPwUvfAbbA9WT1Yhk=
+go.opentelemetry.io/collector/consumer v0.91.0 h1:0nU1lUe2S0b8iOmF3w3R/9Dt24n413thRTbXz/nJgrM=
+go.opentelemetry.io/collector/consumer v0.91.0/go.mod h1:phTUQmr7hpYfwXyDXo4mFHVjYrlSbZE+nZYlKlbVxGs=
+go.opentelemetry.io/collector/exporter v0.91.0 h1:guWcGflFjaenp3BMxAmAKjb8RQG80jQQKjuUFouS+z8=
+go.opentelemetry.io/collector/exporter v0.91.0/go.mod h1:hkOBunNNWu6CaTtkRsCJ/OJ509REJZg+DDElevFIQCQ=
+go.opentelemetry.io/collector/extension v0.91.0 h1:bkoSLgnWm4g6n+RLmyKG6Up7dr8KmJy68quonoLZnr0=
+go.opentelemetry.io/collector/extension v0.91.0/go.mod h1:F3r0fVTTh4sYR0GVv51Qez8lk8v77kTDPdyMOp6A2kg=
+go.opentelemetry.io/collector/extension/auth v0.91.0 h1:28Hv5W0GZgv2jR5IiFdJzutTs91KmXFh8DUfVTjwwmI=
+go.opentelemetry.io/collector/extension/auth v0.91.0/go.mod h1:diY6Sw7cOAn2qivKipZk4niBFzCCFBj7swAXiG2h9ro=
+go.opentelemetry.io/collector/featuregate v1.0.0 h1:5MGqe2v5zxaoo73BUOvUTunftX5J8RGrbFsC2Ha7N3g=
+go.opentelemetry.io/collector/featuregate v1.0.0/go.mod h1:xGbRuw+GbutRtVVSEy3YR2yuOlEyiUMhN2M9DJljgqY=
+go.opentelemetry.io/collector/pdata v1.0.0 h1:ECP2jnLztewsHmL1opL8BeMtWVc7/oSlKNhfY9jP8ec=
+go.opentelemetry.io/collector/pdata v1.0.0/go.mod h1:TsDFgs4JLNG7t6x9D8kGswXUz4mme+MyNChHx8zSF6k=
+go.opentelemetry.io/collector/processor v0.91.0 h1:Xi52gYMXTG4zYmNhsqJ8ly/9f7b0n0crMhKxVVI9HpY=
+go.opentelemetry.io/collector/processor v0.91.0/go.mod h1:naTuusZNfzM5MSqoTVzkKbR1MaJ8oD8v5ginR5JreDE=
+go.opentelemetry.io/collector/receiver v0.91.0 h1:0TZF/0OXoJtxgm+mvOinRRXo9LgVyOsOgCQfWkNGXJA=
+go.opentelemetry.io/collector/receiver v0.91.0/go.mod h1:d5qo2mpovqKoi47hrMxj5BLdLzOXM0mUHL5CKrjfWNM=
+go.opentelemetry.io/collector/receiver/otlpreceiver v0.91.0 h1:1Eyc1uR8yr3heKkC4YXFoZip0JqgOXuOiN/tXvl9WUo=
+go.opentelemetry.io/collector/receiver/otlpreceiver v0.91.0/go.mod h1:7am8EW0xmHLxeeGIb0xTcsoVc6+1LfNCGdc+b7OvE8k=
+go.opentelemetry.io/collector/semconv v0.91.0 h1:TRd+yDDfKQl+aNtS24wmEbJp1/QE/xAFV9SB5zWGxpE=
+go.opentelemetry.io/collector/semconv v0.91.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw=
+go.opentelemetry.io/contrib/config v0.1.1 h1:lIUTrMWkfDE0GvzBLhwv6ATDB1vntrnTsRvUMkZKnfQ=
+go.opentelemetry.io/contrib/config v0.1.1/go.mod h1:rDrK4+PS6Cs+WIphU/GO5Sk4TGV36lEQqk/Z1vZkaLI=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo=
+go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=
+go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
+go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 h1:TnhkxGJ5qPHAMIMI4r+HPT/BbpoHxqn4xONJrok054o=
+go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg=
+go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4=
+go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM=
+go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8=
+go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=
+go.opentelemetry.io/otel/sdk/metric v1.21.0 h1:smhI5oD714d6jHE6Tie36fPx4WDFIg+Y6RfAY4ICcR0=
+go.opentelemetry.io/otel/sdk/metric v1.21.0/go.mod h1:FJ8RAsoPGv/wYMgBdUJXOm+6pzFY3YdljnXtv1SBE8Q=
+go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
+go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
-go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
+go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
+go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
+go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
-go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
-go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
+go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
+go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -844,12 +868,10 @@ golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM=
-golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
+golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
+golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -860,8 +882,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea h1:vLCWI/yYrdEHyN2JzIzPO3aaQJHQdp89IZBA/+azVC4=
-golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
+golang.org/x/exp v0.0.0-20231127185646-65229373498e h1:Gvh4YaCaXNs6dKTlfgismwWZKyjVZXwOPfIyUaqU3No=
+golang.org/x/exp v0.0.0-20231127185646-65229373498e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -888,8 +910,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
-golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -936,12 +958,12 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
 golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.0.0-20220725212005-46097bf591d3/go.mod h1:AaygXjzTFtRAg2ttMY5RMuhpJ3cNnI0XpyFJD1iQRSM=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
-golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU=
-golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
+golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -954,8 +976,8 @@ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=
-golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
+golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ=
+golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -968,8 +990,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
+golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -1027,7 +1049,6 @@ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1035,7 +1056,6 @@ golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1048,15 +1068,17 @@ golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
-golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.9.0 h1:GRRCnKYhdQrD8kfRAdQ6Zcw1P0OcELxGLKJvtjVMZ28=
-golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
+golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1069,13 +1091,14 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58=
-golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
+golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -1127,13 +1150,12 @@ golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
-golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
+golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM=
+golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1200,24 +1222,22 @@ google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6D
 google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
 google.golang.org/genproto v0.0.0-20210503173045-b96a97608f20/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A=
 google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20230525234025-438c736192d0 h1:x1vNwUhVOcsYoKyEGCZBH694SBmmBjA2EfauFVEI2+M=
-google.golang.org/genproto v0.0.0-20230525234025-438c736192d0/go.mod h1:9ExIQyXL5hZrHzQceCwuSYwZZ5QZBazOcprJ5rgs3lY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
+google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f h1:Vn+VyHU5guc9KjB5KrjI2q0wCOWEOIh0OEsleqakHJg=
+google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f/go.mod h1:nWSwAFPb+qfNJXsoeO3Io7zf4tMSfN8EA8RlDA04GhY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 h1:DC7wcm+i+P1rN3Ff07vL+OndGg5OhNddHyTA+ocPqYE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4/go.mod h1:eJVxU6o+4G1PSczBr85xmyvSNYAKvAYgkub40YGomFM=
 google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
@@ -1241,9 +1261,8 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG
 google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
 google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ=
-google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
+google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
+google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -1291,6 +1310,7 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools/v3 v3.3.0 h1:MfDY1b1/0xN1CyMlQDac0ziEy9zJQd9CXBRRDHw2jJo=
+gotest.tools/v3 v3.3.0/go.mod h1:Mcr9QNxkg0uMvy/YElmo4SpXgJKWgQvYrT7Kw5RzJ1A=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -1304,12 +1324,40 @@ k8s.io/apimachinery v0.26.3 h1:dQx6PNETJ7nODU3XPtrwkfuubs6w7sX0M8n61zHIV/k=
 k8s.io/apimachinery v0.26.3/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
 k8s.io/client-go v0.26.3 h1:k1UY+KXfkxV2ScEL3gilKcF7761xkYsSD6BC9szIu8s=
 k8s.io/client-go v0.26.3/go.mod h1:ZPNu9lm8/dbRIPAgteN30RSXea6vrCpFvq+MateTUuQ=
-k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
-k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
+k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
+k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
 k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
-k8s.io/utils v0.0.0-20230308161112-d77c459e9343 h1:m7tbIjXGcGIAtpmQr7/NAi7RsWoW3E7Zcm4jI1HicTc=
-k8s.io/utils v0.0.0-20230308161112-d77c459e9343/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
+k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI=
+lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
+modernc.org/cc/v3 v3.40.0 h1:P3g79IUS/93SYhtoeaHW+kRCIrYaxJ27MFPv+7kaTOw=
+modernc.org/cc/v3 v3.40.0/go.mod h1:/bTg4dnWkSXowUO6ssQKnOV0yMVxDYNIsIrzqTFDGH0=
+modernc.org/ccgo/v3 v3.16.13 h1:Mkgdzl46i5F/CNR/Kj80Ri59hC8TKAhZrYSaqvkwzUw=
+modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY=
+modernc.org/ccorpus v1.11.6 h1:J16RXiiqiCgua6+ZvQot4yUuUy8zxgqbqEEUuGPlISk=
+modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
+modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=
+modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
+modernc.org/libc v1.29.0 h1:tTFRFq69YKCF2QyGNuRUQxKBm1uZZLubf6Cjh/pVHXs=
+modernc.org/libc v1.29.0/go.mod h1:DaG/4Q3LRRdqpiLyP0C2m1B8ZMGkQ+cCgOIjEtQlYhQ=
+modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
+modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
+modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E=
+modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E=
+modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
+modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
+modernc.org/sqlite v1.28.0 h1:Zx+LyDDmXczNnEQdvPuEfcFVA2ZPyaD7UCZDjef3BHQ=
+modernc.org/sqlite v1.28.0/go.mod h1:Qxpazz0zH8Z1xCFyi5GSL3FzbtZ3fvbjmywNogldEW0=
+modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY=
+modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
+modernc.org/tcl v1.15.2 h1:C4ybAYCGJw968e+Me18oW55kD/FexcHbqH2xak1ROSY=
+modernc.org/tcl v1.15.2/go.mod h1:3+k/ZaEbKrC8ePv8zJWPtBSW0V7Gg9g8rkmhI1Kfs3c=
+modernc.org/token v1.0.1 h1:A3qvTqOwexpfZZeyI0FeGPDlSWX5pjZu9hF4lU+EKWg=
+modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
+modernc.org/z v1.7.3 h1:zDJf6iHjrnB+WRD88stbXokugjyc0/pB91ri1gO6LZY=
+modernc.org/z v1.7.3/go.mod h1:Ipv4tsdxZRbQyLq9Q1M6gdbkxYzdlrciF2Hi/lS7nWE=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
diff --git a/kind/Chart.lock b/kind/Chart.lock
deleted file mode 100644
index 53732b11b..000000000
--- a/kind/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: orb
-  repository: https://orb-community.github.io/orb-helm/
-  version: 1.0.44
-digest: sha256:054a0e4810a7d857f4c0b156bb92e909f485096242098f62ab5b558140e48a22
-generated: "2023-02-13T13:18:58.67925487-03:00"
diff --git a/kind/Chart.yaml b/kind/Chart.yaml
index 267789e22..dcbbcf6a7 100644
--- a/kind/Chart.yaml
+++ b/kind/Chart.yaml
@@ -17,5 +17,5 @@ appVersion: "1.0.0"
 
 dependencies:
   - name: orb
-    version: "1.0.44"
+    version: "1.0.53"
     repository: "@orb-community"
diff --git a/kind/README.md b/kind/README.md
index ea6487b08..5ef3ed777 100644
--- a/kind/README.md
+++ b/kind/README.md
@@ -2,7 +2,6 @@
 
 The following steps must be performed at the **root of the Orb project** to set up a local k8s cluster and deploy Orb.
 
-
 ## 🧱 Requirements
 
 - [Docker Environment](#docker)
@@ -12,118 +11,150 @@ The following steps must be performed at the **root of the Orb project** to set
 
 > **💡 Note:** If you have those installed, please skip to [Deploy Orb on Kind](#deploy-orb-kind).
 
-> ⚠️ You may need to permit ports 80 and 443 (*ingress*) because of [kubernetes](https://kubernetes.io/docs/concepts/services-networking/ingress/).
+> ⚠️ You may need to permit ports 80 and 443 (_ingress_) because of [kubernetes](https://kubernetes.io/docs/concepts/services-networking/ingress/).
 
 <a name="docker"></a>
+
 ## 🐳 Docker Environment (Requirement)
 
 Quick install a **Docker** executing:
+
 ```shell
 make install-docker
 ```
 
 Check if you have a **Docker** running by executing:
+
 ```shell
 docker version
 ```
+
 If you need help to set up a **Docker Environment**, follow the [steps from here](https://docs.docker.com/engine/install/debian/).
 
 <a name="helm-3"></a>
+
 ## ⚓ Helm 3 (Requirement)
 
 [Helm](https://helm.sh/) is a package manager for Kubernetes. A Helm Chart is a package that allows you to customize your deployment on Kubernetes.
 
 Quick install a **Helm 3** executing:
+
 ```shell
 make install-helm
 ```
 
 Check if you have **Helm 3** installed by executing:
+
 ```shell
 helm version
 ```
+
 If you need help to install **Helm 3**, follow the [steps from here](https://helm.sh/docs/intro/install/).
 
 > 🚨 **Warning:** Make sure you have version 3 installed, orb helm charts doesn't officially support helm 2.
 
 <a name="kubectl"></a>
+
 ## 🐋 Kubectl (Requirement)
 
 Quick install a **Kubectl** executing:
+
 ```shell
 make install-kubectl
 ```
 
 Check if you have **Kubectl** cmd installed by executing:
+
 ```shell
 kubectl version --client
 ```
+
 If you need help to install **Kubectl**, follow the [steps from here](https://kubernetes.io/docs/tasks/tools/).
 
 <a name="install-kind"></a>
+
 ## 🚢 Install Kind (Requirement)
 
 Kind is a tool for running local k8s clusters using docker container as nodes.
 
 Quick install a **Kind** on Linux executing:
+
 ```shell
 make install-kind
 ```
 
 If you have `go 1.17 or later` installed:
+
 ```shell
 go install sigs.k8s.io/kind@v0.14.0
 ```
 
 macOS users can also use `brew`:
+
 ```shell
 brew install kind
 ```
 
 > 🚨 **Windows WSL users**: WSL is also supported, but for some reason the Orb stack mess up the WSL internal DNS.
 > You can fix that by editing your `/etc/wsl.conf` and adding the following:
+>
 > ```shell
 > [network]
 > generateResolvConf = false
 > ```
+>
 > Restart WSL by executing the following on CMD:
+>
 > ```shell
 > wsl --shutdown
 > ```
+>
 > Open WSL terminal again and remove the symbolic link from `/etc/resolv.conf`:
+>
 > ```shell
 > sudo unlink /etc/resolv.conf
 > ```
+>
 > Create a new `/etc/resolv.conf` file and add the following:
+>
 > ```shell
 > nameserver 8.8.8.8
 > ```
+>
 > save the file and you are done.
 
 <a name="kubectl"></a>
+
 ## 🐋 k9s (Optional)
 
 Quick install a **k9s** to manage your cluster executing:
+
 ```shell
 make install-k9s
 ```
 
 <a name="deploy-orb-kind"></a>
-## 🚀  Deploy Orb on Kind
+
+## 🚀 Deploy Orb on Kind
 
 Add `kubernetes.docker.internal` host as `127.0.0.1` address in your hosts file:
+
 ```shell
 echo "127.0.0.1 kubernetes.docker.internal" | sudo tee -a /etc/hosts
 ```
+
 > **💡 Note:** This is needed just once
 
 Setup **Orb Charts** dependencies repositories:
+
 ```shell
 make prepare-helm
 ```
+
 > **💡 Note:** You just need to run those steps until here once, even if you delete the cluster afterwards.
 
 Use the following command to create the cluster and deploy **Orb**:
+
 ```shell
 make run
 ```
@@ -134,28 +165,31 @@ E-mail | Password | Role
 admin@kind.com | pass123456 | Admin
 
 Have fun! 🎉 When you are done, you can delete the cluster by running:
+
 ```shell
 make kind-delete-cluster
 ```
 
 ## Development flow with Kind
 
-
 Use the following command to create the empty cluster:
+
 ```shell
 make kind-create-cluster
 ```
-> **💡 Note:** Now you have and empty kind cluster with minimum necessary to spin up pods
 
+> **💡 Note:** Now you have and empty kind cluster with minimum necessary to spin up pods
 
 Let's add helm charts for orb:
+
 ```shell
 make prepare-helm
 ```
-> **💡 Note:** Now your dependencies are configured
 
+> **💡 Note:** Now your dependencies are configured
 
 Building all orb images:
+
 ```shell
 make dockers
 ```
@@ -163,6 +197,7 @@ make dockers
 > **💡 Note:** This can take some time
 
 Loading all images into the kind cluster:
+
 ```shell
 make kind-load-images
 ```
@@ -170,14 +205,15 @@ make kind-load-images
 > **💡 Note:** Your are loading from your local docker registry to kind cluster registry
 
 Load just one image to the kind cluster
+
 ```shell
 kind load docker-image orbcommunity/orb-maestro:0.22.0-088bee14
 ```
 
 > **💡 Note:** Do not forget to change **kind/values.yaml** manifest to use your image tag
 
-
 Install orb application:
+
 ```shell
 make kind-install-orb
 ```
@@ -185,23 +221,29 @@ make kind-install-orb
 > **💡 Note:** Now orb was installed properly
 
 If you have any problem to load your new deployment use:
+
 ```shell
 kubectl rollout restart deployment -n orb
 ```
 
 <a name="update-service"></a>
+
 ## Updating inflight service with recent development
- 
 
 If you want to change a service, lets say you added some logs to the fleet service, before committing the changes, add this
+
 ```shell
 SERVICE=fleet make build_docker
 ```
+
 This will build only the docker image of the new service.
 After changing you can simply execute
+
 ```shell
 make kind-upgrade-all
 ```
 
+Also you can load image using kind command individually, and upgrade your deployment with helm command. You can use redis-commander and adminer to interact with databases on kind environment
+
 <br>
 ❌ Is it not working correctly? Found a bug? Come talk to us [live on Slack](https://netdev.chat/) in the `#orb` channel, or [file a GitHub issue here](https://github.com/orb-community/orb/issues/new/choose).
diff --git a/kind/adminer/deployment.yaml b/kind/adminer/deployment.yaml
new file mode 100644
index 000000000..0ab940ec0
--- /dev/null
+++ b/kind/adminer/deployment.yaml
@@ -0,0 +1,21 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: adminer
+  labels:
+    app: adminer
+spec:
+  selector:
+    matchLabels:
+      app: adminer
+  template:
+    metadata:
+      labels:
+        app: adminer
+    spec:
+      containers:
+        - name: adminer
+          image: adminer:latest
+          ports:
+            - containerPort: 8080
\ No newline at end of file
diff --git a/kind/redis-commander/deployment.yaml b/kind/redis-commander/deployment.yaml
new file mode 100644
index 000000000..8c9c6274d
--- /dev/null
+++ b/kind/redis-commander/deployment.yaml
@@ -0,0 +1,59 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: redis-commander
+  annotations:
+    # Tell Kubernetes to apply the AppArmor or SecComp profile "runtime/default". (whatever is used)
+    # Note that this is ignored if the Kubernetes node is not running version 1.4 or greater.
+    # and fails if AppArmor enabled but profile not found (may happens on borked k8s installs only)
+    # set to "unconfined" to disable AppArmor (first annotation) or SecComp (second annotation)
+    container.apparmor.security.beta.kubernetes.io/redis-commander: runtime/default
+    container.security.alpha.kubernetes.io/redis-commander: runtime/default
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: redis-commander
+  template:
+    metadata:
+      labels:
+        app: redis-commander
+        tier: backend
+    spec:
+      automountServiceAccountToken: false
+      containers:
+        - name: redis-commander
+          image: rediscommander/redis-commander
+          imagePullPolicy: Always
+          env:
+            - name: REDIS_HOSTS
+              value: "stream-redis:kind-orb-redis-streams-master.orb.svc.cluster.local:6379,sinker-redis:kind-orb-redis-sinker-master.orb.svc.cluster.local:6379:1"
+            - name: K8S_SIGTERM
+              value: "1"
+            - name: HTTP_USER
+              value: "admin"
+            - name: HTTP_PASSWORD
+              value: "admin"
+          ports:
+            - name: redis-commander
+              containerPort: 8081
+          livenessProbe:
+            httpGet:
+              path: /favicon.png
+              port: 8081
+            initialDelaySeconds: 10
+            timeoutSeconds: 5
+          # adapt to your needs base on data stored inside redis (number of keys and size of biggest keys)
+          # or comment out for less secure installation
+          resources:
+            limits:
+              cpu: "500m"
+              memory: "512M"
+          securityContext:
+            runAsNonRoot: true
+            readOnlyRootFilesystem: false
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - ALL
\ No newline at end of file
diff --git a/kind/values.yaml b/kind/values.yaml
index 40662d11e..250e31f7d 100644
--- a/kind/values.yaml
+++ b/kind/values.yaml
@@ -30,13 +30,6 @@ orb:
       repository: "orbcommunity"
       tag: "develop"
 
-  sinker:
-    image:
-      name: "orb-sinker"
-      pullPolicy: "IfNotPresent"
-      repository: "orbcommunity"
-      tag: "develop"
-
   sinkerOtel:
     image:
       name: "orb-sinker"
diff --git a/maestro/config/authentication_builder.go b/maestro/config/authentication_builder.go
index 1a49f5b2e..6555193a1 100644
--- a/maestro/config/authentication_builder.go
+++ b/maestro/config/authentication_builder.go
@@ -1,6 +1,7 @@
 package config
 
 import (
+	"github.com/orb-community/orb/maestro/password"
 	"github.com/orb-community/orb/pkg/types"
 	"github.com/orb-community/orb/sinks/authentication_type/basicauth"
 )
@@ -9,22 +10,26 @@ const AuthenticationKey = "authentication"
 
 type AuthBuilderService interface {
 	GetExtensionsFromMetadata(config types.Metadata) (Extensions, string)
+	DecodeAuth(config types.Metadata) (types.Metadata, error)
+	EncodeAuth(config types.Metadata) (types.Metadata, error)
 }
 
-func GetAuthService(authType string) AuthBuilderService {
+func GetAuthService(authType string, service password.EncryptionService) AuthBuilderService {
 	switch authType {
 	case basicauth.AuthType:
-		return &BasicAuthBuilder{}
+		return &BasicAuthBuilder{
+			encryptionService: service,
+		}
 	}
 	return nil
 }
 
 type BasicAuthBuilder struct {
+	encryptionService password.EncryptionService
 }
 
-func (b *BasicAuthBuilder) GetExtensionsFromMetadata(config types.Metadata) (Extensions, string) {
-
-	authcfg := config.GetSubMetadata(AuthenticationKey)
+func (b *BasicAuthBuilder) GetExtensionsFromMetadata(c types.Metadata) (Extensions, string) {
+	authcfg := c.GetSubMetadata(AuthenticationKey)
 	username := authcfg["username"].(string)
 	password := authcfg["password"].(string)
 	return Extensions{
@@ -36,3 +41,27 @@ func (b *BasicAuthBuilder) GetExtensionsFromMetadata(config types.Metadata) (Ext
 		},
 	}, "basicauth/exporter"
 }
+
+func (b *BasicAuthBuilder) DecodeAuth(config types.Metadata) (types.Metadata, error) {
+	authCfg := config.GetSubMetadata(AuthenticationKey)
+	password := authCfg["password"].(string)
+	decodedPassword, err := b.encryptionService.DecodePassword(password)
+	if err != nil {
+		return nil, err
+	}
+	authCfg["password"] = decodedPassword
+	config[AuthenticationKey] = authCfg
+	return config, nil
+}
+
+func (b *BasicAuthBuilder) EncodeAuth(config types.Metadata) (types.Metadata, error) {
+	authcfg := config.GetSubMetadata(AuthenticationKey)
+	password := authcfg["password"].(string)
+	encodedPassword, err := b.encryptionService.EncodePassword(password)
+	if err != nil {
+		return nil, err
+	}
+	authcfg["password"] = encodedPassword
+	config[AuthenticationKey] = authcfg
+	return config, nil
+}
diff --git a/maestro/config/config_builder.go b/maestro/config/config_builder.go
index ea5cb79d9..76c921d4e 100644
--- a/maestro/config/config_builder.go
+++ b/maestro/config/config_builder.go
@@ -86,7 +86,7 @@ var k8sOtelCollector = `
             "containers": [
               {
                 "name": "otel-collector",
-                "image": "otel/opentelemetry-collector-contrib:0.75.0",
+                "image": "otel/opentelemetry-collector-contrib:0.91.0",
                 "ports": [
                   {
                     "containerPort": 13133,
@@ -296,7 +296,7 @@ var JsonDeployment = `
             "containers": [
               {
                 "name": "otel-collector",
-                "image": "otel/opentelemetry-collector-contrib:0.82.0",
+                "image": "otel/opentelemetry-collector-contrib:0.91.0",
                 "ports": [
                   {
                     "containerPort": 13133,
@@ -353,34 +353,36 @@ var JsonDeployment = `
     }
 `
 
-func GetDeploymentJson(kafkaUrl string, sink SinkData) (string, error) {
+func (c *configBuilder) BuildDeploymentConfig(deployment *DeploymentRequest) (string, error) {
 	// prepare manifest
-	manifest := strings.Replace(k8sOtelCollector, "SINK_ID", sink.SinkID, -1)
-	config, err := ReturnConfigYamlFromSink(context.Background(), kafkaUrl, sink)
+	manifest := strings.Replace(k8sOtelCollector, "SINK_ID", deployment.SinkID, -1)
+	ctx := context.WithValue(context.Background(), "sink_id", deployment.SinkID)
+	config, err := c.ReturnConfigYamlFromSink(ctx, c.kafkaUrl, deployment)
 	if err != nil {
-		return "", errors.Wrap(errors.New(fmt.Sprintf("failed to build YAML, sink: %s", sink.SinkID)), err)
+		return "", errors.Wrap(errors.New(fmt.Sprintf("failed to build YAML, sink: %s", deployment.SinkID)), err)
 	}
 	manifest = strings.Replace(manifest, "SINK_CONFIG", config, -1)
 	return manifest, nil
 }
 
 // ReturnConfigYamlFromSink this is the main method, which will generate the YAML file from the
-func ReturnConfigYamlFromSink(_ context.Context, kafkaUrlConfig string, sink SinkData) (string, error) {
-	authType := sink.Config.GetSubMetadata(AuthenticationKey)["type"]
+func (c *configBuilder) ReturnConfigYamlFromSink(_ context.Context, kafkaUrlConfig string, deployment *DeploymentRequest) (string, error) {
+	authType := deployment.Config.GetSubMetadata(AuthenticationKey)["type"]
 	authTypeStr, ok := authType.(string)
 	if !ok {
 		return "", errors.New("failed to create config invalid authentication type")
 	}
-	authBuilder := GetAuthService(authTypeStr)
+	// TODO move this into somewhere else
+	authBuilder := GetAuthService(authTypeStr, c.encryptionService)
 	if authBuilder == nil {
 		return "", errors.New("invalid authentication type")
 	}
-	exporterBuilder := FromStrategy(sink.Backend)
+	exporterBuilder := FromStrategy(deployment.Backend)
 	if exporterBuilder == nil {
 		return "", errors.New("invalid backend")
 	}
-	extensions, extensionName := authBuilder.GetExtensionsFromMetadata(sink.Config)
-	exporters, exporterName := exporterBuilder.GetExportersFromMetadata(sink.Config, extensionName)
+	extensions, extensionName := authBuilder.GetExtensionsFromMetadata(deployment.Config)
+	exporters, exporterName := exporterBuilder.GetExportersFromMetadata(deployment.Config, extensionName)
 	if exporterName == "" {
 		return "", errors.New("failed to build exporter")
 	}
@@ -412,7 +414,7 @@ func ReturnConfigYamlFromSink(_ context.Context, kafkaUrlConfig string, sink Sin
 		Receivers: Receivers{
 			Kafka: KafkaReceiver{
 				Brokers:         []string{kafkaUrlConfig},
-				Topic:           fmt.Sprintf("otlp_metrics-%s", sink.SinkID),
+				Topic:           fmt.Sprintf("otlp_metrics-%s", deployment.SinkID),
 				ProtocolVersion: "2.0.0",
 			},
 		},
diff --git a/maestro/config/config_builder_test.go b/maestro/config/config_builder_test.go
index 9e7cd2d04..8981220a6 100644
--- a/maestro/config/config_builder_test.go
+++ b/maestro/config/config_builder_test.go
@@ -3,16 +3,18 @@ package config
 import (
 	"context"
 	"fmt"
+	"github.com/orb-community/orb/maestro/password"
 	"github.com/orb-community/orb/pkg/types"
+	"go.uber.org/zap"
 	"testing"
-	"time"
 )
 
 func TestReturnConfigYamlFromSink(t *testing.T) {
 	type args struct {
 		in0            context.Context
 		kafkaUrlConfig string
-		sink           SinkData
+		sink           *DeploymentRequest
+		key            string
 	}
 	tests := []struct {
 		name    string
@@ -25,7 +27,7 @@ func TestReturnConfigYamlFromSink(t *testing.T) {
 			args: args{
 				in0:            context.Background(),
 				kafkaUrlConfig: "kafka:9092",
-				sink: SinkData{
+				sink: &DeploymentRequest{
 					SinkID:  "sink-id-11",
 					OwnerID: "11",
 					Backend: "prometheus",
@@ -39,9 +41,6 @@ func TestReturnConfigYamlFromSink(t *testing.T) {
 							"password": "dbpass",
 						},
 					},
-					State:           0,
-					Msg:             "",
-					LastRemoteWrite: time.Time{},
 				},
 			},
 			want:    `---\nreceivers:\n  kafka:\n    brokers:\n    - kafka:9092\n    topic: otlp_metrics-sink-id-11\n    protocol_version: 2.0.0\nextensions:\n  pprof:\n    endpoint: 0.0.0.0:1888\n  basicauth/exporter:\n    client_auth:\n      username: prom-user\n      password: dbpass\nexporters:\n  prometheusremotewrite:\n    endpoint: https://acme.com/prom/push\n    auth:\n      authenticator: basicauth/exporter\nservice:\n  extensions:\n  - pprof\n  - basicauth/exporter\n  pipelines:\n    metrics:\n      receivers:\n      - kafka\n      exporters:\n      - prometheusremotewrite\n`,
@@ -52,7 +51,7 @@ func TestReturnConfigYamlFromSink(t *testing.T) {
 			args: args{
 				in0:            context.Background(),
 				kafkaUrlConfig: "kafka:9092",
-				sink: SinkData{
+				sink: &DeploymentRequest{
 					SinkID:  "sink-id-11",
 					OwnerID: "11",
 					Backend: "prometheus",
@@ -69,9 +68,6 @@ func TestReturnConfigYamlFromSink(t *testing.T) {
 							"password": "dbpass",
 						},
 					},
-					State:           0,
-					Msg:             "",
-					LastRemoteWrite: time.Time{},
 				},
 			},
 			want:    `---\nreceivers:\n  kafka:\n    brokers:\n    - kafka:9092\n    topic: otlp_metrics-sink-id-11\n    protocol_version: 2.0.0\nextensions:\n  pprof:\n    endpoint: 0.0.0.0:1888\n  basicauth/exporter:\n    client_auth:\n      username: prom-user\n      password: dbpass\nexporters:\n  prometheusremotewrite:\n    endpoint: https://acme.com/prom/push\n    headers:\n      X-Scope-OrgID: TENANT_1\n    auth:\n      authenticator: basicauth/exporter\nservice:\n  extensions:\n  - pprof\n  - basicauth/exporter\n  pipelines:\n    metrics:\n      receivers:\n      - kafka\n      exporters:\n      - prometheusremotewrite\n`,
@@ -82,7 +78,7 @@ func TestReturnConfigYamlFromSink(t *testing.T) {
 			args: args{
 				in0:            context.Background(),
 				kafkaUrlConfig: "kafka:9092",
-				sink: SinkData{
+				sink: &DeploymentRequest{
 					SinkID:  "sink-id-22",
 					OwnerID: "22",
 					Backend: "otlphttp",
@@ -96,9 +92,6 @@ func TestReturnConfigYamlFromSink(t *testing.T) {
 							"password": "dbpass",
 						},
 					},
-					State:           0,
-					Msg:             "",
-					LastRemoteWrite: time.Time{},
 				},
 			},
 			want:    `---\nreceivers:\n  kafka:\n    brokers:\n    - kafka:9092\n    topic: otlp_metrics-sink-id-22\n    protocol_version: 2.0.0\nextensions:\n  pprof:\n    endpoint: 0.0.0.0:1888\n  basicauth/exporter:\n    client_auth:\n      username: otlp-user\n      password: dbpass\nexporters:\n  otlphttp:\n    endpoint: https://acme.com/otlphttp/push\n    auth:\n      authenticator: basicauth/exporter\nservice:\n  extensions:\n  - pprof\n  - basicauth/exporter\n  pipelines:\n    metrics:\n      receivers:\n      - kafka\n      exporters:\n      - otlphttp\n`,
@@ -106,8 +99,14 @@ func TestReturnConfigYamlFromSink(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
+		logger := zap.NewNop()
+		c := configBuilder{
+			logger:            logger,
+			kafkaUrl:          tt.args.kafkaUrlConfig,
+			encryptionService: password.NewEncryptionService(logger, tt.args.key),
+		}
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := ReturnConfigYamlFromSink(tt.args.in0, tt.args.kafkaUrlConfig, tt.args.sink)
+			got, err := c.ReturnConfigYamlFromSink(tt.args.in0, tt.args.kafkaUrlConfig, tt.args.sink)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("ReturnConfigYamlFromSink() error = %v, wantErr %v", err, tt.wantErr)
 				return
diff --git a/maestro/config/service.go b/maestro/config/service.go
new file mode 100644
index 000000000..52fceb2f8
--- /dev/null
+++ b/maestro/config/service.go
@@ -0,0 +1,31 @@
+package config
+
+import (
+	"github.com/orb-community/orb/maestro/password"
+	"github.com/orb-community/orb/pkg/types"
+	"go.uber.org/zap"
+)
+
+type ConfigBuilder interface {
+	BuildDeploymentConfig(deployment *DeploymentRequest) (string, error)
+}
+
+type DeploymentRequest struct {
+	OwnerID string
+	SinkID  string
+	Config  types.Metadata
+	Backend string
+	Status  string
+}
+
+type configBuilder struct {
+	logger            *zap.Logger
+	kafkaUrl          string
+	encryptionService password.EncryptionService
+}
+
+var _ ConfigBuilder = (*configBuilder)(nil)
+
+func NewConfigBuilder(logger *zap.Logger, kafkaUrl string, encryptionService password.EncryptionService) ConfigBuilder {
+	return &configBuilder{logger: logger, kafkaUrl: kafkaUrl, encryptionService: encryptionService}
+}
diff --git a/maestro/deployment/model.go b/maestro/deployment/model.go
new file mode 100644
index 000000000..15a0f7894
--- /dev/null
+++ b/maestro/deployment/model.go
@@ -0,0 +1,81 @@
+package deployment
+
+import (
+	"encoding/json"
+	"time"
+
+	"github.com/orb-community/orb/pkg/types"
+)
+
+type Deployment struct {
+	Id                      string     `db:"id" json:"id,omitempty"`
+	OwnerID                 string     `db:"owner_id" json:"ownerID,omitempty"`
+	SinkID                  string     `db:"sink_id" json:"sinkID,omitempty"`
+	Backend                 string     `db:"backend" json:"backend,omitempty"`
+	Config                  []byte     `db:"config" json:"config,omitempty"`
+	LastStatus              string     `db:"last_status" json:"lastStatus,omitempty"`
+	LastStatusUpdate        *time.Time `db:"last_status_update" json:"lastStatusUpdate"`
+	LastErrorMessage        string     `db:"last_error_message" json:"lastErrorMessage,omitempty"`
+	LastErrorTime           *time.Time `db:"last_error_time" json:"lastErrorTime"`
+	CollectorName           string     `db:"collector_name" json:"collectorName,omitempty"`
+	LastCollectorDeployTime *time.Time `db:"last_collector_deploy_time" json:"lastCollectorDeployTime"`
+	LastCollectorStopTime   *time.Time `db:"last_collector_stop_time" json:"lastCollectorStopTime"`
+}
+
+func NewDeployment(ownerID string, sinkID string, config types.Metadata, backend string) Deployment {
+	now := time.Now()
+	deploymentName := "otel-" + sinkID
+	configAsByte := toByte(config)
+	return Deployment{
+		OwnerID:          ownerID,
+		SinkID:           sinkID,
+		Backend:          backend,
+		Config:           configAsByte,
+		LastStatus:       "unknown",
+		LastStatusUpdate: &now,
+		CollectorName:    deploymentName,
+	}
+}
+
+func (d *Deployment) Merge(other Deployment) error {
+	if other.Id != "" {
+		d.Id = other.Id
+	}
+	if other.LastErrorMessage != d.LastErrorMessage {
+		d.LastErrorMessage = other.LastErrorMessage
+		d.LastErrorTime = other.LastErrorTime
+	}
+	if other.CollectorName != "" {
+		d.CollectorName = other.CollectorName
+		d.LastCollectorDeployTime = other.LastCollectorDeployTime
+		d.LastCollectorStopTime = other.LastCollectorStopTime
+	}
+	if other.LastStatus != d.LastStatus {
+		d.LastStatus = other.LastStatus
+		d.LastStatusUpdate = other.LastStatusUpdate
+	}
+	return nil
+}
+
+func (d *Deployment) GetConfig() types.Metadata {
+	var config types.Metadata
+	err := json.Unmarshal(d.Config, &config)
+	if err != nil {
+		return nil
+	}
+	return config
+}
+
+func (d *Deployment) SetConfig(config types.Metadata) error {
+	configAsByte := toByte(config)
+	d.Config = configAsByte
+	return nil
+}
+
+func toByte(config types.Metadata) []byte {
+	configAsByte, err := json.Marshal(config)
+	if err != nil {
+		return nil
+	}
+	return configAsByte
+}
diff --git a/maestro/deployment/repository.go b/maestro/deployment/repository.go
new file mode 100644
index 000000000..f3fc0fc48
--- /dev/null
+++ b/maestro/deployment/repository.go
@@ -0,0 +1,200 @@
+package deployment
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/jmoiron/sqlx"
+	_ "github.com/lib/pq" // required for SQL access
+	maestroerrors "github.com/orb-community/orb/maestro/errors"
+	"github.com/orb-community/orb/pkg/errors"
+	"go.uber.org/zap"
+)
+
+type Repository interface {
+	FetchAll(ctx context.Context) ([]Deployment, error)
+	Add(ctx context.Context, deployment *Deployment) (*Deployment, error)
+	Update(ctx context.Context, deployment *Deployment) (*Deployment, error)
+	UpdateStatus(ctx context.Context, ownerID string, sinkId string, status string, errorMessage string) error
+	Remove(ctx context.Context, ownerId string, sinkId string) error
+	FindByOwnerAndSink(ctx context.Context, ownerId string, sinkId string) (*Deployment, error)
+	FindByCollectorName(ctx context.Context, collectorName string) (*Deployment, error)
+}
+
+var _ Repository = (*repositoryService)(nil)
+
+func NewRepositoryService(db *sqlx.DB, logger *zap.Logger) Repository {
+	namedLogger := logger.Named("deployment-repository")
+	return &repositoryService{db: db, logger: namedLogger}
+}
+
+type repositoryService struct {
+	logger *zap.Logger
+	db     *sqlx.DB
+}
+
+func (r *repositoryService) FetchAll(ctx context.Context) ([]Deployment, error) {
+	tx := r.db.MustBeginTx(ctx, nil)
+	var deployments []Deployment
+	query := `
+	SELECT id,
+		   owner_id,
+		   sink_id,
+		   backend,
+		   config,
+		   last_status,
+		   last_status_update,
+		   last_error_message,
+		   last_error_time,
+		   collector_name,
+		   last_collector_deploy_time,
+		   last_collector_stop_time
+	FROM deployments`
+	err := tx.SelectContext(ctx, &deployments, query, nil)
+	if err != nil {
+		_ = tx.Rollback()
+		return nil, err
+	}
+	err = tx.Commit()
+	if err != nil {
+		_ = tx.Rollback()
+		return nil, err
+	}
+	r.logger.Debug("fetched all deployments", zap.Int("count", len(deployments)))
+	return deployments, nil
+}
+
+func (r *repositoryService) Add(ctx context.Context, deployment *Deployment) (*Deployment, error) {
+	tx := r.db.MustBeginTx(ctx, nil)
+	_, err := tx.NamedExecContext(ctx,
+		`INSERT INTO deployments (owner_id, sink_id, backend, config, last_status, last_status_update, last_error_message, 
+				last_error_time, collector_name, last_collector_deploy_time, last_collector_stop_time) 
+				VALUES (:owner_id, :sink_id, :backend, :config, :last_status, :last_status_update, :last_error_message, 
+				        :last_error_time, :collector_name, :last_collector_deploy_time, :last_collector_stop_time)`,
+		deployment)
+	if err != nil {
+		_ = tx.Rollback()
+		return nil, err
+	}
+
+	r.logger.Debug("added deployment", zap.String("owner-id", deployment.OwnerID), zap.String("sink-id", deployment.SinkID))
+	err = tx.Commit()
+	if err != nil {
+		return nil, err
+	}
+	got, err := r.FindByOwnerAndSink(ctx, deployment.OwnerID, deployment.SinkID)
+	if err != nil {
+		return nil, err
+	}
+	deployment.Id = got.Id
+	return deployment, nil
+}
+
+func (r *repositoryService) Update(ctx context.Context, deployment *Deployment) (*Deployment, error) {
+	tx := r.db.MustBeginTx(ctx, nil)
+	_, err := tx.NamedExecContext(ctx,
+		`UPDATE deployments 
+				SET 
+                       owner_id = :owner_id,
+                       sink_id = :sink_id,
+                       backend = :backend,
+                       config = :config,
+                       last_status = :last_status, 
+                       last_status_update = :last_status_update, 
+                       last_error_message = :last_error_message,
+					   last_error_time = :last_error_time, 
+					   collector_name = :collector_name, 
+					   last_collector_deploy_time = :last_collector_deploy_time, 
+					   last_collector_stop_time = :last_collector_stop_time 
+				WHERE id = :id`,
+		deployment)
+	if err != nil {
+		_ = tx.Rollback()
+		return nil, err
+	}
+	r.logger.Info("update deployment", zap.String("owner-id", deployment.OwnerID), zap.String("sink-id", deployment.SinkID))
+	return deployment, tx.Commit()
+}
+
+func (r *repositoryService) UpdateStatus(ctx context.Context, ownerID string, sinkId string, status string, errorMessage string) error {
+	tx := r.db.MustBeginTx(ctx, nil)
+	now := time.Now()
+	fields := map[string]interface{}{
+		"last_status":        status,
+		"last_status_update": now,
+		"last_error_message": errorMessage,
+		"last_error_time":    now,
+		"owner_id":           ownerID,
+		"sink_id":            sinkId,
+	}
+	_, err := tx.ExecContext(ctx,
+		`UPDATE deployments 
+				SET 
+					   last_status = :last_status, 
+					   last_status_update = :last_status_update, 
+					   last_error_message = :last_error_message,
+					   last_error_time = :last_error_time
+				WHERE owner_id = :owner_id AND sink_id = :sink_id`,
+		fields)
+	if err != nil {
+		_ = tx.Rollback()
+		return err
+	}
+	r.logger.Debug("update deployment", zap.String("owner-id", ownerID), zap.String("sink-id", sinkId))
+	return tx.Commit()
+}
+
+func (r *repositoryService) Remove(ctx context.Context, ownerId string, sinkId string) error {
+	tx := r.db.MustBeginTx(ctx, nil)
+	tx.MustExecContext(ctx, "DELETE FROM deployments WHERE owner_id = $1 AND sink_id = $2", ownerId, sinkId)
+	err := tx.Commit()
+	if err != nil {
+		_ = tx.Rollback()
+		return err
+	}
+	return nil
+}
+
+func (r *repositoryService) FindByOwnerAndSink(ctx context.Context, ownerId string, sinkId string) (*Deployment, error) {
+	tx := r.db.MustBeginTx(ctx, nil)
+	var rows []Deployment
+	query := `SELECT * FROM deployments WHERE owner_id = $1 AND sink_id = $2`
+	err := tx.SelectContext(ctx, &rows, query, ownerId, sinkId)
+	if err != nil {
+		_ = tx.Rollback()
+		return nil, err
+	}
+	err = tx.Commit()
+	if err != nil {
+		return nil, err
+	}
+	if len(rows) == 0 {
+		return nil, maestroerrors.NotFound
+	}
+	deployment := &rows[0]
+
+	return deployment, nil
+}
+
+func (r *repositoryService) FindByCollectorName(ctx context.Context, collectorName string) (*Deployment, error) {
+	tx := r.db.MustBeginTx(ctx, nil)
+	var rows []Deployment
+	err := tx.SelectContext(ctx, &rows, "SELECT * FROM deployments WHERE collector_name = :collector_name",
+		map[string]interface{}{"collector_name": collectorName})
+	if err != nil {
+		_ = tx.Rollback()
+		return nil, err
+	}
+	err = tx.Commit()
+	if err != nil {
+		_ = tx.Rollback()
+		return nil, err
+	}
+	if len(rows) == 0 {
+		return nil, errors.New(fmt.Sprintf("not found deployment for collector name: %s", collectorName))
+	}
+	deployment := &rows[0]
+
+	return deployment, nil
+}
diff --git a/maestro/deployment/repository_test.go b/maestro/deployment/repository_test.go
new file mode 100644
index 000000000..c4c8366d7
--- /dev/null
+++ b/maestro/deployment/repository_test.go
@@ -0,0 +1,217 @@
+package deployment
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	maestroerrors "github.com/orb-community/orb/maestro/errors"
+	"github.com/stretchr/testify/require"
+	"go.uber.org/zap"
+	"testing"
+	"time"
+)
+
+func Test_repositoryService_FindByOwnerAndSink(t *testing.T) {
+	now := time.Now()
+	deployCreate := &Deployment{
+		OwnerID: "owner-1",
+		SinkID:  "sink-1",
+		Backend: "prometheus",
+		Config: []byte(`{
+			"authentication": {
+				"username": "user",
+				"password": "pass"
+			},
+			"exporter" : {
+				"remote_host": "http://localhost:9090"
+			}
+		}`),
+		LastStatus:              "pending",
+		LastStatusUpdate:        &now,
+		LastErrorMessage:        "",
+		LastErrorTime:           &now,
+		CollectorName:           "",
+		LastCollectorDeployTime: &now,
+		LastCollectorStopTime:   &now,
+	}
+	type args struct {
+		ownerId string
+		sinkId  string
+	}
+	tests := []struct {
+		name    string
+		args    args
+		want    *Deployment
+		wantErr error
+	}{
+		{
+			name: "FindByOwnerAndSink_success",
+			args: args{
+				ownerId: "owner-1",
+				sinkId:  "sink-1",
+			},
+			want:    deployCreate,
+			wantErr: nil,
+		},
+		{
+			name: "FindByOwnerAndSink_notFound",
+			args: args{
+				ownerId: "owner-2",
+				sinkId:  "sink-12",
+			},
+			want:    deployCreate,
+			wantErr: maestroerrors.NotFound,
+		},
+	}
+
+	r := &repositoryService{
+		logger: zap.NewNop(),
+		db:     pg,
+	}
+	_, err := r.Add(context.Background(), deployCreate)
+	if err != nil {
+		t.Fatalf("error adding deployment: %v", err)
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ctx := context.WithValue(context.Background(), "test", tt.name)
+			got, err := r.FindByOwnerAndSink(ctx, tt.args.ownerId, tt.args.sinkId)
+			if tt.wantErr != nil && !errors.Is(err, tt.wantErr) {
+				t.Errorf("FindByOwnerAndSink() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if tt.wantErr == nil {
+				require.Equal(t, tt.want.SinkID, got.SinkID)
+				require.Equal(t, tt.want.OwnerID, got.OwnerID)
+				require.Equal(t, tt.want.Backend, got.Backend)
+				var gotInterface map[string]interface{}
+				err = json.Unmarshal(got.Config, &gotInterface)
+				require.NoError(t, err)
+				var wantInterface map[string]interface{}
+				err = json.Unmarshal(tt.want.Config, &wantInterface)
+				require.NoError(t, err)
+				require.Equal(t, wantInterface, gotInterface)
+			}
+		})
+	}
+}
+
+func Test_repositoryService_AddUpdateRemove(t *testing.T) {
+	now := time.Now()
+	type args struct {
+		create *Deployment
+		update *Deployment
+	}
+	tests := []struct {
+		name    string
+		args    args
+		want    *Deployment
+		wantErr bool
+	}{
+		{
+			name: "update_success",
+			args: args{
+				create: &Deployment{
+					OwnerID: "owner-10",
+					SinkID:  "sink-10",
+					Backend: "prometheus",
+					Config: []byte(`{
+			"authentication": {
+				"username": "user",
+				"password": "pass"
+			},
+			"exporter" : {
+				"remote_host": "http://localhost:9090"
+			}
+		}`),
+					LastStatus:              "pending",
+					LastStatusUpdate:        &now,
+					LastErrorMessage:        "",
+					LastErrorTime:           &now,
+					CollectorName:           "",
+					LastCollectorDeployTime: &now,
+					LastCollectorStopTime:   &now,
+				},
+				update: &Deployment{
+					OwnerID: "owner-10",
+					SinkID:  "sink-10",
+					Backend: "prometheus",
+					Config: []byte(`{
+			"authentication": {
+				"username": "user2",
+				"password": "pass2"
+			},
+			"exporter" : {
+				"remote_host": "http://localhost:9090"
+			}
+		}`),
+					LastStatus:              "pending",
+					LastStatusUpdate:        &now,
+					LastErrorMessage:        "",
+					LastErrorTime:           &now,
+					CollectorName:           "",
+					LastCollectorDeployTime: &now,
+					LastCollectorStopTime:   &now,
+				},
+			},
+			want: &Deployment{
+				OwnerID: "owner-10",
+				SinkID:  "sink-10",
+				Backend: "prometheus",
+				Config: []byte(`{
+			"authentication": {
+				"username": "user2",
+				"password": "pass2"
+			},
+			"exporter" : {
+				"remote_host": "http://localhost:9090"
+			}
+		}`),
+				LastStatus:              "pending",
+				LastStatusUpdate:        &now,
+				LastErrorMessage:        "",
+				LastErrorTime:           &now,
+				CollectorName:           "",
+				LastCollectorDeployTime: &now,
+				LastCollectorStopTime:   &now,
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ctx := context.WithValue(context.Background(), "test", tt.name)
+			r := &repositoryService{
+				logger: logger,
+				db:     pg,
+			}
+			got, err := r.Add(ctx, tt.args.create)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("Add() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			require.NotEmptyf(t, got.Id, "id should not be empty")
+			var gotInterface map[string]interface{}
+			var wantInterface map[string]interface{}
+
+			tt.args.update.Id = got.Id
+
+			got, err = r.Update(ctx, tt.args.update)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("Add() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			require.Equal(t, tt.want.SinkID, got.SinkID)
+			require.Equal(t, tt.want.OwnerID, got.OwnerID)
+			require.Equal(t, tt.want.Backend, got.Backend)
+			err = json.Unmarshal(got.Config, &gotInterface)
+			require.NoError(t, err)
+			err = json.Unmarshal(tt.want.Config, &wantInterface)
+			require.NoError(t, err)
+			require.Equal(t, wantInterface, gotInterface)
+
+			if err := r.Remove(ctx, tt.want.OwnerID, tt.want.SinkID); (err != nil) != tt.wantErr {
+				t.Errorf("UpdateStatus() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}
diff --git a/maestro/deployment/service.go b/maestro/deployment/service.go
new file mode 100644
index 000000000..f188d1166
--- /dev/null
+++ b/maestro/deployment/service.go
@@ -0,0 +1,283 @@
+package deployment
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"time"
+
+	"github.com/orb-community/orb/maestro/config"
+	"github.com/orb-community/orb/maestro/kubecontrol"
+	"github.com/orb-community/orb/maestro/password"
+	"github.com/orb-community/orb/maestro/redis/producer"
+	"github.com/orb-community/orb/pkg/types"
+	"go.uber.org/zap"
+)
+
+const AuthenticationKey = "authentication"
+
+type Service interface {
+	// CreateDeployment to be used to create the deployment when there is a sink.create
+	CreateDeployment(ctx context.Context, deployment *Deployment) error
+	// GetDeployment to be used to get the deployment information for creating the collector or monitoring the collector
+	GetDeployment(ctx context.Context, ownerID string, sinkId string) (*Deployment, string, error)
+	// UpdateDeployment to be used to update the deployment when there is a sink.update
+	UpdateDeployment(ctx context.Context, deployment *Deployment) error
+	// UpdateStatus to be used to update the status of the sink, when there is an error or when the sink is running
+	UpdateStatus(ctx context.Context, ownerID string, sinkId string, status string, errorMessage string) error
+	// RemoveDeployment to be used to remove the deployment when there is a sink.delete
+	RemoveDeployment(ctx context.Context, ownerID string, sinkId string) error
+	// GetDeploymentByCollectorName to be used to get the deployment information for creating the collector or monitoring the collector
+	GetDeploymentByCollectorName(ctx context.Context, collectorName string) (*Deployment, error)
+	// NotifyCollector add collector information to deployment
+	NotifyCollector(ctx context.Context, ownerID string, sinkId string, operation string, status string, errorMessage string) (string, error)
+}
+
+type deploymentService struct {
+	dbRepository      Repository
+	logger            *zap.Logger
+	kafkaUrl          string
+	maestroProducer   producer.Producer
+	kubecontrol       kubecontrol.Service
+	configBuilder     config.ConfigBuilder
+	encryptionService password.EncryptionService
+}
+
+var _ Service = (*deploymentService)(nil)
+
+func NewDeploymentService(logger *zap.Logger, repository Repository, kafkaUrl string, encryptionKey string,
+	maestroProducer producer.Producer, kubecontrol kubecontrol.Service) Service {
+	namedLogger := logger.Named("deployment-service")
+	es := password.NewEncryptionService(logger, encryptionKey)
+	cb := config.NewConfigBuilder(namedLogger, kafkaUrl, es)
+	return &deploymentService{logger: namedLogger,
+		dbRepository:      repository,
+		configBuilder:     cb,
+		encryptionService: es,
+		maestroProducer:   maestroProducer,
+		kubecontrol:       kubecontrol,
+	}
+}
+
+func (d *deploymentService) CreateDeployment(ctx context.Context, deployment *Deployment) error {
+	if deployment == nil {
+		return errors.New("deployment is nil")
+	}
+	codedConfig, err := d.encodeConfig(deployment)
+	if err != nil {
+		return err
+	}
+	err = deployment.SetConfig(codedConfig)
+	if err != nil {
+		return err
+	}
+	// store with config encrypted
+	added, err := d.dbRepository.Add(ctx, deployment)
+	if err != nil {
+		return err
+	}
+	d.logger.Info("added deployment", zap.String("id", added.Id),
+		zap.String("ownerID", added.OwnerID), zap.String("sinkID", added.SinkID))
+	err = d.maestroProducer.PublishSinkStatus(ctx, added.OwnerID, added.SinkID, "unknown", "")
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (d *deploymentService) getAuthBuilder(authType string) config.AuthBuilderService {
+	return config.GetAuthService(authType, d.encryptionService)
+}
+
+func (d *deploymentService) encodeConfig(deployment *Deployment) (types.Metadata, error) {
+	authType := deployment.GetConfig()
+	if authType == nil {
+		return nil, errors.New("deployment do not have authentication information")
+	}
+	value := authType.GetSubMetadata(AuthenticationKey)["type"].(string)
+	authBuilder := d.getAuthBuilder(value)
+	if authBuilder == nil {
+		return nil, errors.New("deployment do not have authentication information")
+	}
+	return authBuilder.EncodeAuth(deployment.GetConfig())
+}
+
+func (d *deploymentService) GetDeployment(ctx context.Context, ownerID string, sinkId string) (*Deployment, string, error) {
+	deployment, err := d.dbRepository.FindByOwnerAndSink(ctx, ownerID, sinkId)
+	if err != nil {
+		return nil, "", err
+	}
+	authType := deployment.GetConfig()
+	if authType == nil {
+		return nil, "", errors.New("deployment do not have authentication information")
+	}
+	value := authType.GetSubMetadata(AuthenticationKey)["type"].(string)
+	authBuilder := d.getAuthBuilder(value)
+	decodedDeployment, err := authBuilder.DecodeAuth(deployment.GetConfig())
+	if err != nil {
+		return nil, "", err
+	}
+	err = deployment.SetConfig(decodedDeployment)
+	if err != nil {
+		return nil, "", err
+	}
+	deployReq := &config.DeploymentRequest{
+		OwnerID: ownerID,
+		SinkID:  sinkId,
+		Config:  deployment.GetConfig(),
+		Backend: deployment.Backend,
+		Status:  deployment.LastStatus,
+	}
+	manifest, err := d.configBuilder.BuildDeploymentConfig(deployReq)
+	if err != nil {
+		return nil, "", err
+	}
+	return deployment, manifest, nil
+}
+
+// UpdateDeployment will stop the running collector if any, and change the deployment, it will not spin the collector back up,
+// it will wait for the next sink.activity
+func (d *deploymentService) UpdateDeployment(ctx context.Context, deployment *Deployment) error {
+	now := time.Now()
+	got, _, err := d.GetDeployment(ctx, deployment.OwnerID, deployment.SinkID)
+	if err != nil {
+		return errors.New("could not find deployment to update")
+	}
+	// Spin down the collector if it is running
+	err = d.kubecontrol.KillOtelCollector(ctx, got.CollectorName, got.SinkID)
+	if err != nil {
+		d.logger.Warn("could not stop running collector, will try to update anyway", zap.Error(err))
+	}
+	err = got.Merge(*deployment)
+	if err != nil {
+		d.logger.Error("error during merge of deployments", zap.Error(err))
+		return err
+	}
+	got.LastCollectorStopTime = &now
+	codedConfig, err := d.encodeConfig(deployment)
+	if err != nil {
+		return err
+	}
+	err = got.SetConfig(codedConfig)
+	if err != nil {
+		return err
+	}
+	updated, err := d.dbRepository.Update(ctx, got)
+	if err != nil {
+		return err
+	}
+	err = d.maestroProducer.PublishSinkStatus(ctx, updated.OwnerID, updated.SinkID, "unknown", "")
+	if err != nil {
+		return err
+	}
+	d.logger.Info("updated deployment", zap.String("ownerID", updated.OwnerID),
+		zap.String("sinkID", updated.SinkID))
+	return nil
+}
+
+func (d *deploymentService) NotifyCollector(ctx context.Context, ownerID string, sinkId string, operation string,
+	status string, errorMessage string) (string, error) {
+	got, manifest, err := d.GetDeployment(ctx, ownerID, sinkId)
+	if err != nil {
+		return "", errors.New("could not find deployment to update")
+	}
+	now := time.Now()
+	if operation == "delete" {
+		got.LastCollectorStopTime = &now
+		err = d.kubecontrol.KillOtelCollector(ctx, got.CollectorName, got.SinkID)
+		if err != nil {
+			d.logger.Warn("could not stop running collector, will try to update anyway", zap.Error(err))
+		}
+	} else if operation == "deploy" {
+		// Spin up the collector
+		if got.LastCollectorDeployTime == nil || got.LastCollectorDeployTime.Before(now) {
+			if got.LastCollectorStopTime == nil || got.LastCollectorStopTime.Before(now) {
+				d.logger.Debug("collector is not running deploying")
+				got.CollectorName, err = d.kubecontrol.CreateOtelCollector(ctx, got.OwnerID, got.SinkID, manifest)
+				got.LastCollectorDeployTime = &now
+			} else {
+				d.logger.Info("collector is already running")
+			}
+		}
+
+	}
+	if status != "" {
+		got.LastStatus = status
+		got.LastStatusUpdate = &now
+	}
+	if errorMessage != "" {
+		got.LastErrorMessage = errorMessage
+		got.LastErrorTime = &now
+	}
+	codedConfig, err := d.encodeConfig(got)
+	if err != nil {
+		return "", err
+	}
+	err = got.SetConfig(codedConfig)
+	if err != nil {
+		return "", err
+	}
+	updated, err := d.dbRepository.Update(ctx, got)
+	if err != nil {
+		return "", err
+	}
+	d.logger.Info("updated deployment information for collector and status or error",
+		zap.String("ownerID", updated.OwnerID), zap.String("sinkID", updated.SinkID),
+		zap.String("collectorName", updated.CollectorName),
+		zap.String("status", updated.LastStatus), zap.String("errorMessage", updated.LastErrorMessage))
+	return updated.CollectorName, nil
+}
+
+// UpdateStatus this will change the status in postgres and notify sinks service to show new status to user
+func (d *deploymentService) UpdateStatus(ctx context.Context, ownerID string, sinkId string, status string, errorMessage string) error {
+	got, _, err := d.GetDeployment(ctx, ownerID, sinkId)
+	if err != nil {
+		return fmt.Errorf("could not find deployment to update status: %w", err)
+	}
+	now := time.Now()
+	if status != "" {
+		got.LastStatus = status
+		got.LastStatusUpdate = &now
+		got.LastErrorMessage = errorMessage
+		got.LastErrorTime = &now
+	}
+
+	codedConfig, err := d.encodeConfig(got)
+	if err != nil {
+		return err
+	}
+	err = got.SetConfig(codedConfig)
+	if err != nil {
+		return err
+	}
+	updated, err := d.dbRepository.Update(ctx, got)
+	if err != nil {
+		return err
+	}
+	d.logger.Info("updated deployment status",
+		zap.String("ownerID", updated.OwnerID), zap.String("sinkID", updated.SinkID),
+		zap.String("status", updated.LastStatus), zap.String("errorMessage", updated.LastErrorMessage))
+	err = d.maestroProducer.PublishSinkStatus(ctx, updated.OwnerID, updated.SinkID, updated.LastStatus, errorMessage)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// RemoveDeployment this will remove the deployment from postgres and redis
+func (d *deploymentService) RemoveDeployment(ctx context.Context, ownerID string, sinkId string) error {
+	err := d.dbRepository.Remove(ctx, ownerID, sinkId)
+	if err != nil {
+		return err
+	}
+	d.logger.Info("removed deployment", zap.String("ownerID", ownerID), zap.String("sinkID", sinkId))
+	return nil
+}
+
+func (d *deploymentService) GetDeploymentByCollectorName(ctx context.Context, collectorName string) (*Deployment, error) {
+	deployment, err := d.dbRepository.FindByCollectorName(ctx, collectorName)
+	if err != nil {
+		return nil, err
+	}
+	return deployment, nil
+}
diff --git a/maestro/deployment/setup_test.go b/maestro/deployment/setup_test.go
new file mode 100644
index 000000000..905b277c7
--- /dev/null
+++ b/maestro/deployment/setup_test.go
@@ -0,0 +1,70 @@
+package deployment
+
+import (
+	"github.com/jmoiron/sqlx"
+	"github.com/orb-community/orb/maestro/postgres"
+	"github.com/orb-community/orb/pkg/config"
+	"github.com/ory/dockertest/v3"
+	"github.com/ory/dockertest/v3/docker"
+	"go.uber.org/zap"
+	"os"
+	"testing"
+)
+
+var logger *zap.Logger
+var pg *sqlx.DB
+
+func TestMain(m *testing.M) {
+	logger, _ = zap.NewProduction()
+	pool, err := dockertest.NewPool("")
+	if err != nil {
+		logger.Fatal("could not connect to docker:", zap.Error(err))
+	}
+
+	// Pull the PostgreSQL Docker image
+	postgresImage := "postgres:latest"
+	err = pool.Client.PullImage(docker.PullImageOptions{
+		Repository: postgresImage,
+		Tag:        "latest",
+	}, docker.AuthConfiguration{})
+	if err != nil {
+		logger.Fatal("Could not pull Docker image:", zap.Error(err))
+	}
+
+	// Create a PostgreSQL container
+	resource, err := pool.Run("postgres", "latest", []string{
+		"POSTGRES_USER=postgres",
+		"POSTGRES_PASSWORD=secret",
+		"POSTGRES_DB=testdb",
+	})
+	if err != nil {
+		logger.Fatal("Could not start PostgreSQL container", zap.Error(err))
+	}
+
+	retryF := func() error {
+		localTest := config.PostgresConfig{
+			Host:    "localhost",
+			Port:    resource.GetPort("5432/tcp"),
+			User:    "postgres",
+			Pass:    "secret",
+			DB:      "testdb",
+			SSLMode: "disable",
+		}
+		pg, err = postgres.Connect(localTest)
+		if err != nil {
+			return err
+		}
+
+		return pg.Ping()
+	}
+	if err := pool.Retry(retryF); err != nil {
+		logger.Fatal("could not connect to docker: %s", zap.Error(err))
+	}
+	code := m.Run()
+
+	if err := pool.Purge(resource); err != nil {
+		logger.Fatal("could not purge container: %s", zap.Error(err))
+	}
+
+	os.Exit(code)
+}
diff --git a/maestro/errors/maestro_errors.go b/maestro/errors/maestro_errors.go
new file mode 100644
index 000000000..017e7f303
--- /dev/null
+++ b/maestro/errors/maestro_errors.go
@@ -0,0 +1,5 @@
+package errors
+
+import "github.com/orb-community/orb/pkg/errors"
+
+var NotFound = errors.New("not found")
diff --git a/maestro/kubecontrol/config_parse.go b/maestro/kubecontrol/config_parse.go
deleted file mode 100644
index 352f1d77e..000000000
--- a/maestro/kubecontrol/config_parse.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package kubecontrol
-
-// TODO Might need this in the future, keeping it for now
-//import (
-//	"fmt"
-//	k8scorev1 "k8s.io/api/core/v1"
-//	"k8s.io/apimachinery/pkg/api/resource"
-//	k8sv1acapps "k8s.io/client-go/applyconfigurations/apps/v1"
-//	k8sv1accore "k8s.io/client-go/applyconfigurations/core/v1"
-//	k8sv1acmeta "k8s.io/client-go/applyconfigurations/meta/v1"
-//)
-//
-//func CreateDeploymentApplyConfig(otelConfigYaml, sinkID string) (k8sacv1apps.DeploymentApplyConfiguration, error) {
-//	_ := buildConfigMapEntry(otelConfigYaml, sinkID)
-//	deployment := buildDeployment(sinkID)
-//
-//	return deployment, nil
-//}
-//
-//func buildDeployment(sinkID string) k8sacv1apps.DeploymentApplyConfiguration {
-//	deploymentMetaName := fmt.Sprintf("otel-%s", sinkID)
-//	configMapNameMeta := fmt.Sprintf("otel-collector-config-%s", sinkID)
-//	deploymentMetaLabelComponent := fmt.Sprintf("otel-collector-%s", sinkID)
-//	labels := map[string]string{
-//		"app":       "opentelemetry",
-//		"component": deploymentMetaLabelComponent,
-//	}
-//	deployment := k8sacv1apps.DeploymentApplyConfiguration{
-//		ObjectMetaApplyConfiguration: &k8sacv1meta.ObjectMetaApplyConfiguration{
-//			Name:              &deploymentMetaName,
-//			CreationTimestamp: nil,
-//			Labels:            labels,
-//		},
-//	}
-//	deploymentSpec := k8sacv1apps.DeploymentSpec()
-//	deploymentSpec.WithReplicas(1)
-//	selector := k8sacv1meta.LabelSelector()
-//	selector.WithMatchLabels(labels)
-//	deploymentSpec.WithSelector(selector)
-//	templateSpec := k8sacv1core.PodTemplateSpecApplyConfiguration{
-//		ObjectMetaApplyConfiguration: getMetadata(deploymentMetaLabelComponent),
-//	}
-//	templateSpec.WithLabels(labels)
-//	podSpec := k8sacv1core.PodSpec()
-//	logVolume := k8sacv1core.Volume()
-//	logVolume.WithName("varlog")
-//	logVolume.WithHostPath(k8sacv1core.HostPathVolumeSource().WithPath("/var/log").WithType(""))
-//	containersVolume := k8sacv1core.Volume()
-//	containersVolume.WithName("varlibdockercontainers")
-//	containersVolume.WithHostPath(k8sacv1core.HostPathVolumeSource().WithPath("/var/lib/docker/containers").WithType(""))
-//	configVolume := k8sacv1core.Volume()
-//	configVolume.WithName("data").WithConfigMap(k8sacv1core.ConfigMapVolumeSource().WithName(configMapNameMeta).WithDefaultMode(420))
-//	podSpec.WithVolumes(logVolume, containersVolume, configVolume)
-//	templateSpec.WithSpec(podSpec)
-//	containerPodSpec := k8sacv1core.Container()
-//	containerPodSpec.WithName("otel-collector").WithImage("otel/opentelemetry-collector-contrib:0.75.0")
-//	heathCheckPort := k8sacv1core.ContainerPort().WithContainerPort(13133).WithProtocol(k8scorev1.ProtocolTCP)
-//	pprofPort := k8sacv1core.ContainerPort().WithContainerPort(8888).WithProtocol(k8scorev1.ProtocolTCP)
-//	containerPodSpec.WithPorts(heathCheckPort, pprofPort)
-//
-//	cpuQuantity := resource.NewQuantity(100, "m")
-//	memQuantity := resource.NewQuantity(200, "Mi")
-//	resourceReqs := k8sacv1core.ResourceRequirements().WithLimits(map[k8scorev1.ResourceName]resource.Quantity{
-//		k8scorev1.ResourceCPU:    *cpuQuantity,
-//		k8scorev1.ResourceMemory: *memQuantity,
-//	}).WithRequests(map[k8scorev1.ResourceName]resource.Quantity{
-//		k8scorev1.ResourceCPU:    *cpuQuantity,
-//		k8scorev1.ResourceMemory: *memQuantity,
-//	})
-//	containerPodSpec.WithResources(resourceReqs)
-//	logVolumeMount := k8sacv1core.VolumeMount()
-//	logVolumeMount.WithName("varlog")
-//	containerPodSpec.WithVolumeMounts(k8sacv1core.VolumeMount().)
-//	podSpec.WithContainers()
-//	deploymentSpec.WithTemplate(&templateSpec)
-//	deployment.WithAPIVersion("k8sacv1core")
-//	deployment.WithKind("Deployment")
-//	deployment.WithSpec()
-//	return deployment
-//}
-//
-//func buildConfigMapEntry(otelConfigYaml string, sinkID string) *k8sacv1core.ConfigMapApplyConfiguration {
-//	configMapNameMeta := fmt.Sprintf("otel-collector-config-%s", sinkID)
-//	configMapDataEntries := make(map[string]string)
-//	configMapDataEntries["config.yaml"] = otelConfigYaml
-//	metaApplyConfiguration := getMetadata(configMapNameMeta)
-//	configMap := k8sacv1core.ConfigMapApplyConfiguration{
-//		ObjectMetaApplyConfiguration: metaApplyConfiguration,
-//	}
-//	configMap.WithKind("ConfigMap")
-//	configMap.WithAPIVersion("k8sacv1core")
-//	configMap.WithData(configMapDataEntries)
-//	return &configMap
-//}
-//
-//func getMetadata(metadaName string) *k8sacv1meta.ObjectMetaApplyConfiguration {
-//	metaApplyConfiguration := &k8sacv1meta.ObjectMetaApplyConfiguration{
-//		Name:              &metadaName,
-//		CreationTimestamp: nil,
-//	}
-//	return metaApplyConfiguration
-//}
diff --git a/maestro/kubecontrol/kubecontrol.go b/maestro/kubecontrol/kubecontrol.go
index edf83ab7c..0aa7004ad 100644
--- a/maestro/kubecontrol/kubecontrol.go
+++ b/maestro/kubecontrol/kubecontrol.go
@@ -4,6 +4,10 @@ import (
 	"bufio"
 	"context"
 	"fmt"
+	"os"
+	"os/exec"
+	"strings"
+
 	_ "github.com/orb-community/orb/maestro/config"
 	"github.com/orb-community/orb/pkg/errors"
 	"go.uber.org/zap"
@@ -11,10 +15,6 @@ import (
 	k8smetav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
-	"os"
-	"os/exec"
-	"strings"
-	"time"
 )
 
 const namespace = "otelcollectors"
@@ -26,6 +26,22 @@ type deployService struct {
 	clientSet *kubernetes.Clientset
 }
 
+const OperationDeploy CollectorOperation = iota
+const OperationDelete = 1
+
+type CollectorOperation int
+
+func (o CollectorOperation) Name() string {
+	switch o {
+	case OperationDeploy:
+		return "deploy"
+	case OperationDelete:
+		return "delete"
+	default:
+		return "unknown"
+	}
+}
+
 func NewService(logger *zap.Logger) Service {
 	clusterConfig, err := rest.InClusterConfig()
 	if err != nil {
@@ -42,19 +58,13 @@ func NewService(logger *zap.Logger) Service {
 
 type Service interface {
 	// CreateOtelCollector - create an existing collector by id
-	CreateOtelCollector(ctx context.Context, ownerID, sinkID, deploymentEntry string) error
-
-	// DeleteOtelCollector - delete an existing collector by id
-	DeleteOtelCollector(ctx context.Context, ownerID, sinkID, deploymentEntry string) error
-
-	// UpdateOtelCollector - update an existing collector by id
-	UpdateOtelCollector(ctx context.Context, ownerID, sinkID, deploymentEntry string) error
+	CreateOtelCollector(ctx context.Context, ownerID, sinkID, deploymentEntry string) (string, error)
 
 	// KillOtelCollector - kill an existing collector by id, terminating by the ownerID, sinkID without the file
-	KillOtelCollector(ctx context.Context, ownerID, sinkID string) error
+	KillOtelCollector(ctx context.Context, deploymentName, sinkID string) error
 }
 
-func (svc *deployService) collectorDeploy(ctx context.Context, operation, ownerID, sinkId, manifest string) error {
+func (svc *deployService) collectorDeploy(ctx context.Context, operation, ownerID, sinkId, manifest string) (string, error) {
 	_, status, err := svc.getDeploymentState(ctx, ownerID, sinkId)
 	fileContent := []byte(manifest)
 	tmp := strings.Split(string(fileContent), "\n")
@@ -67,7 +77,7 @@ func (svc *deployService) collectorDeploy(ctx context.Context, operation, ownerI
 	err = os.WriteFile("/tmp/otel-collector-"+sinkId+".json", []byte(newContent), 0644)
 	if err != nil {
 		svc.logger.Error("failed to write file content", zap.Error(err))
-		return err
+		return "", err
 	}
 	stdOutListenFunction := func(out *bufio.Scanner, err *bufio.Scanner) {
 		for out.Scan() {
@@ -85,7 +95,12 @@ func (svc *deployService) collectorDeploy(ctx context.Context, operation, ownerI
 		svc.logger.Info(fmt.Sprintf("successfully %s the otel-collector for sink-id: %s", operation, sinkId))
 	}
 
-	return nil
+	// delete temporary file
+	os.Remove("/tmp/otel-collector-"+sinkId+".json")
+
+	// TODO this will be retrieved once we move to K8s SDK
+	collectorName := fmt.Sprintf("otel-%s", sinkId)
+	return collectorName, nil
 }
 
 func execCmd(_ context.Context, cmd *exec.Cmd, logger *zap.Logger, stdOutFunc func(stdOut *bufio.Scanner, stdErr *bufio.Scanner)) (*bufio.Scanner, *bufio.Scanner, error) {
@@ -127,38 +142,16 @@ func (svc *deployService) getDeploymentState(ctx context.Context, _, sinkId stri
 		}
 	}
 	status = "deleted"
-	return "", "deleted", nil
-}
-
-func (svc *deployService) CreateOtelCollector(ctx context.Context, ownerID, sinkID, deploymentEntry string) error {
-	err := svc.collectorDeploy(ctx, "apply", ownerID, sinkID, deploymentEntry)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return "", status, nil
 }
 
-func (svc *deployService) UpdateOtelCollector(ctx context.Context, ownerID, sinkID, deploymentEntry string) error {
-	err := svc.DeleteOtelCollector(ctx, ownerID, sinkID, deploymentEntry)
+func (svc *deployService) CreateOtelCollector(ctx context.Context, ownerID, sinkID, deploymentEntry string) (string, error) {
+	col, err := svc.collectorDeploy(ctx, "apply", ownerID, sinkID, deploymentEntry)
 	if err != nil {
-		return err
+		return "", err
 	}
-	// Time to wait until K8s completely removes before re-creating
-	time.Sleep(3 * time.Second)
-	err = svc.CreateOtelCollector(ctx, ownerID, sinkID, deploymentEntry)
-	if err != nil {
-		return err
-	}
-	return nil
-}
 
-func (svc *deployService) DeleteOtelCollector(ctx context.Context, ownerID, sinkID, deploymentEntry string) error {
-	err := svc.collectorDeploy(ctx, "delete", ownerID, sinkID, deploymentEntry)
-	if err != nil {
-		return err
-	}
-	return nil
+	return col, nil
 }
 
 func (svc *deployService) KillOtelCollector(ctx context.Context, deploymentName string, sinkId string) error {
@@ -172,8 +165,12 @@ func (svc *deployService) KillOtelCollector(ctx context.Context, deploymentName
 	}
 
 	// execute action
-	cmd := exec.Command("kubectl", "delete", "deploy", deploymentName, "-n", namespace)
-	_, _, err := execCmd(ctx, cmd, svc.logger, stdOutListenFunction)
+	cmdDeploy := exec.Command("kubectl", "delete", "deploy", deploymentName, "-n", namespace)
+	_, _, err := execCmd(ctx, cmdDeploy, svc.logger, stdOutListenFunction)
+	cmdService := exec.Command("kubectl", "delete", "service", deploymentName, "-n", namespace)
+	_, _, err = execCmd(ctx, cmdService, svc.logger, stdOutListenFunction)
+	cmdConfigMap := exec.Command("kubectl", "delete", "configmap", "otel-collector-config-"+sinkId, "-n", namespace)
+	_, _, err = execCmd(ctx, cmdConfigMap, svc.logger, stdOutListenFunction)
 	if err == nil {
 		svc.logger.Info(fmt.Sprintf("successfully killed the otel-collector for sink-id: %s", sinkId))
 	}
diff --git a/maestro/monitor/monitor.go b/maestro/monitor/monitor.go
index 5ac8a7ccd..aba190351 100644
--- a/maestro/monitor/monitor.go
+++ b/maestro/monitor/monitor.go
@@ -9,10 +9,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/orb-community/orb/maestro/kubecontrol"
-	rediscons1 "github.com/orb-community/orb/maestro/redis/consumer"
+	"github.com/orb-community/orb/maestro/deployment"
+	"github.com/orb-community/orb/maestro/redis/producer"
 
 	maestroconfig "github.com/orb-community/orb/maestro/config"
+	"github.com/orb-community/orb/maestro/kubecontrol"
 	sinkspb "github.com/orb-community/orb/sinks/pb"
 	"go.uber.org/zap"
 	k8scorev1 "k8s.io/api/core/v1"
@@ -27,12 +28,13 @@ const (
 	namespace       = "otelcollectors"
 )
 
-func NewMonitorService(logger *zap.Logger, sinksClient *sinkspb.SinkServiceClient, eventStore rediscons1.Subscriber, kubecontrol *kubecontrol.Service) Service {
+func NewMonitorService(logger *zap.Logger, sinksClient *sinkspb.SinkServiceClient, mp producer.Producer, kubecontrol *kubecontrol.Service, deploySvc deployment.Service) Service {
 	return &monitorService{
-		logger:      logger,
-		sinksClient: *sinksClient,
-		eventStore:  eventStore,
-		kubecontrol: *kubecontrol,
+		logger:          logger,
+		sinksClient:     *sinksClient,
+		maestroProducer: mp,
+		kubecontrol:     *kubecontrol,
+		deploymentSvc:   deploySvc,
 	}
 }
 
@@ -42,10 +44,11 @@ type Service interface {
 }
 
 type monitorService struct {
-	logger      *zap.Logger
-	sinksClient sinkspb.SinkServiceClient
-	eventStore  rediscons1.Subscriber
-	kubecontrol kubecontrol.Service
+	logger          *zap.Logger
+	sinksClient     sinkspb.SinkServiceClient
+	maestroProducer producer.Producer
+	deploymentSvc   deployment.Service
+	kubecontrol     kubecontrol.Service
 }
 
 func (svc *monitorService) Start(ctx context.Context, cancelFunc context.CancelFunc) error {
@@ -165,19 +168,12 @@ func (svc *monitorService) monitorSinks(ctx context.Context) {
 			}
 		}
 		if sink == nil {
-			svc.logger.Warn("collector not found for sink, depleting collector", zap.String("collector name", collector.Name))
+			svc.logger.Warn("sink not found for collector, depleting collector", zap.String("collector name", collector.Name))
 			sinkId := collector.Name[5:41]
-			deploymentEntry, err := svc.eventStore.GetDeploymentEntryFromSinkId(ctx, sinkId)
-			if err != nil {
-				svc.logger.Error("did not find collector entry for sink", zap.String("sink-id", sinkId))
-				deploymentName := "otel-" + sinkId
-				err = svc.kubecontrol.KillOtelCollector(ctx, deploymentName, sinkId)
-				if err != nil {
-					svc.logger.Error("error removing otel collector, manual intervention required", zap.Error(err))
-				}
-				continue
-			}
-			err = svc.kubecontrol.DeleteOtelCollector(ctx, "", sinkId, deploymentEntry)
+			deploymentName := "otel-" + sinkId
+			svc.logger.Debug("compare deploymentName with collector name", zap.String("deploy name", deploymentName),
+				zap.String("collector name", collector.Name))
+			err = svc.kubecontrol.KillOtelCollector(ctx, deploymentName, sinkId)
 			if err != nil {
 				svc.logger.Error("error removing otel collector", zap.Error(err))
 			}
@@ -197,44 +193,37 @@ func (svc *monitorService) monitorSinks(ctx context.Context) {
 			svc.logger.Error("error on getting logs, skipping", zap.Error(err))
 			continue
 		}
+		var logErrMsg string
 		status, logsErr = svc.analyzeLogs(logs)
 		if status == "fail" {
 			svc.logger.Error("error during analyze logs", zap.Error(logsErr))
 			continue
 		}
-		lastActivity, activityErr := svc.eventStore.GetActivity(sink.Id)
-		// if logs reported 'active' status
-		// here we should check if LastActivity is up-to-date, otherwise we need to set sink as idle
-		idleLimit := time.Now().Unix() - idleTimeSeconds // within 10 minutes
-		if idleLimit >= lastActivity {
-			//changing state on sinks
-			svc.eventStore.PublishSinkStateChange(sink, "idle", logsErr, err)
-			//changing state on redis sinker
-			data.State.SetFromString("idle")
-			svc.eventStore.UpdateSinkStateCache(ctx, data)
-			deploymentEntry, errDeploy := svc.eventStore.GetDeploymentEntryFromSinkId(ctx, sink.Id)
-			if errDeploy != nil {
-				svc.logger.Error("Remove collector: error on getting collector deployment from redis", zap.Error(activityErr))
-				continue
-			}
-			err = svc.kubecontrol.DeleteOtelCollector(ctx, sink.OwnerID, sink.Id, deploymentEntry)
-			if err != nil {
-				svc.logger.Error("error removing otel collector", zap.Error(err))
-			}
-			continue
+		if logsErr != nil {
+			logErrMsg = logsErr.Error()
 		}
+
 		//set the new sink status if changed during checks
 		if sink.GetState() != status && status != "" {
-			svc.logger.Info("changing sink status", zap.Any("before", sink.GetState()), zap.String("new status", status), zap.String("SinkID", sink.Id), zap.String("ownerID", sink.OwnerID))
+			svc.logger.Info("changing sink status",
+				zap.Any("before", sink.GetState()),
+				zap.String("new status", status),
+				zap.String("SinkID", sink.Id),
+				zap.String("ownerID", sink.OwnerID))
 			if err != nil {
-				svc.logger.Error("error updating status", zap.Any("before", sink.GetState()), zap.String("new status", status), zap.String("error_message (opt)", err.Error()), zap.String("SinkID", sink.Id), zap.String("ownerID", sink.OwnerID))
+				svc.logger.Error("error updating status",
+					zap.Any("before", sink.GetState()),
+					zap.String("new status", status),
+					zap.String("error_message (opt)", err.Error()),
+					zap.String("SinkID", sink.Id),
+					zap.String("ownerID", sink.OwnerID))
 			} else {
-				svc.logger.Info("updating status", zap.Any("before", sink.GetState()), zap.String("new status", status), zap.String("SinkID", sink.Id), zap.String("ownerID", sink.OwnerID))
-				// changing state on sinks
-				svc.eventStore.PublishSinkStateChange(sink, status, logsErr, err)
-				// changing state on redis sinker
-				data.State.SetFromString(status)
-				svc.eventStore.UpdateSinkStateCache(ctx, data)
+				svc.logger.Info("updating status",
+					zap.Any("before", sink.GetState()),
+					zap.String("new status", status),
+					zap.String("SinkID", sink.Id),
+					zap.String("ownerID", sink.OwnerID))
+				err = svc.deploymentSvc.UpdateStatus(ctx, sink.OwnerID, sink.Id, status, logErrMsg)
 			}
 		}
 	}
diff --git a/maestro/password/password.go b/maestro/password/password.go
new file mode 100644
index 000000000..5f713f2ed
--- /dev/null
+++ b/maestro/password/password.go
@@ -0,0 +1,93 @@
+package password
+
+import (
+	"crypto/aes"
+	"crypto/cipher"
+	"crypto/rand"
+	"crypto/sha256"
+	"encoding/hex"
+	"go.uber.org/zap"
+	"io"
+)
+
+type EncryptionService interface {
+	EncodePassword(plainText string) (string, error)
+	DecodePassword(cipheredText string) (string, error)
+}
+
+func NewEncryptionService(logger *zap.Logger, key string) EncryptionService {
+	ps := &encryptionService{
+		logger: logger,
+		key:    key,
+	}
+	return ps
+}
+
+var _ EncryptionService = (*encryptionService)(nil)
+
+type encryptionService struct {
+	key    string
+	logger *zap.Logger
+}
+
+func (ps *encryptionService) EncodePassword(plainText string) (string, error) {
+	cipherText, err := encrypt([]byte(plainText), ps.key)
+	if err != nil {
+		ps.logger.Error("failed to encrypt password", zap.Error(err))
+		return "", err
+	}
+	return cipherText, nil
+}
+
+func (ps *encryptionService) DecodePassword(cipheredText string) (string, error) {
+	hexedByte, err := hex.DecodeString(cipheredText)
+	if err != nil {
+		ps.logger.Error("failed to decode password", zap.Error(err))
+		return "", err
+	}
+	plainByte, err := decrypt(hexedByte, ps.key)
+	if err != nil {
+		ps.logger.Error("failed to decrypt password", zap.Error(err))
+		return "", err
+	}
+
+	return string(plainByte), nil
+}
+
+func encrypt(data []byte, passphrase string) (string, error) {
+	block, _ := aes.NewCipher(createHash(passphrase))
+	gcm, err := cipher.NewGCM(block)
+	if err != nil {
+		return "", err
+	}
+	nonce := make([]byte, gcm.NonceSize())
+	if _, err = io.ReadFull(rand.Reader, nonce); err != nil {
+		return "", err
+	}
+	ciphertext := gcm.Seal(nonce, nonce, data, nil)
+	return hex.EncodeToString(ciphertext), nil
+}
+
+func decrypt(data []byte, passphrase string) ([]byte, error) {
+	key := createHash(passphrase)
+	block, err := aes.NewCipher(key)
+	if err != nil {
+		return nil, err
+	}
+	gcm, err := cipher.NewGCM(block)
+	if err != nil {
+		return nil, err
+	}
+	nonceSize := gcm.NonceSize()
+	nonce, ciphertext := data[:nonceSize], data[nonceSize:]
+	plaintext, err := gcm.Open(nil, nonce, ciphertext, nil)
+	if err != nil {
+		return nil, err
+	}
+	return plaintext, nil
+}
+
+func createHash(key string) []byte {
+	hasher := sha256.Sum256([]byte(key))
+	return hasher[:]
+}
diff --git a/maestro/password/password_test.go b/maestro/password/password_test.go
new file mode 100644
index 000000000..e9db130a4
--- /dev/null
+++ b/maestro/password/password_test.go
@@ -0,0 +1,59 @@
+package password
+
+import (
+	"github.com/stretchr/testify/assert"
+	"go.uber.org/zap"
+	"testing"
+)
+
+func Test_passwordService_EncodePassword(t *testing.T) {
+	logger, _ := zap.NewDevelopment()
+
+	tests := []struct {
+		name          string
+		key           string
+		plainText     string
+		encodedString string
+	}{
+		{
+			name:          "with 32 char key",
+			key:           "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+			plainText:     "test",
+			encodedString: "bbf4b204e5daea6e7cb4cb8dec2011c91de502db08c1fc37f4e1ba8b8da60cf0",
+		},
+		{
+			name:          "with smaller key",
+			key:           "testing",
+			plainText:     "test",
+			encodedString: "c8dd6f7f76d1b988574559959c68615ae72487b13bef2f7c4afbce204cc11864",
+		},
+		{
+			name:          "with uuid-key",
+			key:           "eb1bc7f4-2031-41c4-85fa-2ddce3abfc3b",
+			plainText:     "test",
+			encodedString: "1f1114dd9e7953585a768d280a3d0f8592647e0761d085bfa83b9b57c2110a5c",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ps := NewEncryptionService(logger, tt.key)
+			got, err := ps.EncodePassword(tt.plainText)
+			if err != nil {
+				t.Fatalf("received error on encoding password: %e", err)
+			}
+			t.Logf("storing %s", got)
+			password, err := ps.DecodePassword(got)
+			if err != nil {
+				t.Fatalf("received error on decoding password: %e", err)
+			}
+			t.Logf("retrieving %s", password)
+			assert.Equalf(t, tt.plainText, password, "Got Decoded Password %s", password)
+			getPassword, err := ps.DecodePassword(tt.encodedString)
+			if err != nil {
+				t.Fatalf("received error on decoding stored password: %e", err)
+			}
+			t.Logf("retrieving %s", getPassword)
+			assert.Equalf(t, getPassword, password, "Stored coded password is %s", getPassword)
+		})
+	}
+}
diff --git a/maestro/postgres/init.go b/maestro/postgres/init.go
new file mode 100644
index 000000000..83077a742
--- /dev/null
+++ b/maestro/postgres/init.go
@@ -0,0 +1,61 @@
+package postgres
+
+import (
+	"fmt"
+
+	"github.com/jmoiron/sqlx"
+	_ "github.com/lib/pq" // required for SQL access
+	"github.com/orb-community/orb/pkg/config"
+	migrate "github.com/rubenv/sql-migrate"
+)
+
+// Connect creates a connection to the PostgreSQL instance and applies any
+// unapplied database migrations. A non-nil error is returned to indicate
+// failure.
+func Connect(cfg config.PostgresConfig) (*sqlx.DB, error) {
+	url := fmt.Sprintf("host=%s port=%s user=%s dbname=%s password=%s sslmode=%s sslcert=%s sslkey=%s sslrootcert=%s", cfg.Host, cfg.Port, cfg.User, cfg.DB, cfg.Pass, cfg.SSLMode, cfg.SSLCert, cfg.SSLKey, cfg.SSLRootCert)
+
+	db, err := sqlx.Open("postgres", url)
+	if err != nil {
+		return nil, err
+	}
+
+	if err := migrateDB(db); err != nil {
+		return nil, err
+	}
+
+	return db, nil
+}
+
+func migrateDB(db *sqlx.DB) error {
+	migrations := &migrate.MemoryMigrationSource{
+		Migrations: []*migrate.Migration{
+			{
+				Id: "1",
+				Up: []string{					
+					`CREATE TABLE IF NOT EXISTS deployments (
+					    id			    UUID NOT NULL DEFAULT gen_random_uuid(),
+					    owner_id                VARCHAR(255) NOT NULL,
+					    sink_id                 VARCHAR(255) NOT NULL,
+					    backend                 VARCHAR(255), 
+					    config                  JSONB,
+					    last_status             VARCHAR(255),
+					    last_status_update      TIMESTAMP,
+					    last_error_message      VARCHAR(255),
+					    last_error_time         TIMESTAMP,
+					    collector_name          VARCHAR(255),
+					    last_collector_deploy_time TIMESTAMP,
+					    last_collector_stop_time   TIMESTAMP
+					);`,
+					`ALTER TABLE "deployments" ADD CONSTRAINT "deployments_owner_id_sink_id" UNIQUE ("owner_id", "sink_id");`,
+				},
+				Down: []string{
+					"DROP TABLE deployments",
+				},
+			},
+		},
+	}
+	_, err := migrate.Exec(db.DB, "postgres", migrations, migrate.Up)
+
+	return err
+}
diff --git a/maestro/redis/consumer/hashset.go b/maestro/redis/consumer/hashset.go
deleted file mode 100644
index 75b895e84..000000000
--- a/maestro/redis/consumer/hashset.go
+++ /dev/null
@@ -1,234 +0,0 @@
-package consumer
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"strconv"
-	"time"
-
-	redis2 "github.com/go-redis/redis/v8"
-
-	"github.com/orb-community/orb/maestro/config"
-	"github.com/orb-community/orb/maestro/redis"
-	"github.com/orb-community/orb/pkg/types"
-	sinkspb "github.com/orb-community/orb/sinks/pb"
-	"go.uber.org/zap"
-)
-
-const (
-	deploymentKey  = "orb.sinks.deployment"
-	activityPrefix = "sinker_activity"
-	streamLen      = 1000
-)
-
-func (es eventStore) GetDeploymentEntryFromSinkId(ctx context.Context, sinkId string) (string, error) {
-	cmd := es.sinkerKeyRedisClient.HGet(ctx, deploymentKey, sinkId)
-	if err := cmd.Err(); err != nil {
-		es.logger.Error("error during redis reading of SinkId", zap.String("sink-id", sinkId), zap.Error(err))
-		return "", err
-	}
-	return cmd.String(), nil
-}
-
-// handleSinksDeleteCollector will delete Deployment Entry and force delete otel collector
-func (es eventStore) handleSinksDeleteCollector(ctx context.Context, event redis.SinksUpdateEvent) error {
-	es.logger.Info("Received maestro DELETE event from sinks ID", zap.String("sinkID", event.SinkID), zap.String("owner", event.Owner))
-	err := es.RemoveSinkActivity(ctx, event.SinkID)
-	if err != nil {
-		return err
-	}
-	deploymentEntry, err := es.GetDeploymentEntryFromSinkId(ctx, event.SinkID)
-	if err != nil {
-		es.logger.Error("did not find collector entry for sink", zap.String("sink-id", event.SinkID))
-		return err
-	}
-	err = es.sinkerKeyRedisClient.HDel(ctx, deploymentKey, event.SinkID).Err()
-	if err != nil {
-		return err
-	}
-	err = es.kubecontrol.DeleteOtelCollector(ctx, event.Owner, event.SinkID, deploymentEntry)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// handleSinksCreateCollector will create Deployment Entry in Redis
-func (es eventStore) handleSinksCreateCollector(ctx context.Context, event redis.SinksUpdateEvent) error {
-	es.logger.Info("Received event to Create DeploymentEntry from sinks ID", zap.String("sinkID", event.SinkID), zap.String("owner", event.Owner))
-	sinkData, err := es.sinksClient.RetrieveSink(ctx, &sinkspb.SinkByIDReq{
-		SinkID:  event.SinkID,
-		OwnerID: event.Owner,
-	})
-	if err != nil || (sinkData != nil && sinkData.Config == nil) {
-		es.logger.Error("could not fetch info for sink", zap.String("sink-id", event.SinkID), zap.Error(err))
-		return err
-	}
-	var metadata types.Metadata
-	if err := json.Unmarshal(sinkData.Config, &metadata); err != nil {
-		return err
-	}
-	data := config.SinkData{
-		SinkID:  sinkData.Id,
-		OwnerID: sinkData.OwnerID,
-		Backend: sinkData.Backend,
-		Config:  metadata,
-	}
-	err2 := es.CreateDeploymentEntry(ctx, data)
-	if err2 != nil {
-		return err2
-	}
-
-	return nil
-}
-
-func (es eventStore) CreateDeploymentEntry(ctx context.Context, sink config.SinkData) error {
-	deploy, err := config.GetDeploymentJson(es.kafkaUrl, sink)
-	if err != nil {
-		es.logger.Error("error trying to get deployment json for sink ID", zap.String("sinkId", sink.SinkID), zap.Error(err))
-		return err
-	}
-
-	es.sinkerKeyRedisClient.HSet(ctx, deploymentKey, sink.SinkID, deploy)
-	return nil
-}
-
-// handleSinksUpdateCollector will update Deployment Entry in Redis and force update otel collector
-func (es eventStore) handleSinksUpdateCollector(ctx context.Context, event redis.SinksUpdateEvent) error {
-	es.logger.Info("Received event to Update DeploymentEntry from sinks ID", zap.String("sinkID", event.SinkID), zap.String("owner", event.Owner))
-	sinkData, err := es.sinksClient.RetrieveSink(ctx, &sinkspb.SinkByIDReq{
-		SinkID:  event.SinkID,
-		OwnerID: event.Owner,
-	})
-	if err != nil {
-		es.logger.Error("could not fetch info for sink", zap.String("sink-id", event.SinkID), zap.Error(err))
-	}
-	var metadata types.Metadata
-	if err := json.Unmarshal(sinkData.Config, &metadata); err != nil {
-		return err
-	}
-	data := config.SinkData{
-		SinkID:  sinkData.Id,
-		OwnerID: sinkData.OwnerID,
-		Backend: sinkData.Backend,
-		Config:  metadata,
-	}
-	_ = data.State.SetFromString(sinkData.State)
-
-	deploy, err := config.GetDeploymentJson(es.kafkaUrl, data)
-
-	if err != nil {
-		es.logger.Error("error trying to get deployment json for sink ID", zap.String("sinkId", event.SinkID), zap.Error(err))
-		return err
-	}
-	err = es.sinkerKeyRedisClient.HSet(ctx, deploymentKey, event.SinkID, deploy).Err()
-	if err != nil {
-		es.logger.Error("error trying to update deployment json for sink ID", zap.String("sinkId", event.SinkID), zap.Error(err))
-		return err
-	}
-	err = es.kubecontrol.UpdateOtelCollector(ctx, event.Owner, event.SinkID, deploy)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (es eventStore) UpdateSinkCache(ctx context.Context, data config.SinkData) (err error) {
-	keyPrefix := "sinker_key"
-	skey := fmt.Sprintf("%s-%s:%s", keyPrefix, data.OwnerID, data.SinkID)
-	bytes, err := json.Marshal(data)
-	if err != nil {
-		return err
-	}
-	if err = es.sinkerKeyRedisClient.Set(ctx, skey, bytes, 0).Err(); err != nil {
-		es.logger.Error("failed to update sink cache", zap.Error(err))
-		return err
-	}
-	return
-}
-
-func (es eventStore) UpdateSinkStateCache(ctx context.Context, data config.SinkData) (err error) {
-	keyPrefix := "sinker_key"
-	skey := fmt.Sprintf("%s-%s:%s", keyPrefix, data.OwnerID, data.SinkID)
-	bytes, err := json.Marshal(data)
-	if err != nil {
-		es.logger.Error("error update sink cache state", zap.Error(err))
-		return err
-	}
-	if err = es.sinkerKeyRedisClient.Set(ctx, skey, bytes, 0).Err(); err != nil {
-		return err
-	}
-	return
-}
-
-// GetActivity collector activity
-func (es eventStore) GetActivity(sinkID string) (int64, error) {
-	if sinkID == "" {
-		return 0, errors.New("invalid parameters")
-	}
-	skey := fmt.Sprintf("%s:%s", activityPrefix, sinkID)
-	secs, err := es.sinkerKeyRedisClient.Get(context.Background(), skey).Result()
-	if err != nil {
-		return 0, err
-	}
-	lastActivity, _ := strconv.ParseInt(secs, 10, 64)
-	return lastActivity, nil
-}
-
-func (es eventStore) RemoveSinkActivity(ctx context.Context, sinkId string) error {
-	skey := fmt.Sprintf("%s:%s", activityPrefix, sinkId)
-	cmd := es.sinkerKeyRedisClient.Del(ctx, skey, sinkId)
-	if err := cmd.Err(); err != nil {
-		es.logger.Error("error during redis reading of SinkId", zap.String("sink-id", sinkId), zap.Error(err))
-		return err
-	}
-	return nil
-}
-
-func (es eventStore) PublishSinkStateChange(sink *sinkspb.SinkRes, status string, logsErr error, err error) {
-	streamID := "orb.sinker"
-	logMessage := ""
-	if logsErr != nil {
-		logMessage = logsErr.Error()
-	}
-	event := redis.SinkerUpdateEvent{
-		SinkID:    sink.Id,
-		Owner:     sink.OwnerID,
-		State:     status,
-		Msg:       logMessage,
-		Timestamp: time.Now(),
-	}
-
-	record := &redis2.XAddArgs{
-		Stream: streamID,
-		Values: event.Encode(),
-		MaxLen: streamLen,
-		Approx: true,
-	}
-	err = es.streamRedisClient.XAdd(context.Background(), record).Err()
-	if err != nil {
-		es.logger.Error("error sending event to event store", zap.Error(err))
-	}
-	es.logger.Info("Maestro notified change of status for sink", zap.String("newState", status), zap.String("sink-id", sink.Id))
-}
-
-func decodeSinksEvent(event map[string]interface{}, operation string) (redis.SinksUpdateEvent, error) {
-	val := redis.SinksUpdateEvent{
-		SinkID:    read(event, "sink_id", ""),
-		Owner:     read(event, "owner", ""),
-		Config:    readMetadata(event, "config"),
-		Timestamp: time.Now(),
-	}
-	if operation != sinksDelete {
-		var metadata types.Metadata
-		if err := json.Unmarshal([]byte(read(event, "config", "")), &metadata); err != nil {
-			return redis.SinksUpdateEvent{}, err
-		}
-		val.Config = metadata
-		return val, nil
-	}
-
-	return val, nil
-}
diff --git a/maestro/redis/consumer/sinker.go b/maestro/redis/consumer/sinker.go
new file mode 100644
index 000000000..de431d1d0
--- /dev/null
+++ b/maestro/redis/consumer/sinker.go
@@ -0,0 +1,151 @@
+package consumer
+
+import (
+	"context"
+
+	"github.com/go-redis/redis/v8"
+	maestroredis "github.com/orb-community/orb/maestro/redis"
+	"github.com/orb-community/orb/maestro/service"
+	"go.uber.org/zap"
+)
+
+type SinkerActivityListener interface {
+	// SubscribeSinksEvents - listen to sink_activity, sink_idle because of state management and deployments start or stop
+	SubscribeSinkerIdleEvents(ctx context.Context) error
+
+	// SubscribeSinksEvents - listen to sink_activity
+	SubscribeSinkerActivityEvents(ctx context.Context) error
+}
+
+type sinkerActivityListenerService struct {
+	logger       *zap.Logger
+	redisClient  *redis.Client
+	eventService service.EventService
+}
+
+const (
+	idleStream = "orb.sink_idle"
+	activityStream = "orb.sink_activity"
+)
+
+func NewSinkerActivityListener(l *zap.Logger, eventService service.EventService, redisClient *redis.Client) SinkerActivityListener {
+	logger := l.Named("sinker-activity-listener")
+	return &sinkerActivityListenerService{
+		logger:       logger,
+		redisClient:  redisClient,
+		eventService: eventService,
+	}
+}
+
+func (s *sinkerActivityListenerService) SubscribeSinksActivity(ctx context.Context) error {
+	err := s.redisClient.XGroupCreateMkStream(ctx, activityStream, maestroredis.GroupMaestro, "$").Err()
+	if err != nil && err.Error() != maestroredis.Exists {
+		return err
+	}
+	s.logger.Debug("Reading Sinker Activity Events", zap.String("stream", activityStream))
+	for {
+		select {
+		case <-ctx.Done():
+			s.logger.Info("closing sinker_activity_listener routine")
+			return nil
+		default:
+			streams, err := s.redisClient.XReadGroup(ctx, &redis.XReadGroupArgs{
+				Group:    maestroredis.GroupMaestro,
+				Consumer: "orb_maestro-es-consumer",
+				Streams:  []string{activityStream, ">"},
+				Count:    1000,
+			}).Result()
+			if err != nil || len(streams) == 0 {
+				if err != nil {
+					s.logger.Error("error reading activity stream", zap.Error(err))
+				}
+				continue
+			}
+			for _, msg := range streams[0].Messages {
+				event := maestroredis.SinkerUpdateEvent{}
+				event.Decode(msg.Values)
+				s.logger.Debug("Reading message from activity stream",
+					zap.String("message_id", msg.ID),
+					zap.String("sink_id", event.SinkID),
+					zap.String("owner_id", event.OwnerID))
+				go func() {
+					err := s.eventService.HandleSinkActivity(ctx, event)
+					if err != nil {
+						s.logger.Error("Failed to handle sinks event", zap.Error(err))
+					} else {
+						s.redisClient.XAck(ctx, activityStream, maestroredis.GroupMaestro, msg.ID)
+					}
+				}()
+				if err != nil {
+					s.logger.Error("error receiving message", zap.Error(err))
+					return err
+				}
+			}
+		}
+	}
+}
+
+func (s *sinkerActivityListenerService) SubscribeSinksIdle(ctx context.Context) error {
+	err := s.redisClient.XGroupCreateMkStream(ctx, idleStream, maestroredis.GroupMaestro, "$").Err()
+	if err != nil && err.Error() != maestroredis.Exists {
+		return err
+	}
+	s.logger.Debug("Reading Sinker Idle Events", zap.String("stream", idleStream))
+	for {
+		select {
+		case <-ctx.Done():
+			s.logger.Info("closing sinker_idle_listener routine")
+			return nil
+		default:
+			streams, err := s.redisClient.XReadGroup(ctx, &redis.XReadGroupArgs{
+				Group:    maestroredis.GroupMaestro,
+				Consumer: "orb_maestro-es-consumer",
+				Streams:  []string{idleStream, ">"},
+			}).Result()
+			if err != nil || len(streams) == 0 {
+				if err != nil {
+					s.logger.Error("error reading idle stream", zap.Error(err))
+				}
+				continue
+			}
+			for _, msg := range streams[0].Messages {
+				event := maestroredis.SinkerUpdateEvent{}
+				event.Decode(msg.Values)
+				s.logger.Debug("Reading message from idle stream",
+					zap.String("message_id", msg.ID),
+					zap.String("sink_id", event.SinkID),
+					zap.String("owner_id", event.OwnerID))
+				go func() {
+					err := s.eventService.HandleSinkIdle(ctx, event)
+					if err != nil {
+						s.logger.Error("Failed to handle sinks event", zap.Error(err))
+					} else {
+						s.redisClient.XAck(ctx, idleStream, maestroredis.GroupMaestro, msg.ID)
+					}
+				}()
+				if err != nil {
+					s.logger.Error("error receiving message", zap.Error(err))
+					return err
+				}
+			}
+		}
+	}
+}
+
+func (s *sinkerActivityListenerService) SubscribeSinkerActivityEvents(ctx context.Context) error {
+	err := s.SubscribeSinksActivity(ctx)
+	if err != nil {
+		s.logger.Error("error reading activity stream", zap.Error(err))
+		return err
+	}
+	return nil
+}
+
+func (s *sinkerActivityListenerService) SubscribeSinkerIdleEvents(ctx context.Context) error {
+	err := s.SubscribeSinksIdle(ctx)
+	if err != nil {
+		s.logger.Error("error reading idle stream", zap.Error(err))
+		return err
+	}
+	return nil
+}
diff --git a/maestro/redis/consumer/sinks.go b/maestro/redis/consumer/sinks.go
new file mode 100644
index 000000000..5a0e486db
--- /dev/null
+++ b/maestro/redis/consumer/sinks.go
@@ -0,0 +1,137 @@
+package consumer
+
+import (
+	"context"
+	"errors"
+	"github.com/go-redis/redis/v8"
+	maestroredis "github.com/orb-community/orb/maestro/redis"
+	"github.com/orb-community/orb/maestro/service"
+	sinkspb "github.com/orb-community/orb/sinks/pb"
+	redis2 "github.com/orb-community/orb/sinks/redis"
+	"go.uber.org/zap"
+)
+
+type SinksListener interface {
+	// SubscribeSinksEvents - listen to sinks.create, sinks.update, sinks.delete to handle the deployment creation
+	SubscribeSinksEvents(context context.Context) error
+}
+
+type sinksListenerService struct {
+	logger            *zap.Logger
+	deploymentService service.EventService
+	redisClient       *redis.Client
+	sinksClient       sinkspb.SinkServiceClient
+}
+
+func NewSinksListenerController(l *zap.Logger, eventService service.EventService, redisClient *redis.Client,
+	sinksClient sinkspb.SinkServiceClient) SinksListener {
+	logger := l.Named("sinks_listener")
+	return &sinksListenerService{
+		logger:            logger,
+		deploymentService: eventService,
+		redisClient:       redisClient,
+		sinksClient:       sinksClient,
+	}
+}
+
+// SubscribeSinksEvents Subscribe to listen events from sinks to maestro
+func (ls *sinksListenerService) SubscribeSinksEvents(ctx context.Context) error {
+	//listening sinker events
+	err := ls.redisClient.XGroupCreateMkStream(ctx, redis2.StreamSinks, redis2.GroupMaestro, "$").Err()
+	if err != nil && err.Error() != redis2.Exists {
+		return err
+	}
+	ls.logger.Debug("Reading Sinks Events", zap.String("stream", redis2.StreamSinks))
+	for {
+		streams, err := ls.redisClient.XReadGroup(ctx, &redis.XReadGroupArgs{
+			Group:    redis2.GroupMaestro,
+			Consumer: "orb_maestro-es-consumer",
+			Streams:  []string{redis2.StreamSinks, ">"},
+			Count:    100,
+		}).Result()
+		if err != nil || len(streams) == 0 {
+			continue
+		}
+		for _, msg := range streams[0].Messages {
+			err := ls.ReceiveMessage(ctx, msg)
+			if err != nil {
+				return err
+			}
+		}
+	}
+}
+
+func (ls *sinksListenerService) ReceiveMessage(ctx context.Context, msg redis.XMessage) error {
+	logger := ls.logger.Named("sinks_listener:" + msg.ID)
+	event := msg.Values
+	rte, err := redis2.DecodeSinksEvent(event, event["operation"].(string))
+	if err != nil {
+		logger.Error("Failed to handle sinks event", zap.Any("operation", event["operation"]), zap.Error(err))
+		return err
+	}
+	logger.Info("received message in sinks event bus", zap.Any("operation", event["operation"]))
+	switch event["operation"] {
+	case redis2.SinkCreate:
+		go func() {
+			err = ls.handleSinksCreate(ctx, rte) //should create deployment
+			if err != nil {
+				logger.Error("Failed to handle sinks event", zap.Any("operation", event["operation"]), zap.Error(err))
+			} else {
+				ls.redisClient.XAck(ctx, redis2.StreamSinks, redis2.GroupMaestro, msg.ID)
+			}
+		}()
+	case redis2.SinkUpdate:
+		go func() {
+			err = ls.handleSinksUpdate(ctx, rte) //should create collector
+			if err != nil {
+				logger.Error("Failed to handle sinks event", zap.Any("operation", event["operation"]), zap.Error(err))
+			} else {
+				ls.redisClient.XAck(ctx, redis2.StreamSinks, redis2.GroupMaestro, msg.ID)
+			}
+		}()
+	case redis2.SinkDelete:
+		go func() {
+			err = ls.handleSinksDelete(ctx, rte) //should delete collector
+			if err != nil {
+				logger.Error("Failed to handle sinks event", zap.Any("operation", event["operation"]), zap.Error(err))
+			} else {
+				ls.redisClient.XAck(ctx, redis2.StreamSinks, redis2.GroupMaestro, msg.ID)
+			}
+		}()
+	case <-ctx.Done():
+		return errors.New("stopped listening to sinks, due to context cancellation")
+	}
+	return nil
+}
+
+// handleSinksUpdate logic moved to deployment.EventService
+func (ls *sinksListenerService) handleSinksUpdate(ctx context.Context, event maestroredis.SinksUpdateEvent) error {
+	ls.logger.Debug("Received sinks UPDATE event from sinks ID", zap.String("sinkID", event.SinkID), zap.String("owner", event.Owner))
+	err := ls.deploymentService.HandleSinkUpdate(ctx, event)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// handleSinksDelete logic moved to deployment.EventService
+func (ls *sinksListenerService) handleSinksDelete(ctx context.Context, event maestroredis.SinksUpdateEvent) error {
+	ls.logger.Debug("Received sinks DELETE event from sinks ID", zap.String("sinkID", event.SinkID), zap.String("owner", event.Owner))
+	err := ls.deploymentService.HandleSinkDelete(ctx, event)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// handleSinksCreate logic moved to deployment.EventService
+func (ls *sinksListenerService) handleSinksCreate(ctx context.Context, event maestroredis.SinksUpdateEvent) error {
+	ls.logger.Debug("Received sinks to CREATE event from sinks ID", zap.String("sinkID", event.SinkID), zap.String("owner", event.Owner))
+	err := ls.deploymentService.HandleSinkCreate(ctx, event)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/maestro/redis/consumer/streams.go b/maestro/redis/consumer/streams.go
deleted file mode 100644
index c5eb0634f..000000000
--- a/maestro/redis/consumer/streams.go
+++ /dev/null
@@ -1,254 +0,0 @@
-package consumer
-
-import (
-	"context"
-	"encoding/json"
-	"time"
-
-	"github.com/orb-community/orb/maestro/config"
-	"github.com/orb-community/orb/pkg/errors"
-
-	"github.com/orb-community/orb/maestro/kubecontrol"
-	maestroredis "github.com/orb-community/orb/maestro/redis"
-	"github.com/orb-community/orb/pkg/types"
-	sinkspb "github.com/orb-community/orb/sinks/pb"
-
-	"github.com/go-redis/redis/v8"
-	"go.uber.org/zap"
-)
-
-const (
-	streamSinks  = "orb.sinks"
-	streamSinker = "orb.sinker"
-	groupMaestro = "orb.maestro"
-
-	sinkerPrefix = "sinker."
-	sinkerUpdate = sinkerPrefix + "update"
-
-	sinksPrefix = "sinks."
-	sinksUpdate = sinksPrefix + "update"
-	sinksCreate = sinksPrefix + "create"
-	sinksDelete = sinksPrefix + "remove"
-
-	exists = "BUSYGROUP Consumer Group name already exists"
-)
-
-type Subscriber interface {
-	CreateDeploymentEntry(ctx context.Context, sink config.SinkData) error
-	GetDeploymentEntryFromSinkId(ctx context.Context, sinkId string) (string, error)
-
-	UpdateSinkCache(ctx context.Context, data config.SinkData) (err error)
-	UpdateSinkStateCache(ctx context.Context, data config.SinkData) (err error)
-	PublishSinkStateChange(sink *sinkspb.SinkRes, status string, logsErr error, err error)
-
-	GetActivity(sinkID string) (int64, error)
-	RemoveSinkActivity(ctx context.Context, sinkId string) error
-
-	SubscribeSinksEvents(context context.Context) error
-	SubscribeSinkerEvents(context context.Context) error
-}
-
-type eventStore struct {
-	kafkaUrl             string
-	kubecontrol          kubecontrol.Service
-	sinksClient          sinkspb.SinkServiceClient
-	streamRedisClient    *redis.Client
-	sinkerKeyRedisClient *redis.Client
-	esconsumer           string
-	logger               *zap.Logger
-}
-
-func NewEventStore(streamRedisClient, sinkerKeyRedisClient *redis.Client, kafkaUrl string, kubecontrol kubecontrol.Service, esconsumer string, sinksClient sinkspb.SinkServiceClient, logger *zap.Logger) Subscriber {
-	return eventStore{
-		kafkaUrl:             kafkaUrl,
-		kubecontrol:          kubecontrol,
-		streamRedisClient:    streamRedisClient,
-		sinkerKeyRedisClient: sinkerKeyRedisClient,
-		sinksClient:          sinksClient,
-		esconsumer:           esconsumer,
-		logger:               logger,
-	}
-}
-
-// SubscribeSinkerEvents Subscribe to listen events from sinker to maestro
-func (es eventStore) SubscribeSinkerEvents(ctx context.Context) error {
-	err := es.streamRedisClient.XGroupCreateMkStream(ctx, streamSinker, groupMaestro, "$").Err()
-	if err != nil && err.Error() != exists {
-		return err
-	}
-
-	for {
-		streams, err := es.streamRedisClient.XReadGroup(ctx, &redis.XReadGroupArgs{
-			Group:    groupMaestro,
-			Consumer: "orb_maestro-es-consumer",
-			Streams:  []string{streamSinker, ">"},
-			Count:    100,
-		}).Result()
-		if err != nil || len(streams) == 0 {
-			continue
-		}
-		for _, msg := range streams[0].Messages {
-			event := msg.Values
-			rte := decodeSinkerStateUpdate(event)
-			// here we should listen just event coming from sinker, not our own "publishState" events
-			if rte.State == "active" {
-				es.logger.Info("received message in sinker event bus", zap.Any("operation", event["operation"]))
-				switch event["operation"] {
-				case sinkerUpdate:
-					go func() {
-						err = es.handleSinkerCreateCollector(ctx, rte) //sinker request to create collector
-						if err != nil {
-							es.logger.Error("Failed to handle sinker event", zap.Any("operation", event["operation"]), zap.Error(err))
-						} else {
-							es.streamRedisClient.XAck(ctx, streamSinker, groupMaestro, msg.ID)
-						}
-					}()
-
-				case <-ctx.Done():
-					return errors.New("stopped listening to sinks, due to context cancellation")
-				}
-			}
-		}
-	}
-}
-
-// SubscribeSinksEvents Subscribe to listen events from sinks to maestro
-func (es eventStore) SubscribeSinksEvents(ctx context.Context) error {
-	//listening sinker events
-	err := es.streamRedisClient.XGroupCreateMkStream(ctx, streamSinks, groupMaestro, "$").Err()
-	if err != nil && err.Error() != exists {
-		return err
-	}
-
-	for {
-		streams, err := es.streamRedisClient.XReadGroup(ctx, &redis.XReadGroupArgs{
-			Group:    groupMaestro,
-			Consumer: "orb_maestro-es-consumer",
-			Streams:  []string{streamSinks, ">"},
-			Count:    100,
-		}).Result()
-		if err != nil || len(streams) == 0 {
-			continue
-		}
-		for _, msg := range streams[0].Messages {
-			event := msg.Values
-			rte, err := decodeSinksEvent(event, event["operation"].(string))
-			if err != nil {
-				es.logger.Error("Failed to handle sinks event", zap.Any("operation", event["operation"]), zap.Error(err))
-				break
-			}
-			es.logger.Info("received message in sinks event bus", zap.Any("operation", event["operation"]))
-			switch event["operation"] {
-			case sinksCreate:
-				go func() {
-					err = es.handleSinksCreateCollector(ctx, rte) //should create collector
-					if err != nil {
-						es.logger.Error("Failed to handle sinks event", zap.Any("operation", event["operation"]), zap.Error(err))
-					} else {
-						es.streamRedisClient.XAck(ctx, streamSinks, groupMaestro, msg.ID)
-					}
-				}()
-			case sinksUpdate:
-				go func() {
-					err = es.handleSinksUpdateCollector(ctx, rte) //should create collector
-					if err != nil {
-						es.logger.Error("Failed to handle sinks event", zap.Any("operation", event["operation"]), zap.Error(err))
-					} else {
-						es.streamRedisClient.XAck(ctx, streamSinks, groupMaestro, msg.ID)
-					}
-				}()
-			case sinksDelete:
-				go func() {
-					err = es.handleSinksDeleteCollector(ctx, rte) //should delete collector
-					if err != nil {
-						es.logger.Error("Failed to handle sinks event", zap.Any("operation", event["operation"]), zap.Error(err))
-					} else {
-						es.streamRedisClient.XAck(ctx, streamSinks, groupMaestro, msg.ID)
-					}
-				}()
-			case <-ctx.Done():
-				return errors.New("stopped listening to sinks, due to context cancellation")
-			}
-		}
-	}
-}
-
-// handleSinkerDeleteCollector Delete collector
-func (es eventStore) handleSinkerDeleteCollector(ctx context.Context, event maestroredis.SinkerUpdateEvent) error {
-	es.logger.Info("Received maestro DELETE event from sinker, sink state", zap.String("state", event.State), zap.String("sinkID", event.SinkID), zap.String("ownerID", event.Owner))
-	deploymentEntry, err := es.GetDeploymentEntryFromSinkId(ctx, event.SinkID)
-	if err != nil {
-		return err
-	}
-	err = es.kubecontrol.DeleteOtelCollector(ctx, event.Owner, event.SinkID, deploymentEntry)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// handleSinkerCreateCollector Create collector
-func (es eventStore) handleSinkerCreateCollector(ctx context.Context, event maestroredis.SinkerUpdateEvent) error {
-	es.logger.Info("Received maestro CREATE event from sinker, sink state", zap.String("state", event.State), zap.String("sinkID", event.SinkID), zap.String("ownerID", event.Owner))
-	deploymentEntry, err := es.GetDeploymentEntryFromSinkId(ctx, event.SinkID)
-	if err != nil {
-		sink, err := es.sinksClient.RetrieveSink(ctx, &sinkspb.SinkByIDReq{
-			SinkID:  event.SinkID,
-			OwnerID: event.Owner,
-		})
-		if err != nil {
-			es.logger.Error("could not find deployment entry from sink-id", zap.String("sinkID", event.SinkID), zap.Error(err))
-			return err
-		}
-		var metadata types.Metadata
-		if err := json.Unmarshal(sink.Config, &metadata); err != nil {
-			return err
-		}
-		sinkData := config.SinkData{
-			SinkID:  sink.Id,
-			OwnerID: sink.OwnerID,
-			Backend: sink.Backend,
-			Config:  metadata,
-		}
-		err = es.CreateDeploymentEntry(ctx, sinkData)
-		if err != nil {
-			es.logger.Error("could not create deployment entry from sink", zap.String("sinkID", event.SinkID), zap.Error(err))
-			return err
-		}
-	}
-	err = es.kubecontrol.CreateOtelCollector(ctx, event.Owner, event.SinkID, deploymentEntry)
-	if err != nil {
-		es.logger.Error("could not find deployment entry from sink-id", zap.String("sinkID", event.SinkID), zap.Error(err))
-		return err
-	}
-	return nil
-}
-
-func decodeSinkerStateUpdate(event map[string]interface{}) maestroredis.SinkerUpdateEvent {
-	val := maestroredis.SinkerUpdateEvent{
-		Owner:     read(event, "owner", ""),
-		SinkID:    read(event, "sink_id", ""),
-		State:     read(event, "state", ""),
-		Timestamp: time.Time{},
-	}
-
-	return val
-}
-
-func read(event map[string]interface{}, key, def string) string {
-	val, ok := event[key].(string)
-	if !ok {
-		return def
-	}
-
-	return val
-}
-
-func readMetadata(event map[string]interface{}, key string) types.Metadata {
-	val, ok := event[key].(types.Metadata)
-	if !ok {
-		return types.Metadata{}
-	}
-
-	return val
-}
diff --git a/maestro/redis/events.go b/maestro/redis/events.go
index 738903e9f..56d315e2b 100644
--- a/maestro/redis/events.go
+++ b/maestro/redis/events.go
@@ -1,10 +1,3 @@
-// Copyright (c) Mainflux
-// SPDX-License-Identifier: Apache-2.0
-
-// Adapted for Orb project, modifications licensed under MPL v. 2.0:
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 package redis
 
 import (
@@ -15,29 +8,55 @@ import (
 const (
 	SinkerPrefix = "sinker."
 	SinkerUpdate = SinkerPrefix + "update"
+	GroupMaestro = "orb.maestro"
+	Exists       = "BUSYGROUP Consumer Group name already exists"
 )
 
 type SinksUpdateEvent struct {
 	SinkID    string
 	Owner     string
 	Config    types.Metadata
+	Backend   string
 	Timestamp time.Time
 }
 
 type SinkerUpdateEvent struct {
+	OwnerID   string
 	SinkID    string
-	Owner     string
 	State     string
-	Msg       string
+	Size      string
 	Timestamp time.Time
 }
 
-func (cse SinkerUpdateEvent) Encode() map[string]interface{} {
+func (sue *SinksUpdateEvent) Decode(values map[string]interface{}) {
+	sue.SinkID = values["sink_id"].(string)
+	sue.Owner = values["owner"].(string)
+	sue.Config = types.FromMap(values["config"].(map[string]interface{}))
+	sue.Backend = values["backend"].(string)
+	var err error
+	sue.Timestamp, err = time.Parse(time.RFC3339, values["timestamp"].(string))
+	if err != nil {
+		sue.Timestamp = time.Now()
+	}
+}
+
+func (cse *SinkerUpdateEvent) Decode(values map[string]interface{}) {
+	cse.OwnerID = values["owner_id"].(string)
+	cse.SinkID = values["sink_id"].(string)
+	cse.State = values["state"].(string)
+	cse.Size = values["size"].(string)
+	var err error
+	cse.Timestamp, err = time.Parse(time.RFC3339, values["timestamp"].(string))
+	if err != nil {
+		cse.Timestamp = time.Now()
+	}
+}
+
+func (cse *SinkerUpdateEvent) Encode() map[string]interface{} {
 	return map[string]interface{}{
 		"sink_id":   cse.SinkID,
-		"owner":     cse.Owner,
+		"owner":     cse.OwnerID,
 		"state":     cse.State,
-		"msg":       cse.Msg,
 		"timestamp": cse.Timestamp.Unix(),
 		"operation": SinkerUpdate,
 	}
diff --git a/maestro/redis/events_test.go b/maestro/redis/events_test.go
new file mode 100644
index 000000000..869b2f247
--- /dev/null
+++ b/maestro/redis/events_test.go
@@ -0,0 +1,50 @@
+package redis
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+	"time"
+)
+
+func TestSinkerUpdateEvent_Decode(t *testing.T) {
+	type fields struct {
+		OwnerID string
+		SinkID  string
+		State   string
+		Size    string
+	}
+	type args struct {
+		values map[string]interface{}
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		args   args
+	}{
+		{name: "test_decode_allfields", fields: fields{
+			OwnerID: "owner-1",
+			SinkID:  "sink-1",
+			State:   "active",
+			Size:    "111",
+		}, args: args{
+			values: map[string]interface{}{
+				"owner_id":  "owner-1",
+				"sink_id":   "sink-1",
+				"state":     "active",
+				"size":      "111",
+				"timestamp": time.Now().Format(time.RFC3339),
+			},
+		},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cse := SinkerUpdateEvent{}
+			cse.Decode(tt.args.values)
+			assert.Equal(t, tt.fields.OwnerID, cse.OwnerID)
+			assert.Equal(t, tt.fields.SinkID, cse.SinkID)
+			assert.Equal(t, tt.fields.State, cse.State)
+			assert.Equal(t, tt.fields.Size, cse.Size)
+		})
+	}
+}
diff --git a/maestro/redis/producer/sink_status.go b/maestro/redis/producer/sink_status.go
new file mode 100644
index 000000000..b2e4b8c78
--- /dev/null
+++ b/maestro/redis/producer/sink_status.go
@@ -0,0 +1,68 @@
+package producer
+
+import (
+	"context"
+	"time"
+
+	"github.com/go-redis/redis/v8"
+	"go.uber.org/zap"
+)
+
+const (
+	streamID  = "orb.maestro.sink_status"
+	streamLen = 1000
+)
+
+type SinkStatusEvent struct {
+	ownerId      string
+	sinkId       string
+	status       string
+	errorMessage string
+}
+
+func (e SinkStatusEvent) Encode() map[string]interface{} {
+	return map[string]interface{}{
+		"owner_id":      e.ownerId,
+		"sink_id":       e.sinkId,
+		"status":        e.status,
+		"error_message": e.errorMessage,
+		"timestamp":     time.Now().Format(time.RFC3339),
+	}
+}
+
+type Producer interface {
+	// PublishSinkStatus to be used to publish the sink activity to the sinker
+	PublishSinkStatus(ctx context.Context, ownerId string, sinkId string, status string, errorMessage string) error
+}
+
+type maestroProducer struct {
+	logger      *zap.Logger
+	streamRedis *redis.Client
+}
+
+func NewMaestroProducer(logger *zap.Logger, streamRedis *redis.Client) Producer {
+	return &maestroProducer{logger: logger, streamRedis: streamRedis}
+}
+
+// PublishSinkStatus to be used to publish the sink activity to the sinker
+func (p *maestroProducer) PublishSinkStatus(ctx context.Context, ownerId string, sinkId string, status string, errorMessage string) error {
+	event := SinkStatusEvent{
+		ownerId:      ownerId,
+		sinkId:       sinkId,
+		status:       status,
+		errorMessage: errorMessage,
+	}
+	streamEvent := event.Encode()
+	record := &redis.XAddArgs{
+		Stream: streamID,
+		MaxLen: streamLen,
+		Approx: true,
+		Values: streamEvent,
+	}
+	cmd := p.streamRedis.XAdd(ctx, record)
+	if cmd.Err() != nil {
+		p.logger.Error("error sending event to maestro event store", zap.Error(cmd.Err()))
+		return cmd.Err()
+	}
+	return nil
+}
diff --git a/maestro/service.go b/maestro/service.go
index c30c61e20..bf391de97 100644
--- a/maestro/service.go
+++ b/maestro/service.go
@@ -10,17 +10,19 @@ package maestro
 
 import (
 	"context"
-	"encoding/json"
-	"github.com/orb-community/orb/maestro/monitor"
-	"github.com/orb-community/orb/pkg/types"
-	"strings"
 
+	kitprometheus "github.com/go-kit/kit/metrics/prometheus"
 	"github.com/go-redis/redis/v8"
-	maestroconfig "github.com/orb-community/orb/maestro/config"
+	"github.com/jmoiron/sqlx"
+	"github.com/orb-community/orb/maestro/deployment"
 	"github.com/orb-community/orb/maestro/kubecontrol"
+	"github.com/orb-community/orb/maestro/monitor"
 	rediscons1 "github.com/orb-community/orb/maestro/redis/consumer"
+	"github.com/orb-community/orb/maestro/redis/producer"
+	"github.com/orb-community/orb/maestro/service"
 	"github.com/orb-community/orb/pkg/config"
 	sinkspb "github.com/orb-community/orb/sinks/pb"
+	stdprometheus "github.com/prometheus/client_golang/prometheus"
 	"go.uber.org/zap"
 )
 
@@ -30,30 +32,56 @@ type maestroService struct {
 	serviceContext    context.Context
 	serviceCancelFunc context.CancelFunc
 
+	deploymentService   deployment.Service
+	sinkListenerService rediscons1.SinksListener
+	activityListener    rediscons1.SinkerActivityListener
+
 	kubecontrol       kubecontrol.Service
 	monitor           monitor.Service
 	logger            *zap.Logger
 	streamRedisClient *redis.Client
 	sinkerRedisClient *redis.Client
 	sinksClient       sinkspb.SinkServiceClient
+	eventService      service.EventService
 	esCfg             config.EsConfig
-	eventStore        rediscons1.Subscriber
 	kafkaUrl          string
 }
 
-func NewMaestroService(logger *zap.Logger, streamRedisClient *redis.Client, sinkerRedisClient *redis.Client, sinksGrpcClient sinkspb.SinkServiceClient, esCfg config.EsConfig, otelCfg config.OtelConfig) Service {
+func NewMaestroService(logger *zap.Logger, streamRedisClient *redis.Client, sinkerRedisClient *redis.Client,
+	sinksGrpcClient sinkspb.SinkServiceClient, otelCfg config.OtelConfig, db *sqlx.DB, svcCfg config.BaseSvcConfig) Service {
 	kubectr := kubecontrol.NewService(logger)
-	eventStore := rediscons1.NewEventStore(streamRedisClient, sinkerRedisClient, otelCfg.KafkaUrl, kubectr, esCfg.Consumer, sinksGrpcClient, logger)
-	monitorService := monitor.NewMonitorService(logger, &sinksGrpcClient, eventStore, &kubectr)
+	repo := deployment.NewRepositoryService(db, logger)
+	maestroProducer := producer.NewMaestroProducer(logger, streamRedisClient)
+	deploymentService := deployment.NewDeploymentService(logger, repo, otelCfg.KafkaUrl, svcCfg.EncryptionKey, maestroProducer, kubectr)
+	ps := producer.NewMaestroProducer(logger, streamRedisClient)
+	monitorService := monitor.NewMonitorService(logger, &sinksGrpcClient, ps, &kubectr, deploymentService)
+	eventService := service.NewEventService(logger, deploymentService, &sinksGrpcClient)
+	eventService = service.NewTracingService(logger, eventService,
+		kitprometheus.NewCounterFrom(stdprometheus.CounterOpts{
+			Namespace: "maestro",
+			Subsystem: "comms",
+			Name:      "message_count",
+			Help:      "Number of messages received.",
+		}, []string{"method", "sink_id", "owner_id"}),
+		kitprometheus.NewSummaryFrom(stdprometheus.SummaryOpts{
+			Namespace: "maestro",
+			Subsystem: "comms",
+			Name:      "message_latency_microseconds",
+			Help:      "Total duration of messages processed in microseconds.",
+		}, []string{"method", "sink_id", "owner_id"}))
+	sinkListenerService := rediscons1.NewSinksListenerController(logger, eventService, streamRedisClient, sinksGrpcClient)
+	activityListener := rediscons1.NewSinkerActivityListener(logger, eventService, streamRedisClient)
 	return &maestroService{
-		logger:            logger,
-		streamRedisClient: streamRedisClient,
-		sinkerRedisClient: sinkerRedisClient,
-		sinksClient:       sinksGrpcClient,
-		kubecontrol:       kubectr,
-		monitor:           monitorService,
-		eventStore:        eventStore,
-		kafkaUrl:          otelCfg.KafkaUrl,
+		logger:              logger,
+		deploymentService:   deploymentService,
+		streamRedisClient:   streamRedisClient,
+		sinkerRedisClient:   sinkerRedisClient,
+		sinksClient:         sinksGrpcClient,
+		sinkListenerService: sinkListenerService,
+		activityListener:    activityListener,
+		kubecontrol:         kubectr,
+		monitor:             monitorService,
+		kafkaUrl:            otelCfg.KafkaUrl,
 	}
 }
 
@@ -63,103 +91,48 @@ func NewMaestroService(logger *zap.Logger, streamRedisClient *redis.Client, sink
 //	And for each sink with active state, deploy OtelCollector
 func (svc *maestroService) Start(ctx context.Context, cancelFunction context.CancelFunc) error {
 
-	loadCtx, loadCancelFunction := context.WithCancel(ctx)
-	defer loadCancelFunction()
 	svc.serviceContext = ctx
 	svc.serviceCancelFunc = cancelFunction
 
-	sinksRes, err := svc.sinksClient.RetrieveSinks(loadCtx, &sinkspb.SinksFilterReq{OtelEnabled: "enabled"})
-	if err != nil {
-		loadCancelFunction()
-		return err
-	}
-
-	pods, err := svc.monitor.GetRunningPods(ctx)
-	if err != nil {
-		loadCancelFunction()
-		return err
-	}
-
-	for _, sinkRes := range sinksRes.Sinks {
-		sinkContext := context.WithValue(loadCtx, "sink-id", sinkRes.Id)
-		var metadata types.Metadata
-		if err := json.Unmarshal(sinkRes.Config, &metadata); err != nil {
-			svc.logger.Warn("failed to unmarshal sink, skipping", zap.String("sink-id", sinkRes.Id))
-			continue
-		}
-		if val, _ := svc.eventStore.GetDeploymentEntryFromSinkId(ctx, sinkRes.Id); val != "" {
-			svc.logger.Info("Skipping deploymentEntry because it is already created")
-		} else {
-			var data maestroconfig.SinkData
-			data.SinkID = sinkRes.Id
-			data.Config = metadata
-			data.Backend = sinkRes.Backend
-			err := svc.eventStore.CreateDeploymentEntry(sinkContext, data)
-			if err != nil {
-				svc.logger.Warn("failed to create deploymentEntry for sink, skipping", zap.String("sink-id", sinkRes.Id))
-				continue
-			}
-			err = svc.eventStore.UpdateSinkCache(ctx, data)
-			if err != nil {
-				svc.logger.Warn("failed to update cache for sink", zap.String("sink-id", sinkRes.Id))
-				continue
-			}
-			svc.logger.Info("successfully created deploymentEntry for sink", zap.String("sink-id", sinkRes.Id), zap.String("state", sinkRes.State))
-		}
-
-		isDeployed := false
-		if len(pods) > 0 {
-			for _, pod := range pods {
-				if strings.Contains(pod, sinkRes.Id) {
-					isDeployed = true
-					break
-				}
-			}
-		}
-		// if State is Active, deploy OtelCollector
-		if sinkRes.State == "active" && !isDeployed {
-			deploymentEntry, err := svc.eventStore.GetDeploymentEntryFromSinkId(sinkContext, sinkRes.Id)
-			if err != nil {
-				svc.logger.Warn("failed to fetch deploymentEntry for sink, skipping", zap.String("sink-id", sinkRes.Id), zap.Error(err))
-				continue
-			}
-			err = svc.kubecontrol.CreateOtelCollector(sinkContext, sinkRes.OwnerID, sinkRes.Id, deploymentEntry)
-			if err != nil {
-				svc.logger.Warn("failed to deploy OtelCollector for sink, skipping", zap.String("sink-id", sinkRes.Id), zap.Error(err))
-				continue
-			}
-			svc.logger.Info("successfully created otel collector for sink", zap.String("sink-id", sinkRes.Id))
-		}
-	}
-
 	go svc.subscribeToSinksEvents(ctx)
-	go svc.subscribeToSinkerEvents(ctx)
+	go svc.subscribeToSinkerIdleEvents(ctx)
+	go svc.subscribeToSinkerActivityEvents(ctx)
 
 	monitorCtx := context.WithValue(ctx, "routine", "monitor")
-	err = svc.monitor.Start(monitorCtx, cancelFunction)
+	err := svc.monitor.Start(monitorCtx, cancelFunction)
 	if err != nil {
 		svc.logger.Error("error during monitor routine start", zap.Error(err))
 		cancelFunction()
 		return err
 	}
+	svc.logger.Info("Maestro service started")
 
 	return nil
 }
 
+func (svc *maestroService) Stop() {
+	svc.serviceCancelFunc()
+	svc.logger.Info("Maestro service stopped")
+}
+
 func (svc *maestroService) subscribeToSinksEvents(ctx context.Context) {
-	if err := svc.eventStore.SubscribeSinksEvents(ctx); err != nil {
+	if err := svc.sinkListenerService.SubscribeSinksEvents(ctx); err != nil {
 		svc.logger.Error("Bootstrap service failed to subscribe to event sourcing", zap.Error(err))
-		return
 	}
 	svc.logger.Info("finished reading sinks events")
 	ctx.Done()
 }
 
-func (svc *maestroService) subscribeToSinkerEvents(ctx context.Context) {
-	if err := svc.eventStore.SubscribeSinkerEvents(ctx); err != nil {
+func (svc *maestroService) subscribeToSinkerIdleEvents(ctx context.Context) {
+	if err := svc.activityListener.SubscribeSinkerIdleEvents(ctx); err != nil {
 		svc.logger.Error("Bootstrap service failed to subscribe to event sourcing", zap.Error(err))
-		return
 	}
-	svc.logger.Info("finished reading sinker events")
-	ctx.Done()
+	svc.logger.Info("finished reading sinker_idle events")
+}
+
+func (svc *maestroService) subscribeToSinkerActivityEvents(ctx context.Context) {
+	if err := svc.activityListener.SubscribeSinkerActivityEvents(ctx); err != nil {
+		svc.logger.Error("Bootstrap service failed to subscribe to event sourcing", zap.Error(err))
+	}
+	svc.logger.Info("finished reading sinker_activity events")
 }
diff --git a/maestro/service/deploy_service.go b/maestro/service/deploy_service.go
new file mode 100644
index 000000000..09f4d5580
--- /dev/null
+++ b/maestro/service/deploy_service.go
@@ -0,0 +1,198 @@
+package service
+
+import (
+	"context"
+	"encoding/json"
+	maestroerrors "github.com/orb-community/orb/maestro/errors"
+	"github.com/orb-community/orb/pkg/types"
+	"github.com/orb-community/orb/sinks/pb"
+	"time"
+
+	"github.com/orb-community/orb/maestro/deployment"
+	maestroredis "github.com/orb-community/orb/maestro/redis"
+	"github.com/orb-community/orb/pkg/errors"
+	"go.uber.org/zap"
+)
+
+// EventService will hold the business logic of the handling events from both Listeners
+type EventService interface {
+	HandleSinkCreate(ctx context.Context, event maestroredis.SinksUpdateEvent) error
+	HandleSinkUpdate(ctx context.Context, event maestroredis.SinksUpdateEvent) error
+	HandleSinkDelete(ctx context.Context, event maestroredis.SinksUpdateEvent) error
+	HandleSinkActivity(ctx context.Context, event maestroredis.SinkerUpdateEvent) error
+	HandleSinkIdle(ctx context.Context, event maestroredis.SinkerUpdateEvent) error
+}
+
+type eventService struct {
+	logger            *zap.Logger
+	deploymentService deployment.Service
+	sinkGrpcClient    pb.SinkServiceClient
+	// Configuration for KafkaURL from Orb Deployment
+	kafkaUrl string
+}
+
+var _ EventService = (*eventService)(nil)
+
+func NewEventService(logger *zap.Logger, service deployment.Service, sinksGrpcClient *pb.SinkServiceClient) EventService {
+	namedLogger := logger.Named("deploy-service")
+	return &eventService{logger: namedLogger, deploymentService: service, sinkGrpcClient: *sinksGrpcClient}
+}
+
+// HandleSinkCreate will create deployment entry in postgres, will create deployment in Redis, to prepare for SinkActivity
+func (d *eventService) HandleSinkCreate(ctx context.Context, event maestroredis.SinksUpdateEvent) error {
+	d.logger.Debug("handling sink create event", zap.String("sink-id", event.SinkID), zap.String("owner-id", event.Owner))
+	// Create Deployment Entry
+	entry := deployment.NewDeployment(event.Owner, event.SinkID, event.Config, event.Backend)
+	// Use deploymentService, which will create deployment in both postgres and redis
+	err := d.deploymentService.CreateDeployment(ctx, &entry)
+	if err != nil {
+		d.logger.Error("error trying to create deployment entry", zap.Error(err))
+		return err
+	}
+	return nil
+}
+
+func (d *eventService) HandleSinkUpdate(ctx context.Context, event maestroredis.SinksUpdateEvent) error {
+	now := time.Now()
+	d.logger.Debug("handling sink update event", zap.String("sink-id", event.SinkID))
+	// check if exists deployment entry from postgres
+	entry, _, err := d.deploymentService.GetDeployment(ctx, event.Owner, event.SinkID)
+	if err != nil {
+		if err.Error() != "not found" {
+			d.logger.Error("error trying to get deployment entry", zap.Error(err))
+			return err
+		} else {
+			newEntry := deployment.NewDeployment(event.Owner, event.SinkID, event.Config, event.Backend)
+			err := d.deploymentService.CreateDeployment(ctx, &newEntry)
+			if err != nil {
+				d.logger.Error("error trying to recreate deployment entry", zap.Error(err))
+				return err
+			}
+			entry = &newEntry
+		}
+	}
+	// update deployment entry in postgres
+	err = entry.SetConfig(event.Config)
+	if err != nil {
+		return err
+	}
+	entry.LastCollectorStopTime = &now
+	entry.LastStatus = "unknown"
+	entry.LastStatusUpdate = &now
+	entry.LastErrorMessage = ""
+	entry.LastErrorTime = nil
+	err = d.deploymentService.UpdateDeployment(ctx, entry)
+
+	return nil
+}
+
+func (d *eventService) HandleSinkDelete(ctx context.Context, event maestroredis.SinksUpdateEvent) error {
+	d.logger.Debug("handling sink delete event", zap.String("sink-id", event.SinkID))
+	deploymentEntry, _, err := d.deploymentService.GetDeployment(ctx, event.Owner, event.SinkID)
+	if err != nil {
+		d.logger.Warn("did not find collector entry for sink", zap.String("sink-id", event.SinkID))
+		return err
+	}
+	if deploymentEntry.LastCollectorDeployTime == nil || deploymentEntry.LastCollectorDeployTime.Before(time.Now()) {
+		if deploymentEntry.LastCollectorStopTime == nil || deploymentEntry.LastCollectorStopTime.Before(time.Now()) {
+			d.logger.Warn("collector is not running, skipping")
+		}
+	}
+	err = d.deploymentService.RemoveDeployment(ctx, event.Owner, event.SinkID)
+	if err != nil {
+		d.logger.Warn("error removing deployment entry, deployment will be orphan", zap.Error(err))
+		return err
+	}
+	return nil
+}
+
+func (d *eventService) HandleSinkActivity(ctx context.Context, event maestroredis.SinkerUpdateEvent) error {
+	if event.State != "active" {
+		d.logger.Error("trying to deploy sink that is not active", zap.String("sink-id", event.SinkID),
+			zap.String("status", event.State))
+		return errors.New("trying to deploy sink that is not active")
+	}
+	deploymentEntry, _, err := d.deploymentService.GetDeployment(ctx, event.OwnerID, event.SinkID)
+	if err != nil {
+		if err == maestroerrors.NotFound {
+			d.logger.Info("did not find collector entry for sink, retrieving from sinks grpc", zap.String("sink-id", event.SinkID))
+			sink, err := d.sinkGrpcClient.RetrieveSink(ctx, &pb.SinkByIDReq{
+				SinkID:  event.SinkID,
+				OwnerID: event.OwnerID,
+			})
+			if err != nil {
+				d.logger.Error("error retrieving sink from grpc", zap.Error(err))
+				return err
+			}
+			metadata := make(map[string]interface{})
+			err = json.Unmarshal(sink.Config, &metadata)
+			if err != nil {
+				d.logger.Error("error unmarshalling sink metadata", zap.Error(err))
+				return err
+			}
+			newEntry := deployment.NewDeployment(event.OwnerID, event.SinkID, types.FromMap(metadata), sink.Backend)
+			err = d.deploymentService.CreateDeployment(ctx, &newEntry)
+			if err != nil {
+				d.logger.Error("error trying to recreate deployment entry", zap.Error(err))
+				return err
+			}
+			deploymentEntry, _, err = d.deploymentService.GetDeployment(ctx, event.OwnerID, event.SinkID)
+			if err != nil {
+				d.logger.Error("error trying to recreate deployment entry", zap.Error(err))
+				return err
+			}
+		} else {
+			d.logger.Warn("did not find collector entry for sink", zap.String("sink-id", event.SinkID))
+			return err
+		}
+	}
+	d.logger.Debug("handling sink activity event", zap.String("sink-id", event.SinkID), zap.String("deployment-status", deploymentEntry.LastStatus))
+	if deploymentEntry.LastStatus == "unknown" || deploymentEntry.LastStatus == "idle" {
+		// async update sink status to provisioning
+		go func() {
+			err := d.deploymentService.UpdateStatus(ctx, event.OwnerID, event.SinkID, "provisioning", "")
+			if err != nil {
+				d.logger.Error("error updating status to provisioning", zap.Error(err))
+			}
+		}()
+		_, err = d.deploymentService.NotifyCollector(ctx, event.OwnerID, event.SinkID, "deploy", "", "")
+		if err != nil {
+			d.logger.Error("error trying to notify collector", zap.Error(err))
+			err2 := d.deploymentService.UpdateStatus(ctx, event.OwnerID, event.SinkID, "provisioning_error", err.Error())
+			if err2 != nil {
+				d.logger.Warn("error during notifying provisioning error, customer will not be notified of error")
+				d.logger.Error("error during update provisioning error status", zap.Error(err))
+				return err
+			}
+			return err
+		}
+		return nil
+	} else {
+		d.logger.Warn("collector is already running, skipping", zap.String("last_status", deploymentEntry.LastStatus))
+		return nil
+	}
+}
+
+func (d *eventService) HandleSinkIdle(ctx context.Context, event maestroredis.SinkerUpdateEvent) error {
+	// check if exists deployment entry from postgres
+	d.logger.Debug("handling sink idle event", zap.String("sink-id", event.SinkID), zap.String("owner-id", event.OwnerID))
+	// async update sink status to idle
+	go func() {
+		err := d.deploymentService.UpdateStatus(ctx, event.OwnerID, event.SinkID, "idle", "")
+		if err != nil {
+			d.logger.Error("error updating status to idle", zap.Error(err))
+		}
+	}()
+	// dropping idle otel collector
+	_, err := d.deploymentService.NotifyCollector(ctx, event.OwnerID, event.SinkID, "delete", "idle", "")
+	if err != nil {
+		d.logger.Error("error trying to notify collector", zap.Error(err))
+		err2 := d.deploymentService.UpdateStatus(ctx, event.OwnerID, event.SinkID, "provisioning_error", err.Error())
+		if err2 != nil {
+			d.logger.Warn("error during notifying provisioning error, customer will not be notified of error")
+		}
+		return err
+	}
+
+	return nil
+}
diff --git a/maestro/service/handle_sinker_test.go b/maestro/service/handle_sinker_test.go
new file mode 100644
index 000000000..d5ccba856
--- /dev/null
+++ b/maestro/service/handle_sinker_test.go
@@ -0,0 +1,145 @@
+package service
+
+import (
+	"context"
+	"github.com/orb-community/orb/maestro/deployment"
+	"github.com/orb-community/orb/maestro/redis"
+	"github.com/orb-community/orb/pkg/types"
+	"github.com/stretchr/testify/require"
+	"go.uber.org/zap"
+	"testing"
+	"time"
+)
+
+func TestEventService_HandleSinkActivity(t *testing.T) {
+	t.Skip()
+	type args struct {
+		event redis.SinkerUpdateEvent
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantErr bool
+	}{
+		{
+			name: "activity on a sink that does not exist",
+			args: args{
+				event: redis.SinkerUpdateEvent{
+					OwnerID:   "owner1",
+					SinkID:    "sink1",
+					State:     "active",
+					Size:      "22",
+					Timestamp: time.Now(),
+				},
+			},
+			wantErr: true,
+		},
+		{
+			name: "activity success",
+			args: args{
+				event: redis.SinkerUpdateEvent{
+					OwnerID:   "owner2",
+					SinkID:    "sink22",
+					State:     "active",
+					Size:      "22",
+					Timestamp: time.Now(),
+				},
+			}, wantErr: false,
+		},
+	}
+	logger := zap.NewNop()
+	deploymentService := deployment.NewDeploymentService(logger, NewFakeRepository(logger), "kafka:9092",
+		"MY_SECRET", NewTestProducer(logger), NewTestKubeCtr(logger))
+	d := NewEventService(logger, deploymentService, nil)
+	err := d.HandleSinkCreate(context.Background(), redis.SinksUpdateEvent{
+		SinkID:  "sink22",
+		Owner:   "owner2",
+		Backend: "prometheus",
+		Config: types.Metadata{
+			"exporter": types.Metadata{
+				"remote_host": "https://acme.com/prom/push",
+			},
+			"authentication": types.Metadata{
+				"type":     "basicauth",
+				"username": "prom-user-2",
+				"password": "dbpass-2",
+			},
+		},
+	})
+	require.NoError(t, err, "should not error")
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ctx := context.WithValue(context.Background(), "test", tt.name)
+			if err := d.HandleSinkActivity(ctx, tt.args.event); (err != nil) != tt.wantErr {
+				t.Errorf("HandleSinkActivity() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}
+
+func TestEventService_HandleSinkIdle(t *testing.T) {
+	t.Skip()
+	type args struct {
+		event redis.SinkerUpdateEvent
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantErr bool
+	}{
+		{
+			name: "sink idle on a sink that does not exist",
+			args: args{
+				event: redis.SinkerUpdateEvent{
+					OwnerID:   "owner1",
+					SinkID:    "sink1",
+					State:     "idle",
+					Size:      "22",
+					Timestamp: time.Now(),
+				},
+			},
+			wantErr: true,
+		},
+		{
+			name: "sink idle success",
+			args: args{
+				event: redis.SinkerUpdateEvent{
+					OwnerID:   "owner2",
+					SinkID:    "sink222",
+					State:     "idle",
+					Size:      "22",
+					Timestamp: time.Now(),
+				},
+			}, wantErr: false,
+		},
+	}
+	logger := zap.NewNop()
+	deploymentService := deployment.NewDeploymentService(logger, NewFakeRepository(logger), "kafka:9092", "MY_SECRET", NewTestProducer(logger),
+		NewTestKubeCtr(logger))
+	v := NewSinksPb(logger)
+	d := NewEventService(logger, deploymentService, &v)
+	err := d.HandleSinkCreate(context.Background(), redis.SinksUpdateEvent{
+		SinkID:  "sink222",
+		Owner:   "owner2",
+		Backend: "prometheus",
+		Config: types.Metadata{
+			"exporter": types.Metadata{
+				"remote_host": "https://acme.com/prom/push",
+			},
+			"authentication": types.Metadata{
+				"type":     "basicauth",
+				"username": "prom-user-2",
+				"password": "dbpass-2",
+			},
+		},
+	})
+	require.NoError(t, err, "should not error")
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ctx := context.WithValue(context.Background(), "test", tt.name)
+			if err := d.HandleSinkIdle(ctx, tt.args.event); (err != nil) != tt.wantErr {
+				t.Errorf("HandleSinkIdle() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}
diff --git a/maestro/service/handle_sinks_test.go b/maestro/service/handle_sinks_test.go
new file mode 100644
index 000000000..a2e46e940
--- /dev/null
+++ b/maestro/service/handle_sinks_test.go
@@ -0,0 +1,223 @@
+package service
+
+import (
+	"context"
+	"github.com/orb-community/orb/maestro/deployment"
+	"github.com/orb-community/orb/maestro/redis"
+	"github.com/orb-community/orb/pkg/types"
+	"github.com/stretchr/testify/require"
+	"go.uber.org/zap"
+	"testing"
+	"time"
+)
+
+func Test_eventService_HandleSinkCreate(t *testing.T) {
+	t.Skip()
+	type args struct {
+		event redis.SinksUpdateEvent
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantErr bool
+	}{
+		{
+			name: "create event",
+			args: args{
+				event: redis.SinksUpdateEvent{
+					SinkID: "crt-sink1",
+					Owner:  "owner1",
+					Config: types.Metadata{
+						"exporter": types.Metadata{
+							"remote_host": "https://acme.com/prom/push",
+						},
+						"authentication": types.Metadata{
+							"type":     "basicauth",
+							"username": "prom-user",
+							"password": "dbpass",
+						},
+					},
+					Backend:   "prometheus",
+					Timestamp: time.Now(),
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "create event without config",
+			args: args{
+				event: redis.SinksUpdateEvent{
+					SinkID:    "crt-sink1",
+					Owner:     "owner1",
+					Config:    nil,
+					Backend:   "prometheus",
+					Timestamp: time.Now(),
+				},
+			},
+			wantErr: true,
+		},
+	}
+	logger := zap.NewNop()
+	deploymentService := deployment.NewDeploymentService(logger, NewFakeRepository(logger), "kafka:9092", "MY_SECRET", NewTestProducer(logger), nil)
+	d := NewEventService(logger, deploymentService, nil)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ctx := context.WithValue(context.Background(), "test", tt.name)
+			if err := d.HandleSinkCreate(ctx, tt.args.event); (err != nil) != tt.wantErr {
+				t.Errorf("HandleSinkCreate() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}
+
+func TestEventService_HandleSinkUpdate(t *testing.T) {
+	t.Skip()
+	type args struct {
+		event redis.SinksUpdateEvent
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantErr bool
+	}{
+		{
+			name: "update event when there is none in db",
+			args: args{
+				event: redis.SinksUpdateEvent{
+					SinkID: "upd-sink1",
+					Owner:  "owner1",
+					Config: types.Metadata{
+						"exporter": types.Metadata{
+							"remote_host": "https://acme.com/prom/push",
+						},
+						"authentication": types.Metadata{
+							"type":     "basicauth",
+							"username": "prom-user",
+							"password": "dbpass",
+						},
+					},
+					Backend:   "prometheus",
+					Timestamp: time.Now(),
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "update event success",
+			args: args{
+				event: redis.SinksUpdateEvent{
+					SinkID:  "upd-sink1",
+					Owner:   "owner1",
+					Backend: "prometheus",
+					Config: types.Metadata{
+						"exporter": types.Metadata{
+							"remote_host": "https://acme.com/prom/push",
+						},
+						"authentication": types.Metadata{
+							"type":     "basicauth",
+							"username": "prom-user-2",
+							"password": "dbpass-2",
+						},
+					},
+					Timestamp: time.Now(),
+				},
+			},
+			wantErr: false,
+		},
+	}
+	logger := zap.NewNop()
+	deploymentService := deployment.NewDeploymentService(logger, NewFakeRepository(logger), "kafka:9092", "MY_SECRET", NewTestProducer(logger),
+		NewTestKubeCtr(logger))
+	v := NewSinksPb(logger)
+	d := NewEventService(logger, deploymentService, &v)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ctx := context.WithValue(context.Background(), "test", tt.name)
+			if err := d.HandleSinkUpdate(ctx, tt.args.event); (err != nil) != tt.wantErr {
+				t.Errorf("HandleSinkUpdate() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}
+
+func TestEventService_HandleSinkDelete(t *testing.T) {
+	t.Skip()
+	type args struct {
+		event redis.SinksUpdateEvent
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantErr bool
+	}{
+		{
+			name: "delete event when there is none in db",
+			args: args{
+				event: redis.SinksUpdateEvent{
+					SinkID:  "sink1",
+					Owner:   "owner1",
+					Backend: "prometheus",
+					Config: types.Metadata{
+						"exporter": types.Metadata{
+							"remote_host": "https://acme.com/prom/push",
+						},
+						"authentication": types.Metadata{
+							"type":     "basicauth",
+							"username": "prom-user-2",
+							"password": "dbpass-2",
+						},
+					},
+				},
+			},
+			wantErr: true,
+		},
+		{
+			name: "delete event success",
+			args: args{
+				event: redis.SinksUpdateEvent{
+					SinkID:  "sink2-1",
+					Owner:   "owner2",
+					Backend: "prometheus",
+					Config: types.Metadata{
+						"exporter": types.Metadata{
+							"remote_host": "https://acme.com/prom/push",
+						},
+						"authentication": types.Metadata{
+							"type":     "basicauth",
+							"username": "prom-user-2",
+							"password": "dbpass-2",
+						},
+					},
+				},
+			},
+			wantErr: false,
+		},
+	}
+	logger := zap.NewNop()
+	deploymentService := deployment.NewDeploymentService(logger, NewFakeRepository(logger), "kafka:9092", "MY_SECRET", NewTestProducer(logger), nil)
+	d := NewEventService(logger, deploymentService, nil)
+	err := d.HandleSinkCreate(context.Background(), redis.SinksUpdateEvent{
+		SinkID:  "sink2-1",
+		Owner:   "owner2",
+		Backend: "prometheus",
+		Config: types.Metadata{
+			"exporter": types.Metadata{
+				"remote_host": "https://acme.com/prom/push",
+			},
+			"authentication": types.Metadata{
+				"type":     "basicauth",
+				"username": "prom-user-2",
+				"password": "dbpass-2",
+			},
+		},
+	})
+	require.NoError(t, err, "should not error")
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ctx := context.WithValue(context.Background(), "test", tt.name)
+			if err := d.HandleSinkDelete(ctx, tt.args.event); (err != nil) != tt.wantErr {
+				t.Errorf("HandleSinkDelete() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}
diff --git a/maestro/service/kubectr_test.go b/maestro/service/kubectr_test.go
new file mode 100644
index 000000000..fb449a8cc
--- /dev/null
+++ b/maestro/service/kubectr_test.go
@@ -0,0 +1,24 @@
+package service
+
+import (
+	"context"
+	"github.com/orb-community/orb/maestro/kubecontrol"
+	"go.uber.org/zap"
+)
+
+type testKubeCtr struct {
+	logger *zap.Logger
+}
+
+func NewTestKubeCtr(logger *zap.Logger) kubecontrol.Service {
+	return &testKubeCtr{logger: logger}
+}
+
+func (t *testKubeCtr) CreateOtelCollector(ctx context.Context, ownerID, sinkID, deploymentEntry string) (string, error) {
+	name := "test-collector"
+	return name, nil
+}
+
+func (t *testKubeCtr) KillOtelCollector(ctx context.Context, deploymentName, sinkID string) error {
+	return nil
+}
diff --git a/maestro/service/metrics_middleware.go b/maestro/service/metrics_middleware.go
new file mode 100644
index 000000000..81f8d8df5
--- /dev/null
+++ b/maestro/service/metrics_middleware.go
@@ -0,0 +1,85 @@
+package service
+
+import (
+	"context"
+	"github.com/go-kit/kit/metrics"
+	maestroredis "github.com/orb-community/orb/maestro/redis"
+	"go.uber.org/zap"
+	"time"
+)
+
+type tracingService struct {
+	logger      *zap.Logger
+	counter     metrics.Counter
+	latency     metrics.Histogram
+	nextService EventService
+}
+
+func NewTracingService(logger *zap.Logger, service EventService, counter metrics.Counter, latency metrics.Histogram) EventService {
+	return &tracingService{logger: logger, nextService: service, counter: counter, latency: latency}
+}
+
+func (t *tracingService) HandleSinkCreate(ctx context.Context, event maestroredis.SinksUpdateEvent) error {
+	defer func(begun time.Time) {
+		labels := []string{
+			"method", "HandleSinkCreate",
+			"sink_id", event.SinkID,
+			"owner_id", event.Owner,
+		}
+		t.counter.With(labels...).Add(1)
+		t.latency.With(labels...).Observe(float64(time.Since(begun).Microseconds()))
+	}(time.Now())
+	return t.nextService.HandleSinkCreate(ctx, event)
+}
+
+func (t *tracingService) HandleSinkUpdate(ctx context.Context, event maestroredis.SinksUpdateEvent) error {
+	defer func(begun time.Time) {
+		labels := []string{
+			"method", "HandleSinkCreate",
+			"sink_id", event.SinkID,
+			"owner_id", event.Owner,
+		}
+		t.counter.With(labels...).Add(1)
+		t.latency.With(labels...).Observe(float64(time.Since(begun).Microseconds()))
+	}(time.Now())
+	return t.nextService.HandleSinkUpdate(ctx, event)
+}
+
+func (t *tracingService) HandleSinkDelete(ctx context.Context, event maestroredis.SinksUpdateEvent) error {
+	defer func(begun time.Time) {
+		labels := []string{
+			"method", "HandleSinkCreate",
+			"sink_id", event.SinkID,
+			"owner_id", event.Owner,
+		}
+		t.counter.With(labels...).Add(1)
+		t.latency.With(labels...).Observe(float64(time.Since(begun).Microseconds()))
+	}(time.Now())
+	return t.nextService.HandleSinkDelete(ctx, event)
+}
+
+func (t *tracingService) HandleSinkActivity(ctx context.Context, event maestroredis.SinkerUpdateEvent) error {
+	defer func(begun time.Time) {
+		labels := []string{
+			"method", "HandleSinkCreate",
+			"sink_id", event.SinkID,
+			"owner_id", event.OwnerID,
+		}
+		t.counter.With(labels...).Add(1)
+		t.latency.With(labels...).Observe(float64(time.Since(begun).Microseconds()))
+	}(time.Now())
+	return t.nextService.HandleSinkActivity(ctx, event)
+}
+
+func (t *tracingService) HandleSinkIdle(ctx context.Context, event maestroredis.SinkerUpdateEvent) error {
+	defer func(begun time.Time) {
+		labels := []string{
+			"method", "HandleSinkCreate",
+			"sink_id", event.SinkID,
+			"owner_id", event.OwnerID,
+		}
+		t.counter.With(labels...).Add(1)
+		t.latency.With(labels...).Observe(float64(time.Since(begun).Microseconds()))
+	}(time.Now())
+	return t.nextService.HandleSinkIdle(ctx, event)
+}
diff --git a/maestro/service/pbmock_test.go b/maestro/service/pbmock_test.go
new file mode 100644
index 000000000..057b97c50
--- /dev/null
+++ b/maestro/service/pbmock_test.go
@@ -0,0 +1,26 @@
+package service
+
+import (
+	"context"
+	"github.com/orb-community/orb/sinks/pb"
+	"go.uber.org/zap"
+	"google.golang.org/grpc"
+)
+
+type mockSinksPb struct {
+	logger *zap.Logger
+}
+
+func NewSinksPb(logger *zap.Logger) pb.SinkServiceClient {
+	return &mockSinksPb{logger: logger}
+}
+
+var _ pb.SinkServiceClient = (*mockSinksPb)(nil)
+
+func (m mockSinksPb) RetrieveSink(ctx context.Context, in *pb.SinkByIDReq, opts ...grpc.CallOption) (*pb.SinkRes, error) {
+	return nil, nil
+}
+
+func (m mockSinksPb) RetrieveSinks(ctx context.Context, in *pb.SinksFilterReq, opts ...grpc.CallOption) (*pb.SinksRes, error) {
+	return nil, nil
+}
diff --git a/maestro/service/producer_test.go b/maestro/service/producer_test.go
new file mode 100644
index 000000000..e108b1bfa
--- /dev/null
+++ b/maestro/service/producer_test.go
@@ -0,0 +1,19 @@
+package service
+
+import (
+	"context"
+	"github.com/orb-community/orb/maestro/redis/producer"
+	"go.uber.org/zap"
+)
+
+type testProducer struct {
+	logger *zap.Logger
+}
+
+func NewTestProducer(logger *zap.Logger) producer.Producer {
+	return &testProducer{logger: logger}
+}
+
+func (t *testProducer) PublishSinkStatus(_ context.Context, _ string, _ string, _ string, _ string) error {
+	return nil
+}
diff --git a/maestro/service/repository_test.go b/maestro/service/repository_test.go
new file mode 100644
index 000000000..13e89518b
--- /dev/null
+++ b/maestro/service/repository_test.go
@@ -0,0 +1,79 @@
+package service
+
+import (
+	"context"
+	"errors"
+	"github.com/orb-community/orb/maestro/deployment"
+	"go.uber.org/zap"
+)
+
+type fakeRepository struct {
+	logger       *zap.Logger
+	inMemoryDict map[string]*deployment.Deployment
+}
+
+func NewFakeRepository(logger *zap.Logger) deployment.Repository {
+	return &fakeRepository{logger: logger, inMemoryDict: make(map[string]*deployment.Deployment)}
+}
+
+func (f *fakeRepository) FetchAll(ctx context.Context) ([]deployment.Deployment, error) {
+	var allDeployments []deployment.Deployment
+	for _, deploy := range f.inMemoryDict {
+		copy := copyDeploy(deploy)
+		allDeployments = append(allDeployments, copy)
+	}
+	return allDeployments, nil
+}
+
+func (f *fakeRepository) Add(_ context.Context, deployment *deployment.Deployment) (*deployment.Deployment, error) {
+	deployment.Id = "fake-id"
+	copy := copyDeploy(deployment)
+	f.inMemoryDict[deployment.SinkID] = &copy
+	return deployment, nil
+}
+
+func (f *fakeRepository) Update(_ context.Context, deployment *deployment.Deployment) (*deployment.Deployment, error) {
+	copy := copyDeploy(deployment)
+	f.inMemoryDict[deployment.SinkID] = &copy
+	return deployment, nil
+}
+
+func (f *fakeRepository) UpdateStatus(_ context.Context, _ string, _ string, _ string, _ string) error {
+	return nil
+}
+
+func (f *fakeRepository) Remove(_ context.Context, _ string, sinkId string) error {
+	delete(f.inMemoryDict, sinkId)
+	return nil
+}
+
+func (f *fakeRepository) FindByOwnerAndSink(ctx context.Context, _ string, sinkId string) (*deployment.Deployment, error) {
+	deploy, ok := f.inMemoryDict[sinkId]
+	if ok {
+		copy := copyDeploy(deploy)
+		return &copy, nil
+	}
+	return nil, errors.New("not found")
+}
+
+func (f *fakeRepository) FindByCollectorName(_ context.Context, _ string) (*deployment.Deployment, error) {
+	return nil, nil
+}
+
+func copyDeploy(src *deployment.Deployment) deployment.Deployment {
+	deploy := deployment.Deployment{
+		Id:                      src.Id,
+		OwnerID:                 src.OwnerID,
+		SinkID:                  src.SinkID,
+		Backend:                 src.Backend,
+		Config:                  src.Config,
+		LastStatus:              src.LastStatus,
+		LastStatusUpdate:        src.LastStatusUpdate,
+		LastErrorMessage:        src.LastErrorMessage,
+		LastErrorTime:           src.LastErrorTime,
+		CollectorName:           src.CollectorName,
+		LastCollectorDeployTime: src.LastCollectorDeployTime,
+		LastCollectorStopTime:   src.LastCollectorStopTime,
+	}
+	return deploy
+}
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 56c0eb8ca..0ebf319ba 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -65,6 +65,7 @@ type BaseSvcConfig struct {
 	HttpPort       string `mapstructure:"http_port"`
 	HttpServerCert string `mapstructure:"server_cert"`
 	HttpServerKey  string `mapstructure:"server_key"`
+	EncryptionKey  string `mapstructure:"encryption_key"`
 }
 
 type PostgresConfig struct {
diff --git a/policies/api/grpc/client.go b/policies/api/grpc/client.go
index e367af3e1..2845fafb4 100644
--- a/policies/api/grpc/client.go
+++ b/policies/api/grpc/client.go
@@ -66,10 +66,10 @@ func (client grpcClient) RetrievePolicy(ctx context.Context, in *pb.PolicyByIDRe
 	}
 
 	ir := res.(policyRes)
-	return &pb.PolicyRes{Id: ir.id, Name: ir.name, Data: ir.data, Backend: ir.backend, Version: ir.version}, nil
+	return &pb.PolicyRes{Id: ir.id, Name: ir.name, Data: ir.data, Backend: ir.backend, Format: ir.format, Version: ir.version}, nil
 }
 
-func (client grpcClient) RetrievePoliciesByGroups(ctx context.Context, in *pb.PoliciesByGroupsReq, opts ...grpc.CallOption) (*pb.PolicyInDSListRes, error) {
+func (client grpcClient) RetrievePoliciesByGroups(ctx context.Context, in *pb.PoliciesByGroupsReq, _ ...grpc.CallOption) (*pb.PolicyInDSListRes, error) {
 	ctx, cancel := context.WithTimeout(ctx, client.timeout)
 	defer cancel()
 
@@ -86,7 +86,16 @@ func (client grpcClient) RetrievePoliciesByGroups(ctx context.Context, in *pb.Po
 
 	plist := make([]*pb.PolicyInDSRes, len(ir.policies))
 	for i, p := range ir.policies {
-		plist[i] = &pb.PolicyInDSRes{Id: p.id, Name: p.name, Data: p.data, Backend: p.backend, Version: p.version, DatasetId: p.datasetID, AgentGroupId: p.agentGroupID}
+		plist[i] = &pb.PolicyInDSRes{
+			Id:           p.id,
+			Name:         p.name,
+			Data:         p.data,
+			Backend:      p.backend,
+			Version:      p.version,
+			DatasetId:    p.datasetID,
+			AgentGroupId: p.agentGroupID,
+			Format:       p.format,
+		}
 	}
 	return &pb.PolicyInDSListRes{Policies: plist}, nil
 }
@@ -164,7 +173,7 @@ func encodeRetrieveDatasetRequest(_ context.Context, grpcReq interface{}) (inter
 }
 func decodePolicyResponse(_ context.Context, grpcRes interface{}) (interface{}, error) {
 	res := grpcRes.(*pb.PolicyRes)
-	return policyRes{id: res.GetId(), name: res.GetName(), data: res.GetData(), version: res.GetVersion(), backend: res.GetBackend()}, nil
+	return policyRes{id: res.GetId(), name: res.GetName(), data: res.GetData(), version: res.GetVersion(), backend: res.GetBackend(), format: res.GetFormat()}, nil
 }
 
 func decodeDatasetResponse(_ context.Context, grpcRes interface{}) (interface{}, error) {
@@ -181,7 +190,15 @@ func decodePolicyListResponse(_ context.Context, grpcRes interface{}) (interface
 	res := grpcRes.(*pb.PolicyInDSListRes)
 	policies := make([]policyInDSRes, len(res.Policies))
 	for i, p := range res.Policies {
-		policies[i] = policyInDSRes{id: p.GetId(), name: p.GetName(), data: p.GetData(), version: p.GetVersion(), backend: p.GetBackend(), datasetID: p.GetDatasetId(), agentGroupID: p.GetAgentGroupId()}
+		policies[i] = policyInDSRes{id: p.GetId(),
+			name:         p.GetName(),
+			data:         p.GetData(),
+			version:      p.GetVersion(),
+			backend:      p.GetBackend(),
+			datasetID:    p.GetDatasetId(),
+			agentGroupID: p.GetAgentGroupId(),
+			format:       p.GetFormat(),
+		}
 	}
 	return policyInDSListRes{policies: policies}, nil
 }
diff --git a/policies/api/grpc/endpoint.go b/policies/api/grpc/endpoint.go
index f8e3c2605..b50cf3849 100644
--- a/policies/api/grpc/endpoint.go
+++ b/policies/api/grpc/endpoint.go
@@ -11,9 +11,9 @@ package grpc
 import (
 	"context"
 	"encoding/json"
-	"github.com/orb-community/orb/policies"
-
 	"github.com/go-kit/kit/endpoint"
+	"github.com/orb-community/orb/policies"
+	"gopkg.in/yaml.v3"
 )
 
 func retrievePolicyEndpoint(svc policies.Service) endpoint.Endpoint {
@@ -27,13 +27,15 @@ func retrievePolicyEndpoint(svc policies.Service) endpoint.Endpoint {
 		if err != nil {
 			return policyRes{}, err
 		}
-		data, err := json.Marshal(policy.Policy)
+		data, format, err := extractData(policy)
 		if err != nil {
 			return policyRes{}, err
 		}
+
 		return policyRes{
 			id:      policy.ID,
 			name:    policy.Name.String(),
+			format:  format,
 			backend: policy.Backend,
 			version: policy.Version,
 			data:    data,
@@ -41,6 +43,20 @@ func retrievePolicyEndpoint(svc policies.Service) endpoint.Endpoint {
 	}
 }
 
+func extractData(policy policies.Policy) (data []byte, format string, err error) {
+	if policy.Format == "yaml" {
+		data, err = yaml.Marshal(policy.Policy)
+		format = "yaml"
+	} else {
+		data, err = json.Marshal(policy.Policy)
+		format = "json"
+	}
+	if err != nil {
+		return nil, "", err
+	}
+	return data, format, nil
+}
+
 func retrievePoliciesByGroupsEndpoint(svc policies.Service) endpoint.Endpoint {
 	return func(ctx context.Context, request interface{}) (interface{}, error) {
 		req := request.(accessByGroupIDReq)
@@ -54,7 +70,7 @@ func retrievePoliciesByGroupsEndpoint(svc policies.Service) endpoint.Endpoint {
 		}
 		policies := make([]policyInDSRes, len(plist))
 		for i, policy := range plist {
-			data, err := json.Marshal(policy.Policy.Policy)
+			data, format, err := extractData(policy.Policy)
 			if err != nil {
 				return policyInDSListRes{}, err
 			}
@@ -63,6 +79,7 @@ func retrievePoliciesByGroupsEndpoint(svc policies.Service) endpoint.Endpoint {
 				name:         policy.Name.String(),
 				backend:      policy.Backend,
 				version:      policy.Version,
+				format:       format,
 				data:         data,
 				datasetID:    policy.DatasetID,
 				agentGroupID: policy.AgentGroupID,
diff --git a/policies/api/grpc/responses.go b/policies/api/grpc/responses.go
index bcc9e6dac..de3ab30ce 100644
--- a/policies/api/grpc/responses.go
+++ b/policies/api/grpc/responses.go
@@ -14,6 +14,7 @@ type policyRes struct {
 	backend string
 	version int32
 	data    []byte
+	format  string
 }
 
 type policyInDSRes struct {
@@ -24,6 +25,7 @@ type policyInDSRes struct {
 	data         []byte
 	datasetID    string
 	agentGroupID string
+	format       string
 }
 
 type policyInDSListRes struct {
diff --git a/policies/api/grpc/server.go b/policies/api/grpc/server.go
index e64f0a4c5..0e7403a64 100644
--- a/policies/api/grpc/server.go
+++ b/policies/api/grpc/server.go
@@ -12,6 +12,7 @@ import (
 	"context"
 	"github.com/orb-community/orb/policies"
 	"github.com/orb-community/orb/policies/pb"
+	"go.uber.org/zap"
 
 	kitot "github.com/go-kit/kit/tracing/opentracing"
 	kitgrpc "github.com/go-kit/kit/transport/grpc"
@@ -123,15 +124,25 @@ func encodePolicyResponse(_ context.Context, grpcRes interface{}) (interface{},
 		Backend: res.backend,
 		Version: res.version,
 		Data:    res.data,
+		Format:  res.format,
 	}, nil
 }
 
 func encodePolicyInDSListResponse(_ context.Context, grpcRes interface{}) (interface{}, error) {
 	res := grpcRes.(policyInDSListRes)
-
 	plist := make([]*pb.PolicyInDSRes, len(res.policies))
+	l, _ := zap.NewDevelopment()
 	for i, p := range res.policies {
-		plist[i] = &pb.PolicyInDSRes{Id: p.id, Name: p.name, Data: p.data, Backend: p.backend, Version: p.version, DatasetId: p.datasetID, AgentGroupId: p.agentGroupID}
+		l.Debug("policy format", zap.String("format", p.format), zap.String("policy_id", p.id))
+		plist[i] = &pb.PolicyInDSRes{Id: p.id,
+			Name:         p.name,
+			Data:         p.data,
+			Backend:      p.backend,
+			Version:      p.version,
+			DatasetId:    p.datasetID,
+			AgentGroupId: p.agentGroupID,
+			Format:       p.format,
+		}
 	}
 	return &pb.PolicyInDSListRes{Policies: plist}, nil
 }
diff --git a/policies/api/grpc/setup_test.go b/policies/api/grpc/setup_test.go
index bc7f0beb3..369a8f59c 100644
--- a/policies/api/grpc/setup_test.go
+++ b/policies/api/grpc/setup_test.go
@@ -19,6 +19,7 @@ import (
 	"github.com/orb-community/orb/policies/mocks"
 	"github.com/orb-community/orb/policies/pb"
 	sinkmocks "github.com/orb-community/orb/sinks/mocks"
+	"go.uber.org/zap"
 	"net"
 	"os"
 	"testing"
@@ -84,6 +85,7 @@ func newService(tokens map[string]string) policies.Service {
 
 	fleetGrpcClient := flmocks.NewClient()
 	SinkServiceClient := sinkmocks.NewClient()
+	logger := zap.NewNop()
 
-	return policies.New(nil, auth, repo, fleetGrpcClient, SinkServiceClient)
+	return policies.New(logger, auth, repo, fleetGrpcClient, SinkServiceClient)
 }
diff --git a/policies/api/http/endpoint.go b/policies/api/http/endpoint.go
index 0f6a183dd..8130c830e 100644
--- a/policies/api/http/endpoint.go
+++ b/policies/api/http/endpoint.go
@@ -125,6 +125,7 @@ func listPoliciesEndpoint(svc policies.Service) endpoint.Endpoint {
 				Description:   *ag.Description,
 				Version:       ag.Version,
 				Backend:       ag.Backend,
+				Format:        ag.Format,
 				SchemaVersion: ag.SchemaVersion,
 				LastModified:  ag.LastModified,
 				Created:       ag.Created,
diff --git a/policies/api/http/endpoint_test.go b/policies/api/http/endpoint_test.go
index c2cf39276..d8cfb2568 100644
--- a/policies/api/http/endpoint_test.go
+++ b/policies/api/http/endpoint_test.go
@@ -23,6 +23,7 @@ import (
 	sinkmocks "github.com/orb-community/orb/sinks/mocks"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/zap"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -116,8 +117,9 @@ func newService(auth mainflux.AuthServiceClient) policies.Service {
 	policyRepo := plmocks.NewPoliciesRepository()
 	fleetGrpcClient := flmocks.NewClient()
 	SinkServiceClient := sinkmocks.NewClient()
+	logger := zap.NewNop()
 
-	return policies.New(nil, auth, policyRepo, fleetGrpcClient, SinkServiceClient)
+	return policies.New(logger, auth, policyRepo, fleetGrpcClient, SinkServiceClient)
 }
 
 func newServer(svc policies.Service) *httptest.Server {
diff --git a/policies/api/http/logging.go b/policies/api/http/logging.go
index 89de0a412..ad35bf933 100644
--- a/policies/api/http/logging.go
+++ b/policies/api/http/logging.go
@@ -25,7 +25,7 @@ func (l loggingMiddleware) ListDatasetsByGroupIDInternal(ctx context.Context, gr
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: list_datasets_by_group_id_internal",
+			l.logger.Debug("method call: list_datasets_by_group_id_internal",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -39,7 +39,7 @@ func (l loggingMiddleware) RemoveAllDatasetsByPolicyIDInternal(ctx context.Conte
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: remove_all_datasets_by_policy_id_internal",
+			l.logger.Debug("method call: remove_all_datasets_by_policy_id_internal",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -53,7 +53,7 @@ func (l loggingMiddleware) InactivateDatasetByIDInternal(ctx context.Context, ow
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: inactivate_dataset_by_id_internal",
+			l.logger.Debug("method call: inactivate_dataset_by_id_internal",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -67,7 +67,7 @@ func (l loggingMiddleware) ViewDatasetByIDInternal(ctx context.Context, ownerID
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: view_dataset_by_id_internal",
+			l.logger.Debug("method call: view_dataset_by_id_internal",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -81,7 +81,7 @@ func (l loggingMiddleware) RemoveDataset(ctx context.Context, token string, dsID
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: remove_dataset",
+			l.logger.Debug("method call: remove_dataset",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -95,7 +95,7 @@ func (l loggingMiddleware) EditDataset(ctx context.Context, token string, ds pol
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: edit_dataset",
+			l.logger.Debug("method call: edit_dataset",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -109,7 +109,7 @@ func (l loggingMiddleware) RemovePolicy(ctx context.Context, token string, polic
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: remove_policy",
+			l.logger.Debug("method call: remove_policy",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -123,7 +123,7 @@ func (l loggingMiddleware) ListDatasetsByPolicyIDInternal(ctx context.Context, p
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: list_dataset_by_policy_id",
+			l.logger.Debug("method call: list_dataset_by_policy_id",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -137,7 +137,7 @@ func (l loggingMiddleware) EditPolicy(ctx context.Context, token string, pol pol
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: edit_policy",
+			l.logger.Debug("method call: edit_policy",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -151,7 +151,7 @@ func (l loggingMiddleware) AddPolicy(ctx context.Context, token string, p polici
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: add_policy",
+			l.logger.Debug("method call: add_policy",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -165,7 +165,7 @@ func (l loggingMiddleware) ViewPolicyByID(ctx context.Context, token string, pol
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: view_policy_by_id",
+			l.logger.Debug("method call: view_policy_by_id",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -179,7 +179,7 @@ func (l loggingMiddleware) ListPolicies(ctx context.Context, token string, pm po
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: list_policies",
+			l.logger.Debug("method call: list_policies",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -193,7 +193,7 @@ func (l loggingMiddleware) ViewPolicyByIDInternal(ctx context.Context, policyID
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: view_policy_by_id_internal",
+			l.logger.Debug("method call: view_policy_by_id_internal",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -207,7 +207,7 @@ func (l loggingMiddleware) ListPoliciesByGroupIDInternal(ctx context.Context, gr
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: list_policies_by_groups",
+			l.logger.Debug("method call: list_policies_by_groups",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -221,7 +221,7 @@ func (l loggingMiddleware) AddDataset(ctx context.Context, token string, d polic
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: add_dataset",
+			l.logger.Debug("method call: add_dataset",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -235,7 +235,7 @@ func (l loggingMiddleware) InactivateDatasetByGroupID(ctx context.Context, group
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: inactivate_dataset",
+			l.logger.Debug("method call: inactivate_dataset",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -249,7 +249,7 @@ func (l loggingMiddleware) ValidatePolicy(ctx context.Context, token string, p p
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: validate_policy",
+			l.logger.Debug("method call: validate_policy",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -263,7 +263,7 @@ func (l loggingMiddleware) ValidateDataset(ctx context.Context, token string, d
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: validate_dataset",
+			l.logger.Debug("method call: validate_dataset",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -277,7 +277,7 @@ func (l loggingMiddleware) ViewDatasetByID(ctx context.Context, token string, da
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: view_dataset_by_id",
+			l.logger.Debug("method call: view_dataset_by_id",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -291,7 +291,7 @@ func (l loggingMiddleware) ListDatasets(ctx context.Context, token string, pm po
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: list_dataset",
+			l.logger.Debug("method call: list_dataset",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -305,7 +305,7 @@ func (l loggingMiddleware) DeleteSinkFromAllDatasetsInternal(ctx context.Context
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: delete_sink_from_all_datasets",
+			l.logger.Debug("method call: delete_sink_from_all_datasets",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -319,7 +319,7 @@ func (l loggingMiddleware) DeleteAgentGroupFromAllDatasets(ctx context.Context,
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: delete_agent_group_from_all_datasets",
+			l.logger.Debug("method call: delete_agent_group_from_all_datasets",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -333,7 +333,7 @@ func (l loggingMiddleware) DuplicatePolicy(ctx context.Context, token string, po
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: duplicate_policy",
+			l.logger.Debug("method call: duplicate_policy",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
diff --git a/policies/backend/otel/otel.go b/policies/backend/otel/otel.go
new file mode 100644
index 000000000..559d7ae0c
--- /dev/null
+++ b/policies/backend/otel/otel.go
@@ -0,0 +1,40 @@
+package otel
+
+import (
+	"errors"
+	"github.com/orb-community/orb/pkg/types"
+	"github.com/orb-community/orb/policies/backend"
+	"go.uber.org/zap"
+	"gopkg.in/yaml.v3"
+	"strings"
+)
+
+type otelBackend struct {
+	version string
+	logger  *zap.Logger
+}
+
+func (o otelBackend) SupportsFormat(format string) bool {
+	return strings.EqualFold(format, "yaml")
+}
+
+func (o otelBackend) ConvertFromFormat(format string, policy string) (metadata types.Metadata, err error) {
+	if !o.SupportsFormat(format) {
+		return nil, errors.New("unsupported format")
+	}
+	o.logger.Info("converting policy from yaml", zap.String("policy", policy), zap.String("format", format))
+	err = yaml.Unmarshal([]byte(policy), &metadata)
+	return
+}
+
+// Validate Will not validate anything until we have a better way to do this
+func (o otelBackend) Validate(_ types.Metadata) error {
+	// block everything related to the exporter tag, this is not supported
+	return nil
+}
+
+func Register(logger *zap.Logger) bool {
+	l := logger.Named("otel-backend")
+	backend.Register("otel", &otelBackend{logger: l})
+	return true
+}
diff --git a/policies/pb/policies.pb.go b/policies/pb/policies.pb.go
index 767c80859..4a33e6993 100644
--- a/policies/pb/policies.pb.go
+++ b/policies/pb/policies.pb.go
@@ -250,6 +250,7 @@ type PolicyRes struct {
 	Backend string `protobuf:"bytes,3,opt,name=backend,proto3" json:"backend,omitempty"`
 	Version int32  `protobuf:"varint,4,opt,name=version,proto3" json:"version,omitempty"`
 	Data    []byte `protobuf:"bytes,5,opt,name=data,proto3" json:"data,omitempty"`
+	Format  string `protobuf:"bytes,6,opt,name=format,proto3" json:"format,omitempty"`
 }
 
 func (x *PolicyRes) Reset() {
@@ -319,6 +320,13 @@ func (x *PolicyRes) GetData() []byte {
 	return nil
 }
 
+func (x *PolicyRes) GetFormat() string {
+	if x != nil {
+		return x.Format
+	}
+	return ""
+}
+
 type PolicyInDSRes struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -331,6 +339,7 @@ type PolicyInDSRes struct {
 	Data         []byte `protobuf:"bytes,5,opt,name=data,proto3" json:"data,omitempty"`
 	DatasetId    string `protobuf:"bytes,6,opt,name=dataset_id,json=datasetId,proto3" json:"dataset_id,omitempty"`
 	AgentGroupId string `protobuf:"bytes,7,opt,name=agent_group_id,json=agentGroupId,proto3" json:"agent_group_id,omitempty"`
+	Format       string `protobuf:"bytes,8,opt,name=format,proto3" json:"format,omitempty"`
 }
 
 func (x *PolicyInDSRes) Reset() {
@@ -414,6 +423,13 @@ func (x *PolicyInDSRes) GetAgentGroupId() string {
 	return ""
 }
 
+func (x *PolicyInDSRes) GetFormat() string {
+	if x != nil {
+		return x.Format
+	}
+	return ""
+}
+
 type PolicyInDSListRes struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -603,65 +619,68 @@ var file_policies_pb_policies_proto_rawDesc = []byte{
 	0x61, 0x73, 0x65, 0x74, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x64, 0x61,
 	0x74, 0x61, 0x73, 0x65, 0x74, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x77, 0x6e, 0x65, 0x72,
 	0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x49,
-	0x44, 0x22, 0x77, 0x0a, 0x09, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x73, 0x12, 0x0e,
-	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12,
-	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x07, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x12, 0x18, 0x0a, 0x07,
-	0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x76,
-	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x05,
-	0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0xc0, 0x01, 0x0a, 0x0d, 0x50,
-	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x6e, 0x44, 0x53, 0x52, 0x65, 0x73, 0x12, 0x0e, 0x0a, 0x02,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x12, 0x18, 0x0a, 0x07, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x07, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65,
-	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x76, 0x65, 0x72,
-	0x73, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x0a, 0x64, 0x61, 0x74, 0x61,
-	0x73, 0x65, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x64, 0x61,
-	0x74, 0x61, 0x73, 0x65, 0x74, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0e, 0x61, 0x67, 0x65, 0x6e, 0x74,
-	0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0c, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x22, 0x48, 0x0a,
-	0x11, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x6e, 0x44, 0x53, 0x4c, 0x69, 0x73, 0x74, 0x52,
-	0x65, 0x73, 0x12, 0x33, 0x0a, 0x08, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e,
-	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x6e, 0x44, 0x53, 0x52, 0x65, 0x73, 0x52, 0x08, 0x70,
-	0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x22, 0x7a, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x73,
-	0x65, 0x74, 0x52, 0x65, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x24, 0x0a, 0x0e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x67,
-	0x72, 0x6f, 0x75, 0x70, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61,
-	0x67, 0x65, 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x70,
-	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
-	0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x69, 0x6e, 0x6b,
-	0x5f, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x73, 0x69, 0x6e, 0x6b,
-	0x49, 0x64, 0x73, 0x22, 0x45, 0x0a, 0x0b, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x73, 0x52,
-	0x65, 0x73, 0x12, 0x36, 0x0a, 0x0b, 0x64, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x4c, 0x69, 0x73,
-	0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69,
-	0x65, 0x73, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x52, 0x0b, 0x64,
-	0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x32, 0xc4, 0x02, 0x0a, 0x0d, 0x50,
-	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x40, 0x0a, 0x0e,
-	0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x76, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x17,
-	0x2e, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
-	0x42, 0x79, 0x49, 0x44, 0x52, 0x65, 0x71, 0x1a, 0x13, 0x2e, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69,
-	0x65, 0x73, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x73, 0x22, 0x00, 0x12, 0x58,
-	0x0a, 0x18, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x76, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x69,
-	0x65, 0x73, 0x42, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, 0x1d, 0x2e, 0x70, 0x6f, 0x6c,
-	0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x42, 0x79,
-	0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x1b, 0x2e, 0x70, 0x6f, 0x6c, 0x69,
-	0x63, 0x69, 0x65, 0x73, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x6e, 0x44, 0x53, 0x4c,
-	0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x0f, 0x52, 0x65, 0x74, 0x72,
-	0x69, 0x65, 0x76, 0x65, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x12, 0x18, 0x2e, 0x70, 0x6f,
-	0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x42, 0x79,
-	0x49, 0x44, 0x52, 0x65, 0x71, 0x1a, 0x14, 0x2e, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73,
-	0x2e, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x22, 0x00, 0x12, 0x52, 0x0a,
-	0x18, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x76, 0x65, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74,
-	0x73, 0x42, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, 0x1d, 0x2e, 0x70, 0x6f, 0x6c, 0x69,
-	0x63, 0x69, 0x65, 0x73, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x73, 0x42, 0x79, 0x47,
-	0x72, 0x6f, 0x75, 0x70, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x70, 0x6f, 0x6c, 0x69, 0x63,
-	0x69, 0x65, 0x73, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x73, 0x52, 0x65, 0x73, 0x22,
-	0x00, 0x42, 0x0d, 0x5a, 0x0b, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2f, 0x70, 0x62,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x44, 0x22, 0x8f, 0x01, 0x0a, 0x09, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x73, 0x12,
+	0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12,
+	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x12, 0x18, 0x0a,
+	0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
+	0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x66,
+	0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x6f, 0x72,
+	0x6d, 0x61, 0x74, 0x22, 0xd8, 0x01, 0x0a, 0x0d, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x6e,
+	0x44, 0x53, 0x52, 0x65, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x61, 0x63,
+	0x6b, 0x65, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x62, 0x61, 0x63, 0x6b,
+	0x65, 0x6e, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a,
+	0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74,
+	0x61, 0x12, 0x1d, 0x0a, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x5f, 0x69, 0x64, 0x18,
+	0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x64, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x49, 0x64,
+	0x12, 0x24, 0x0a, 0x0e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f,
+	0x69, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x47,
+	0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
+	0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0x48,
+	0x0a, 0x11, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x6e, 0x44, 0x53, 0x4c, 0x69, 0x73, 0x74,
+	0x52, 0x65, 0x73, 0x12, 0x33, 0x0a, 0x08, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73,
+	0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x6e, 0x44, 0x53, 0x52, 0x65, 0x73, 0x52, 0x08,
+	0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x22, 0x7a, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61,
+	0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x24, 0x0a, 0x0e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f,
+	0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c,
+	0x61, 0x67, 0x65, 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09,
+	0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x08, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x69, 0x6e,
+	0x6b, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x73, 0x69, 0x6e,
+	0x6b, 0x49, 0x64, 0x73, 0x22, 0x45, 0x0a, 0x0b, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x73,
+	0x52, 0x65, 0x73, 0x12, 0x36, 0x0a, 0x0b, 0x64, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x4c, 0x69,
+	0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70, 0x6f, 0x6c, 0x69, 0x63,
+	0x69, 0x65, 0x73, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x52, 0x0b,
+	0x64, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x32, 0xc4, 0x02, 0x0a, 0x0d,
+	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x40, 0x0a,
+	0x0e, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x76, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12,
+	0x17, 0x2e, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63,
+	0x79, 0x42, 0x79, 0x49, 0x44, 0x52, 0x65, 0x71, 0x1a, 0x13, 0x2e, 0x70, 0x6f, 0x6c, 0x69, 0x63,
+	0x69, 0x65, 0x73, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x73, 0x22, 0x00, 0x12,
+	0x58, 0x0a, 0x18, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x76, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63,
+	0x69, 0x65, 0x73, 0x42, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, 0x1d, 0x2e, 0x70, 0x6f,
+	0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x42,
+	0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x1b, 0x2e, 0x70, 0x6f, 0x6c,
+	0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x6e, 0x44, 0x53,
+	0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x0f, 0x52, 0x65, 0x74,
+	0x72, 0x69, 0x65, 0x76, 0x65, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x12, 0x18, 0x2e, 0x70,
+	0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x42,
+	0x79, 0x49, 0x44, 0x52, 0x65, 0x71, 0x1a, 0x14, 0x2e, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65,
+	0x73, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x22, 0x00, 0x12, 0x52,
+	0x0a, 0x18, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x76, 0x65, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65,
+	0x74, 0x73, 0x42, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, 0x1d, 0x2e, 0x70, 0x6f, 0x6c,
+	0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x73, 0x42, 0x79,
+	0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x70, 0x6f, 0x6c, 0x69,
+	0x63, 0x69, 0x65, 0x73, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x73, 0x65, 0x74, 0x73, 0x52, 0x65, 0x73,
+	0x22, 0x00, 0x42, 0x0d, 0x5a, 0x0b, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2f, 0x70,
+	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/policies/pb/policies.proto b/policies/pb/policies.proto
index 380194382..0a716fdf4 100644
--- a/policies/pb/policies.proto
+++ b/policies/pb/policies.proto
@@ -36,6 +36,7 @@ message PolicyRes {
   string backend = 3;
   int32 version = 4;
   bytes data = 5;
+  string format = 6;
 }
 
 message PolicyInDSRes {
@@ -46,6 +47,7 @@ message PolicyInDSRes {
   bytes data = 5;
   string dataset_id = 6;
   string agent_group_id = 7;
+  string format = 8;
 }
 
 message PolicyInDSListRes {
diff --git a/policies/policy_service_test.go b/policies/policy_service_test.go
index 0ff100aea..bcf9bf431 100644
--- a/policies/policy_service_test.go
+++ b/policies/policy_service_test.go
@@ -13,6 +13,7 @@ import (
 	sinkmocks "github.com/orb-community/orb/sinks/mocks"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/zap"
 	"testing"
 	"time"
 )
@@ -44,8 +45,9 @@ func newService(auth mainflux.AuthServiceClient) policies.Service {
 	policyRepo := plmocks.NewPoliciesRepository()
 	fleetGrpcClient := flmocks.NewClient()
 	SinkServiceClient := sinkmocks.NewClient()
+	logger := zap.NewNop()
 
-	return policies.New(nil, auth, policyRepo, fleetGrpcClient, SinkServiceClient)
+	return policies.New(logger, auth, policyRepo, fleetGrpcClient, SinkServiceClient)
 }
 
 func TestRetrievePolicyByID(t *testing.T) {
diff --git a/policies/postgres/policies.go b/policies/postgres/policies.go
index 6425d9b63..dc16ea804 100644
--- a/policies/postgres/policies.go
+++ b/policies/postgres/policies.go
@@ -184,7 +184,8 @@ func (r policiesRepository) RetrieveAll(ctx context.Context, owner string, pm po
 
 func (r policiesRepository) RetrievePoliciesByGroupID(ctx context.Context, groupIDs []string, ownerID string) ([]policies.PolicyInDataset, error) {
 
-	q := `SELECT agent_policies.id AS id, datasets.id AS dataset_id, agent_policies.name AS name, agent_group_id, agent_policies.mf_owner_id, orb_tags, backend, version, policy, agent_policies.ts_created
+	q := `SELECT agent_policies.id AS id, datasets.id AS dataset_id, agent_policies.name AS name, 
+             agent_group_id, agent_policies.mf_owner_id, orb_tags, backend, version, policy, format, agent_policies.ts_created
 			FROM agent_policies, datasets
 			WHERE agent_policies.id = datasets.agent_policy_id AND agent_policies.mf_owner_id = datasets.mf_owner_id AND valid = TRUE AND
 				agent_group_id IN (?) AND agent_policies.mf_owner_id = ?`
@@ -214,6 +215,7 @@ func (r policiesRepository) RetrievePoliciesByGroupID(ctx context.Context, group
 		}
 
 		th := toPolicy(dbth)
+		r.logger.Debug("policy format", zap.String("format", th.Format))
 		items = append(items, policies.PolicyInDataset{Policy: th, DatasetID: dbth.DataSetID, AgentGroupID: dbth.AgentGroupID})
 	}
 
@@ -235,7 +237,6 @@ func (r policiesRepository) RetrievePolicyByID(ctx context.Context, policyID str
 		}
 		return policies.Policy{}, errors.Wrap(errors.ErrSelectEntity, err)
 	}
-
 	return toPolicy(dbp), nil
 }
 
diff --git a/policies/service.go b/policies/service.go
index ebdb19cef..a9ace77a3 100644
--- a/policies/service.go
+++ b/policies/service.go
@@ -2,6 +2,7 @@ package policies
 
 import (
 	"context"
+	"github.com/orb-community/orb/policies/backend/otel"
 	"time"
 
 	"github.com/mainflux/mainflux"
@@ -51,6 +52,8 @@ func (s policiesService) identify(token string) (string, error) {
 func New(logger *zap.Logger, auth mainflux.AuthServiceClient, repo Repository, fleetGrpcClient fleetpb.FleetServiceClient, sinksGrpcclient sinkpb.SinkServiceClient) Service {
 
 	orb.Register()
+	//TODO it might not need the logger here, just added for debugging for now
+	otel.Register(logger)
 	pktvisor.Register()
 	diode.Register()
 
diff --git a/python-test/.gitignore b/python-test/.gitignore
index 0b0cbb405..7f6178164 100644
--- a/python-test/.gitignore
+++ b/python-test/.gitignore
@@ -8,3 +8,4 @@ output/
 /venv
 *.ipynb
 .vscode/
+features/localfeatures
diff --git a/python-test/README.md b/python-test/README.md
index ae1535c98..8829d079f 100644
--- a/python-test/README.md
+++ b/python-test/README.md
@@ -54,15 +54,15 @@ Then fill in the correct values:
 - **orb_address**:
   - Mandatory!
   - URL of the Orb deployment. Do NOT include the protocol (`https://`, `http://` or `mqtt://`).
-- **prometheus_username**
+- **prometheus_username** | **otlp_publisher_username**
   - Mandatory!
-  - Your Grafana Cloud Prometheus username
-- **prometheus_key**
+  - Your sink username
+- **prometheus_key** | **otlp_publisher_key**
   - Mandatory!
-  - Your Grafana Cloud API Key. Be sure to grant the key a role with metrics push privileges
-- **remote_prometheus_endpoint**
+  - Your sink API Key. Be sure to grant the key a role with metrics push privileges
+- **remote_prometheus_endpoint** | **otlp_publisher_endpoint**
   - Mandatory!
-  - base URL to send Prometheus metrics to Grafana Cloud> `(ex. prometheus-prod-10-prod-us-central-0.grafana.net)`
+  - base URL to send metrics > `(ex. prometheus-prod-10-prod-us-central-0.grafana.net)`
 - **verify_ssl**:
   - Bool
   - When it is False, replaces HTTPS connections with HTTP and disables SSL certificate validation in MQTT connections.
@@ -84,19 +84,11 @@ Then fill in the correct values:
   - Bool
   - Referred to UI tests. If True, run chromedriver in headless mode
   - Default value: `true`
-- **include_otel_env_var**:
-  - Bool
-  - If true, use the environmental variable "ORB_OTEL_ENABLE" on agent provisioning commands
-  - Default value: `false`
-- **enable_otel**:
-  - Bool
-  - Value to be used in variable "ORB_OTEL_ENABLE". Note that `include_otel_env_var` parameter must be `true` if this variable is true.
-  - Default value: `true`
 - **use_orb_live_address_pattern**:
   - Bool
   - If true, uses orb_address as base to api and mqtt address using orb.live pattern. If false, requires you to add the corresponding addresses.
   - Default value: `true`
-- **backend_type**:
+- **sink_backend_type**:
   - Str
   - Sink backend type
   - Default value: `prometheus`
diff --git a/python-test/features/agentsProvider.feature b/python-test/features/agentsProvider.feature
index 52fa51e02..fd7eb1e82 100644
--- a/python-test/features/agentsProvider.feature
+++ b/python-test/features/agentsProvider.feature
@@ -11,7 +11,8 @@ Scenario: Provision agent
     Then the agent status in Orb should be online within 30 seconds
         And the container logs should contain the message "sending capabilities" within 30 seconds
 
-@smoke
+@MUTE
+#@smoke
 Scenario: Run two orb agents on the same port
     Given the Orb user has a registered account
         And the Orb user logs in
diff --git a/python-test/features/integration.feature b/python-test/features/integration.feature
index 20ffd577a..929500900 100644
--- a/python-test/features/integration.feature
+++ b/python-test/features/integration.feature
@@ -748,6 +748,7 @@ Scenario: Edit an advanced policy with handler dns changing the handler to net
         And policy handler must be net
         And policy only_qname_suffix must be None
         And policy only_rcode must be None
+        And the version of policy in agent must be 1
         And this agent's heartbeat shows that 1 policies are applied and all has status running
         And the container logs that were output after editing policies contain the message "policy applied successfully" referred to each applied policy within 10 seconds
 
@@ -768,6 +769,7 @@ Scenario: Edit an advanced policy with handler dns changing the handler to dhcp
     Then policy version must be 1
         And policy name must be second_policy
         And policy handler must be dhcp
+        And the version of policy in agent must be 1
         And this agent's heartbeat shows that 1 policies are applied and all has status running
         And the container logs that were output after editing policies contain the message "policy applied successfully" referred to each applied policy within 10 seconds
 
@@ -786,6 +788,7 @@ Scenario: Edit a simple policy with handler dhcp changing the handler to net
     When editing a policy using handler=net, description="policy_net"
     Then policy version must be 1
         And policy handler must be net
+        And the version of policy in agent must be 1
         And this agent's heartbeat shows that 1 policies are applied and all has status running
         And the container logs that were output after editing policies contain the message "policy applied successfully" referred to each applied policy within 10 seconds
 
@@ -807,6 +810,7 @@ Scenario: Edit a simple policy with handler net changing the handler to dns and
         And policy bpf_filter_expression must be udp port 53
         And policy only_qname_suffix must be ['.foo.com', '.example.com']
         And policy only_rcode must be 2
+        And the version of policy in agent must be 1
         And this agent's heartbeat shows that 1 policies are applied and all has status running
         And the container logs that were output after editing policies contain the message "policy applied successfully" referred to each applied policy within 10 seconds
 
@@ -868,7 +872,8 @@ Scenario: remove one sink from a dataset with 1 sinks, edit the dataset and inse
         And this agent's heartbeat shows that 1 policies are applied and all has status running
 
 
-@smoke
+@MUTE
+#@smoke
 Scenario: Remotely restart agents with policies applied
     Given the Orb user has a registered account
         And the Orb user logs in
@@ -888,7 +893,8 @@ Scenario: Remotely restart agents with policies applied
         And the container logs that were output after reset the agent contain the message "policy applied successfully" referred to each applied policy within 30 seconds
         And the container logs that were output after reset the agent contain the message "scraped metrics for policy" referred to each applied policy within 180 seconds
 
-@smoke
+@MUTE
+#@smoke
 Scenario: Remotely restart agents without policies applied
     Given the Orb user has a registered account
         And the Orb user logs in
@@ -902,7 +908,7 @@ Scenario: Remotely restart agents without policies applied
         And the container logs that were output after reset the agent contain the message "pktvisor process stopped" within 30 seconds
         And the container logs that were output after reset the agent contain the message "all backends and comms were restarted" within 30 seconds
         And 2 simple policies are applied to the group
-    Then the container logs should contain the message "restarting all backends" within 30 seconds
+    Then the container logs should contain the message "all backends and comms were restarted" within 30 seconds
         And this agent's heartbeat shows that 2 policies are applied and all has status running
         And the container logs that were output after reset the agent contain the message "policy applied successfully" referred to each applied policy within 20 seconds
         And the container logs that were output after reset the agent contain the message "scraped metrics for policy" referred to each applied policy within 180 seconds
@@ -1409,4 +1415,4 @@ Scenario: Using sink with json configuration specified
     When 10 mixed policies are applied to the group
     Then this agent's heartbeat shows that 10 policies are applied and all has status running
         And the container logs contain the message "policy applied successfully" referred to each policy within 30 seconds
-        And 10 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
\ No newline at end of file
+        And 10 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
diff --git a/python-test/features/integration_config_file_otel.feature b/python-test/features/integration_config_file_otel.feature
new file mode 100644
index 000000000..afe3d7556
--- /dev/null
+++ b/python-test/features/integration_config_file_otel.feature
@@ -0,0 +1,331 @@
+@integration_config_files_otel_backend @AUTORETRY
+Feature: Integration tests using agent with otlp as backend provided via config file
+
+
+@smoke_otel_backend
+Scenario: provisioning agent with otel backend and applying 1 policy (config file - auto_provision=true)
+    Given the Orb user has a registered account
+        And the Orb user logs in
+        And that a sink with default configuration type already exists
+        And 1 Agent Group(s) is created with 1 orb tag(s) (lower case)
+        And 1 policies with otel backend and yaml format are applied to the group
+        And a new agent is created with 0 orb tag(s)
+    When an agent(backend_type:otel, settings: {}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: True]
+        And otel state is running
+    Then 1 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
+        And this agent's heartbeat shows that 1 groups are matching the agent
+        And the container logs should contain the message "completed RPC subscription to group" within 30 seconds
+        And this agent's heartbeat shows that 1 policies are applied and all has status running
+        And the container logs contain the message "policy applied successfully" referred to each policy within 30 seconds
+        And the container logs that were output after all policies have been applied contain the message "scraped metrics for policy" referred to each applied policy within 180 seconds
+        And referred sink must have active state on response within 180 seconds
+        And remove the agent .yaml generated on each scenario
+
+
+@smoke_otel_backend
+Scenario: provisioning agent with otel backend and applying 2 policies (config file - auto_provision=true)
+    Given the Orb user has a registered account
+        And the Orb user logs in
+        And that a sink with default configuration type already exists
+        And 1 Agent Group(s) is created with 1 orb tag(s) (lower case)
+        And 2 policies with otel backend and yaml format are applied to the group
+        And a new agent is created with 0 orb tag(s)
+    When an agent(backend_type:otel, settings: {}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: True]
+        And otel state is running
+    Then 2 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
+        And this agent's heartbeat shows that 1 groups are matching the agent
+        And the container logs should contain the message "completed RPC subscription to group" within 30 seconds
+        And this agent's heartbeat shows that 2 policies are applied and all has status running
+        And the container logs contain the message "policy applied successfully" referred to each policy within 30 seconds
+        And the container logs that were output after all policies have been applied contain the message "scraped metrics for policy" referred to each applied policy within 180 seconds
+        And referred sink must have active state on response within 180 seconds
+        And remove the agent .yaml generated on each scenario
+
+
+@smoke_otel_backend
+Scenario: removing policy from agent with otel backend (config file - auto_provision=true)
+    Given the Orb user has a registered account
+        And the Orb user logs in
+        And that a sink with default configuration type already exists
+        And 1 Agent Group(s) is created with 1 orb tag(s) (lower case)
+        And 2 policies with otel backend and yaml format are applied to the group
+        And a new agent is created with 0 orb tag(s)
+    When an agent(backend_type:otel, settings: {}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: True]
+        And otel state is running
+    Then 2 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
+    And this agent's heartbeat shows that 2 policies are applied and all has status running
+    When one of applied policies is removed
+    Then referred policy must not be listed on the orb policies list
+        And no dataset should be linked to the removed policy anymore
+        And 1 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
+        And this agent's heartbeat shows that 1 policies are applied and all has status running
+        And the container logs that were output after the policy have been removed contain the message "scraped metrics for policy" referred to each applied policy within 180 seconds
+        And the container logs that were output after the policy have been removed does not contain the message "scraped metrics for policy" referred to deleted policy anymore
+
+
+@smoke_otel_backend
+Scenario: Remove group to which agent with otel backend is linked
+    Given the Orb user has a registered account
+        And the Orb user logs in
+        And a new agent is created with 0 orb tag(s)
+        And an agent(backend_type:otel, settings: {}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+        And otel state is waiting
+        And referred agent is subscribed to 1 group
+        And otel state is waiting
+        And this agent's heartbeat shows that 1 groups are matching the agent
+        And that a sink with default configuration type already exists
+        And 2 policies with otel backend and yaml format are applied to the group
+        And this agent's heartbeat shows that 2 policies are applied and all has status running
+    When 1 group(s) to which the agent is linked is removed
+    Then the container logs should contain the message "completed RPC unsubscription to group" within 30 seconds
+        And the container logs contain the message "policy no longer used by any group, removing" referred to each policy within 30 seconds
+        And this agent's heartbeat shows that 0 policies are applied to the agent
+        And this agent's heartbeat shows that 0 groups are matching the agent
+        And no dataset should be linked to the removed group anymore
+        And 0 dataset(s) have validity valid and 2 have validity invalid in 30 seconds
+
+
+#@smoke_otel_backend
+@MUTE
+Scenario: Remotely restart agent with otel backend and policies applied
+    Given the Orb user has a registered account
+        And the Orb user logs in
+        And 1 Agent Group(s) is created with 1 orb tag(s) (lower case)
+        And that a sink with default configuration type already exists
+        And 1 policies with otel backend and yaml format are applied to the group
+        And a new agent is created with 0 orb tag(s)
+        And an agent(backend_type:otel, settings: {}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: True]
+        And this agent's heartbeat shows that 1 groups are matching the agent
+        And otel state is running
+        And this agent's heartbeat shows that 1 policies are applied and all has status running
+    When remotely restart the agent
+    Then the container logs that were output after reset the agent contain the message "otel process stopped" within 30 seconds
+        And the container logs should contain the message "all backends and comms were restarted" within 30 seconds
+        And the container logs that were output after reset the agent contain the message "removing policies" within 30 seconds
+        And the container logs that were output after reset the agent contain the message "resetting backend" within 30 seconds
+        And the container logs that were output after reset the agent contain the message "all backends and comms were restarted" within 30 seconds
+        And the container logs that were output after reset the agent contain the message "policy applied successfully" referred to each applied policy within 30 seconds
+        And the container logs that were output after reset the agent contain the message "scraped metrics for policy" referred to each applied policy within 180 seconds
+
+
+@smoke_otel_backend @config_file @auto_provision
+Scenario: agent otel with only agent tags subscription to a group with policies created after provision the agent (config file - auto_provision=true)
+    Given the Orb user has a registered account
+        And the Orb user logs in
+        And that a sink with default configuration type already exists
+    When an agent(backend_type:otel, settings: {}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+        And 1 Agent Group(s) is created with all tags contained in the agent
+        And 2 policies with otel backend and yaml format are applied to the group
+        And otel state is running
+    Then 2 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
+        And the container logs should contain the message "completed RPC subscription to group" within 30 seconds
+        And this agent's heartbeat shows that 1 groups are matching the agent
+        And this agent's heartbeat shows that 2 policies are applied and all has status running
+        And the container logs contain the message "policy applied successfully" referred to each policy within 30 seconds
+        And the container logs that were output after all policies have been applied contain the message "scraped metrics for policy" referred to each applied policy within 180 seconds
+        And referred sink must have active state on response within 120 seconds
+        And remove the agent .yaml generated on each scenario
+
+
+@smoke_otel_backend @config_file @auto_provision
+Scenario: agent otel with only agent tags subscription to a group with policies created before provision the agent (config file - auto_provision=true)
+    Given the Orb user has a registered account
+        And the Orb user logs in
+        And that a sink with default configuration type already exists
+        And 1 Agent Group(s) is created with 1 orb tag(s) (lower case)
+        And 3 policies with otel backend and yaml format are applied to the group
+        And a new agent is created with 0 orb tag(s)
+    When an agent(backend_type:otel, settings: {}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
+        And otel state is running
+    Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
+        And this agent's heartbeat shows that 1 groups are matching the agent
+        And the container logs should contain the message "completed RPC subscription to group" within 30 seconds
+        And this agent's heartbeat shows that 3 policies are applied and all has status running
+        And the container logs contain the message "policy applied successfully" referred to each policy within 30 seconds
+        And the container logs that were output after all policies have been applied contain the message "scraped metrics for policy" referred to each applied policy within 180 seconds
+        And referred sink must have active state on response within 120 seconds
+        And remove the agent .yaml generated on each scenario
+
+
+@smoke_otel_backend @config_file @auto_provision
+Scenario: agent otel with mixed tags subscription to a group with policies created after provision the agent (config file - auto_provision=true)
+    Given the Orb user has a registered account
+        And the Orb user logs in
+        And that a sink with default configuration type already exists
+    When an agent(backend_type:otel, settings: {}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+        And otel state is waiting
+        And edit the orb tags on agent and use 2 orb tag(s)
+        And 1 Agent Group(s) is created with all tags contained in the agent
+        And otel state is waiting
+        And 3 policies with otel backend and yaml format are applied to the group
+        And otel state is running
+    Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
+        And this agent's heartbeat shows that 1 groups are matching the agent
+        And the container logs should contain the message "completed RPC subscription to group" within 30 seconds
+        And this agent's heartbeat shows that 3 policies are applied and all has status running
+        And the container logs contain the message "policy applied successfully" referred to each policy within 30 seconds
+        And the container logs that were output after all policies have been applied contain the message "scraped metrics for policy" referred to each applied policy within 180 seconds
+        And referred sink must have active state on response within 120 seconds
+        And remove the agent .yaml generated on each scenario
+
+
+@smoke_otel_backend @config_file @auto_provision
+Scenario: agent otel with mixed tags subscription to a group with policies created before provision the agent (config file - auto_provision=true)
+    Given the Orb user has a registered account
+        And the Orb user logs in
+        And that a sink with default configuration type already exists
+        And 1 Agent Group(s) is created with 2 orb tag(s) (lower case)
+        And 3 policies with otel backend and yaml format are applied to the group
+        And a new agent is created with 2 orb tag(s)
+    When an agent(backend_type:otel, settings: {}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
+        And otel state is running
+    Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
+        And this agent's heartbeat shows that 1 groups are matching the agent
+        And the container logs should contain the message "completed RPC subscription to group" within 30 seconds
+        And this agent's heartbeat shows that 3 policies are applied and all has status running
+        And the container logs contain the message "policy applied successfully" referred to each policy within 30 seconds
+        And the container logs that were output after all policies have been applied contain the message "scraped metrics for policy" referred to each applied policy within 180 seconds
+        And referred sink must have active state on response within 120 seconds
+        And remove the agent .yaml generated on each scenario
+
+@smoke_otel_backend @config_file
+Scenario: agent otel with only agent tags subscription to a group with policies created after provision the agent (config file - auto_provision=false)
+    Given the Orb user has a registered account
+        And the Orb user logs in
+        And that a sink with default configuration type already exists
+        And a new agent is created with 0 orb tag(s)
+    When an agent(backend_type:otel, settings: {}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+        And otel state is waiting
+        And 1 Agent Group(s) is created with all tags contained in the agent
+        And 3 policies with otel backend and yaml format are applied to the group
+        And otel state is running
+    Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
+        And the container logs should contain the message "completed RPC subscription to group" within 30 seconds
+        And this agent's heartbeat shows that 1 groups are matching the agent
+        And this agent's heartbeat shows that 3 policies are applied and all has status running
+        And the container logs contain the message "policy applied successfully" referred to each policy within 30 seconds
+        And the container logs that were output after all policies have been applied contain the message "scraped metrics for policy" referred to each applied policy within 180 seconds
+        And referred sink must have active state on response within 120 seconds
+        And remove the agent .yaml generated on each scenario
+
+
+#@smoke_otel_backend @config_file
+@MUTE
+Scenario: agent otel with only agent tags subscription to a group with policies created before provision the agent (config file - auto_provision=false)
+    Given the Orb user has a registered account
+        And the Orb user logs in
+        And that a sink with default configuration type already exists
+        And 1 Agent Group(s) is created with 1 orb tag(s) (lower case)
+        And 3 policies with otel backend and yaml format are applied to the group
+        And a new agent is created with 0 orb tag(s)
+    When an agent(backend_type:otel, settings: {}) is provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
+        And otel state is waiting
+    Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
+        And this agent's heartbeat shows that 1 groups are matching the agent
+        And the container logs should contain the message "completed RPC subscription to group" within 30 seconds
+        And this agent's heartbeat shows that 3 policies are applied and all has status running
+        And otel state is running
+        And the container logs contain the message "policy applied successfully" referred to each policy within 30 seconds
+        And the container logs that were output after all policies have been applied contain the message "scraped metrics for policy" referred to each applied policy within 180 seconds
+        And referred sink must have active state on response within 120 seconds
+        And remove the agent .yaml generated on each scenario
+
+@smoke_otel_backend @config_file
+Scenario: agent otel with mixed tags subscription to a group with policies created after provision the agent (config file - auto_provision=false)
+    Given the Orb user has a registered account
+        And the Orb user logs in
+        And that a sink with default configuration type already exists
+        And a new agent is created with 2 orb tag(s)
+    When an agent(backend_type:otel, settings: {}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
+        And edit the orb tags on agent and use 2 orb tag(s)
+        And 1 Agent Group(s) is created with all tags contained in the agent
+        And 3 policies with otel backend and yaml format are applied to the group
+        And otel state is running
+    Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
+        And this agent's heartbeat shows that 1 groups are matching the agent
+        And the container logs should contain the message "completed RPC subscription to group" within 30 seconds
+        And this agent's heartbeat shows that 3 policies are applied and all has status running
+        And the container logs contain the message "policy applied successfully" referred to each policy within 30 seconds
+        And the container logs that were output after all policies have been applied contain the message "scraped metrics for policy" referred to each applied policy within 180 seconds
+        And referred sink must have active state on response within 120 seconds
+        And remove the agent .yaml generated on each scenario
+
+#@smoke_otel_backend @config_file
+@MUTE
+Scenario: agent otel with mixed tags subscription to a group with policies created before provision the agent (config file - auto_provision=false)
+    Given the Orb user has a registered account
+        And the Orb user logs in
+        And that a sink with default configuration type already exists
+        And 1 Agent Group(s) is created with 2 orb tag(s) (lower case)
+        And 3 policies with otel backend and yaml format are applied to the group
+        And a new agent is created with 2 orb tag(s)
+    When an agent(backend_type:otel, settings: {}) is provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
+        And otel state is running
+    Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
+        And this agent's heartbeat shows that 1 groups are matching the agent
+        And the container logs should contain the message "completed RPC subscription to group" within 30 seconds
+        And this agent's heartbeat shows that 3 policies are applied and all has status running
+        And the container logs contain the message "policy applied successfully" referred to each policy within 30 seconds
+        And the container logs that were output after all policies have been applied contain the message "scraped metrics for policy" referred to each applied policy within 180 seconds
+        And referred sink must have active state on response within 120 seconds
+        And remove the agent .yaml generated on each scenario
+
+
+########### provisioning agents without specify otel configs on backend
+
+
+@smoke_otel_backend @config_file @otel_configs @auto_provision
+Scenario: provisioning agent without specify path to otel config file (config file - auto_provision=true)
+    Given the Orb user has a registered account
+        And the Orb user logs in
+        And that a sink with default configuration type already exists
+        And 1 Agent Group(s) is created with 1 orb tag(s) (lower case)
+        And 3 policies with otel backend and yaml format are applied to the group
+        And a new agent is created with 0 orb tag(s)
+    When an agent(backend_type:otel, settings: {}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: True. Paste only file: True. Use specific backend config {"config_file":"None"}]
+        And otel state is running
+    Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
+        And this agent's heartbeat shows that 1 groups are matching the agent
+        And the container logs should contain the message "completed RPC subscription to group" within 30 seconds
+        And this agent's heartbeat shows that 3 policies are applied and all has status running
+        And the container logs contain the message "policy applied successfully" referred to each policy within 30 seconds
+        And the container logs that were output after all policies have been applied contain the message "scraped metrics for policy" referred to each applied policy within 180 seconds
+        And remove the agent .yaml generated on each scenario
+
+
+@smoke_otel_backend @config_file @otel_configs
+Scenario: provisioning agent without specify path to otel config file (config file - auto_provision=false)
+    Given the Orb user has a registered account
+        And the Orb user logs in
+        And that a sink with default configuration type already exists
+        And a new agent is created with 2 orb tag(s)
+    When an agent(backend_type:otel, settings: {}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: True. Paste only file: True. Use specific backend config {"config_file":"None"}]
+        And edit the orb tags on agent and use 2 orb tag(s)
+        And 1 Agent Group(s) is created with all tags contained in the agent
+        And 3 policies with otel backend and yaml format are applied to the group
+        And otel state is running
+    Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
+        And this agent's heartbeat shows that 1 groups are matching the agent
+        And the container logs should contain the message "completed RPC subscription to group" within 30 seconds
+        And this agent's heartbeat shows that 3 policies are applied and all has status running
+        And the container logs contain the message "policy applied successfully" referred to each policy within 30 seconds
+        And the container logs that were output after all policies have been applied contain the message "scraped metrics for policy" referred to each applied policy within 180 seconds
+        And remove the agent .yaml generated on each scenario
+
+@smoke_otel_backend
+Scenario: Update an otel backend policy applied to an agent
+    Given the Orb user has a registered account
+        And the Orb user logs in
+        And that a sink with default configuration type already exists
+        And a new agent is created with 1 orb tag(s)
+        And an agent(backend_type:otel, settings: {}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: True. Paste only file: True]
+        And 1 Agent Group(s) is created with all tags contained in the agent
+        And 1 policies with otel backend and yaml format are applied to the group
+        And 1 new dataset is created using the policy, last group and 1 sink
+        And otel state is running
+    When update otel policy using endpoint(s)=https://api.netboxlabs.com/v2/swagger/index.html#/ and collection_interval=25s
+    Then otel policy version must be 1
+        And updated fields were correctly present in updated otel policy
+        And the version of policy in agent must be 1
+        And this agent's heartbeat shows that 1 policies are applied and all has status running
+        And the container logs that were output after editing policies contain the message "policy applied successfully" referred to each applied policy within 10 seconds
diff --git a/python-test/features/integration_config_file.feature b/python-test/features/integration_config_file_pktvisor.feature
similarity index 81%
rename from python-test/features/integration_config_file.feature
rename to python-test/features/integration_config_file_pktvisor.feature
index 793868885..eb7330c10 100644
--- a/python-test/features/integration_config_file.feature
+++ b/python-test/features/integration_config_file_pktvisor.feature
@@ -1,5 +1,5 @@
 @integration_config_files @AUTORETRY
-Feature: Integration tests using agent provided via config file
+Feature: Integration tests using agent with pktvisor as backend provided via config file
 
 
 @private @auto_provision
@@ -7,7 +7,7 @@ Scenario: General smoke test to validate private agent image - using configurati
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:pcap, settings: {"iface":"default"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"default"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And 3 simple policies same input_type as created via config file are applied to the group
@@ -31,7 +31,7 @@ Scenario: provisioning agent without specify pktvisor binary path and path to co
         And 1 Agent Group(s) is created with 1 orb tag(s) (lower case)
         And 3 simple policies flow are applied to the group
         And a new agent is created with 0 orb tag(s)
-    When an agent(input_type:flow, settings: {"bind":"0.0.0.0", "port":"available_port"}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: True. Paste only file: True. Use specif backend for pktvisor {"binary":"None", "config_file":"None"}]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"0.0.0.0", "port":"available_port"}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: True. Paste only file: True. Use specific backend config {"binary":"None", "config_file":"None"}]
         And pktvisor state is running
     Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
         And this agent's heartbeat shows that 1 groups are matching the agent
@@ -50,7 +50,7 @@ Scenario: provisioning agent without specify pktvisor binary path (config file -
         And 1 Agent Group(s) is created with 1 orb tag(s) (lower case)
         And 3 simple policies flow are applied to the group
         And a new agent is created with 0 orb tag(s)
-    When an agent(input_type:flow, settings: {"bind":"0.0.0.0", "port":"available_port"}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: True. Paste only file: True. Use specif backend for pktvisor {"config_file":"None"}]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"0.0.0.0", "port":"available_port"}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: True. Paste only file: True. Use specific backend config {"config_file":"None"}]
         And pktvisor state is running
     Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
         And this agent's heartbeat shows that 1 groups are matching the agent
@@ -69,7 +69,7 @@ Scenario: provisioning agent without specify pktvisor path to config file (confi
         And 1 Agent Group(s) is created with 1 orb tag(s) (lower case)
         And 3 simple policies flow are applied to the group
         And a new agent is created with 0 orb tag(s)
-    When an agent(input_type:flow, settings: {"bind":"0.0.0.0", "port":"available_port"}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: True. Paste only file: True. Use specif backend for pktvisor {"binary":"None"}]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"0.0.0.0", "port":"available_port"}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: True. Paste only file: True. Use specific backend config {"binary":"None"}]
         And pktvisor state is running
     Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
         And this agent's heartbeat shows that 1 groups are matching the agent
@@ -85,7 +85,7 @@ Scenario: provisioning agent without specify pktvisor binary path and path to co
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a new agent is created with 2 orb tag(s)
-    When an agent(input_type:flow, settings: {"bind":"0.0.0.0", "port":"available_port"}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: True. Paste only file: True. Use specif backend for pktvisor {"binary":"None", "config_file":"None"}]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"0.0.0.0", "port":"available_port"}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: True. Paste only file: True. Use specific backend config {"binary":"None", "config_file":"None"}]
         And pktvisor state is running
         And edit the orb tags on agent and use 2 orb tag(s)
         And 1 Agent Group(s) is created with all tags contained in the agent
@@ -106,7 +106,7 @@ Scenario: provisioning agent without specify pktvisor binary path (config file -
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a new agent is created with 2 orb tag(s)
-    When an agent(input_type:flow, settings: {"bind":"0.0.0.0", "port":"available_port"}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: True. Paste only file: True. Use specif backend for pktvisor {"config_file":"None"}]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"0.0.0.0", "port":"available_port"}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: True. Paste only file: True. Use specific backend config {"config_file":"None"}]
         And pktvisor state is running
         And edit the orb tags on agent and use 2 orb tag(s)
         And 1 Agent Group(s) is created with all tags contained in the agent
@@ -127,7 +127,7 @@ Scenario: provisioning agent without specify pktvisor path to config file (confi
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a new agent is created with 2 orb tag(s)
-    When an agent(input_type:flow, settings: {"bind":"0.0.0.0", "port":"available_port"}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: True. Paste only file: True. Use specif backend for pktvisor {"binary":"None"}]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"0.0.0.0", "port":"available_port"}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: True. Paste only file: True. Use specific backend config {"binary":"None"}]
         And pktvisor state is running
         And edit the orb tags on agent and use 2 orb tag(s)
         And 1 Agent Group(s) is created with all tags contained in the agent
@@ -148,7 +148,7 @@ Scenario: tap_selector - any - matching 0 of all tags from an agent
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:pcap, settings: {"iface":"default"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"default"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a net policy pcap with tap_selector matching any tag(s) of the tap from 0 agent, default metric_groups enabled, default metric_groups disabled and settings: {"geoloc_notfound":"False"} is applied to the group
@@ -164,7 +164,7 @@ Scenario: tap_selector - any - matching 1 of all tags from an agent
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:pcap, settings: {"iface":"default"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"default"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a net policy pcap with tap_selector matching any tag(s) of the tap from 1 agent (1 tag matching), default metric_groups enabled, default metric_groups disabled and settings: {"geoloc_notfound":"False"} is applied to the group
@@ -182,7 +182,7 @@ Scenario: tap_selector - any - matching 1 of all tags (plus 1 random tag) from a
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:pcap, settings: {"iface":"default"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"default"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a net policy pcap with tap_selector matching any tag(s) of the tap from 1 agent (1 tag matching + 1 random tag), default metric_groups enabled, default metric_groups disabled and settings: {"geoloc_notfound":"False"} is applied to the group
@@ -200,7 +200,7 @@ Scenario: tap_selector - all - matching 0 of all tags from an agent
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:pcap, settings: {"iface":"default"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"default"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a net policy pcap with tap_selector matching all tag(s) of the tap from 0 agent, default metric_groups enabled, default metric_groups disabled and settings: {"geoloc_notfound":"False"} is applied to the group
@@ -216,7 +216,7 @@ Scenario: tap_selector - all - matching 1 of all tags from an agent
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:pcap, settings: {"iface":"default"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"default"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a net policy pcap with tap_selector matching all tag(s) of the tap from 1 agent (1 tag matching), default metric_groups enabled, default metric_groups disabled and settings: {"geoloc_notfound":"False"} is applied to the group
@@ -235,7 +235,7 @@ Scenario: tap_selector - all - matching all tags from an agent
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:pcap, settings: {"iface":"default"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"default"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a net policy pcap with tap_selector matching all tag(s) of the tap from an agent, default metric_groups enabled, default metric_groups disabled and settings: {"geoloc_notfound":"False"} is applied to the group
@@ -255,7 +255,7 @@ Scenario: agent pcap with only agent tags subscription to a group with policies
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:pcap, settings: {"iface":"default"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"default"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And 3 simple policies same input_type as created via config file are applied to the group
@@ -277,7 +277,7 @@ Scenario: agent pcap with only agent tags subscription to a group with policies
         And 1 Agent Group(s) is created with 1 orb tag(s) (lower case)
         And 3 simple policies pcap are applied to the group
         And a new agent is created with 0 orb tag(s)
-    When an agent(input_type:pcap, settings: {"iface":"default"}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"default"}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
     Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
         And this agent's heartbeat shows that 1 groups are matching the agent
@@ -294,7 +294,7 @@ Scenario: agent pcap with mixed tags subscription to a group with policies creat
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:pcap, settings: {"iface":"default"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"default"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And edit the orb tags on agent and use 2 orb tag(s)
         And 1 Agent Group(s) is created with all tags contained in the agent
@@ -317,7 +317,7 @@ Scenario: agent pcap with mixed tags subscription to a group with policies creat
         And 1 Agent Group(s) is created with 2 orb tag(s) (lower case)
         And 3 simple policies pcap are applied to the group
         And a new agent is created with 2 orb tag(s)
-    When an agent(input_type:pcap, settings: {"iface":"default"}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"default"}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
     Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
         And this agent's heartbeat shows that 1 groups are matching the agent
@@ -334,7 +334,7 @@ Scenario: agent pcap with only agent tags subscription to a group with policies
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a new agent is created with 0 orb tag(s)
-    When an agent(input_type:pcap, settings: {"iface":"default"}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"default"}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And 3 simple policies same input_type as created via config file are applied to the group
@@ -356,7 +356,7 @@ Scenario: agent pcap with only agent tags subscription to a group with policies
         And 1 Agent Group(s) is created with 1 orb tag(s) (lower case)
         And 3 simple policies pcap are applied to the group
         And a new agent is created with 0 orb tag(s)
-    When an agent(input_type:pcap, settings: {"iface":"default"}) is provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"default"}) is provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
     Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
         And this agent's heartbeat shows that 1 groups are matching the agent
@@ -373,7 +373,7 @@ Scenario: agent pcap with mixed tags subscription to a group with policies creat
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a new agent is created with 2 orb tag(s)
-    When an agent(input_type:pcap, settings: {"iface":"default"}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"default"}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
         And edit the orb tags on agent and use 2 orb tag(s)
         And 1 Agent Group(s) is created with all tags contained in the agent
@@ -396,7 +396,7 @@ Scenario: agent pcap with mixed tags subscription to a group with policies creat
         And 1 Agent Group(s) is created with 2 orb tag(s) (lower case)
         And 3 simple policies pcap are applied to the group
         And a new agent is created with 2 orb tag(s)
-    When an agent(input_type:pcap, settings: {"iface":"default"}) is provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"default"}) is provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
     Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
         And this agent's heartbeat shows that 1 groups are matching the agent
@@ -415,7 +415,7 @@ Scenario: agent flow with only agent tags subscription to a group with policies
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:flow, settings: {"bind":"0.0.0.0", "port":"available_port"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: True. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"0.0.0.0", "port":"available_port"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: True. Paste only file: False]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And 3 simple policies same input_type as created via config file are applied to the group
@@ -436,7 +436,7 @@ Scenario: agent flow with only agent tags subscription to a group with policies
         And 1 Agent Group(s) is created with 1 orb tag(s) (lower case)
         And 3 simple policies flow are applied to the group
         And a new agent is created with 0 orb tag(s)
-    When an agent(input_type:flow, settings: {"bind":"0.0.0.0", "port":"available_port"}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"0.0.0.0", "port":"available_port"}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
     Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
         And this agent's heartbeat shows that 1 groups are matching the agent
@@ -452,7 +452,7 @@ Scenario: agent flow with mixed tags subscription to a group with policies creat
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:flow, settings: {"bind":"0.0.0.0", "port":"available_port"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"0.0.0.0", "port":"available_port"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
         And edit the orb tags on agent and use 2 orb tag(s)
         And 1 Agent Group(s) is created with all tags contained in the agent
@@ -474,7 +474,7 @@ Scenario: agent flow with mixed tags subscription to a group with policies creat
         And 1 Agent Group(s) is created with 2 orb tag(s) (lower case)
         And 3 simple policies flow are applied to the group
         And a new agent is created with 2 orb tag(s)
-    When an agent(input_type:flow, settings: {"bind":"0.0.0.0", "port":"available_port"}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"0.0.0.0", "port":"available_port"}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
     Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
         And this agent's heartbeat shows that 1 groups are matching the agent
@@ -490,7 +490,7 @@ Scenario: agent flow with only agent tags subscription to a group with policies
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a new agent is created with 0 orb tag(s)
-    When an agent(input_type:flow, settings: {"bind":"0.0.0.0", "port":"available_port"}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"0.0.0.0", "port":"available_port"}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And 3 simple policies same input_type as created via config file are applied to the group
@@ -511,7 +511,7 @@ Scenario: agent flow with only agent tags subscription to a group with policies
         And 1 Agent Group(s) is created with 1 orb tag(s) (lower case)
         And 3 simple policies flow are applied to the group
         And a new agent is created with 0 orb tag(s)
-    When an agent(input_type:flow, settings: {"bind":"0.0.0.0", "port":"available_port"}) is provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"0.0.0.0", "port":"available_port"}) is provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
     Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
         And this agent's heartbeat shows that 1 groups are matching the agent
@@ -528,7 +528,7 @@ Scenario: agent flow with mixed tags subscription to a group with policies creat
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a new agent is created with 2 orb tag(s)
-    When an agent(input_type:flow, settings: {"bind":"0.0.0.0", "port":"available_port"}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"0.0.0.0", "port":"available_port"}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
         And edit the orb tags on agent and use 2 orb tag(s)
         And 1 Agent Group(s) is created with all tags contained in the agent
@@ -550,7 +550,7 @@ Scenario: agent flow with mixed tags subscription to a group with policies creat
         And 1 Agent Group(s) is created with 2 orb tag(s) (lower case)
         And 3 simple policies flow are applied to the group
         And a new agent is created with 2 orb tag(s)
-    When an agent(input_type:flow, settings: {"bind":"0.0.0.0", "port":"available_port"}) is provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"0.0.0.0", "port":"available_port"}) is provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
     Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
         And this agent's heartbeat shows that 1 groups are matching the agent
@@ -570,7 +570,7 @@ Scenario: agent dnstap with only agent tags subscription to a group with policie
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:dnstap, settings: {"tcp":"0.0.0.0:available_port", "only_hosts":"0.0.0.0/32"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"dnstap","tcp":"0.0.0.0:available_port", "only_hosts":"0.0.0.0/32"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And 3 simple policies same input_type as created via config file are applied to the group
@@ -592,7 +592,7 @@ Scenario: agent dnstap with only agent tags subscription to a group with policie
         And 1 Agent Group(s) is created with 1 orb tag(s) (lower case)
         And 3 simple policies dnstap are applied to the group
         And a new agent is created with 0 orb tag(s)
-    When an agent(input_type:dnstap, settings: {"tcp":"0.0.0.0:available_port", "only_hosts":"0.0.0.0/32"}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"dnstap","tcp":"0.0.0.0:available_port", "only_hosts":"0.0.0.0/32"}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
     Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
         And this agent's heartbeat shows that 1 groups are matching the agent
@@ -609,7 +609,7 @@ Scenario: agent dnstap with mixed tags subscription to a group with policies cre
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:dnstap, settings: {"tcp":"0.0.0.0:available_port", "only_hosts":"0.0.0.0/32"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"dnstap","tcp":"0.0.0.0:available_port", "only_hosts":"0.0.0.0/32"}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
         And edit the orb tags on agent and use 2 orb tag(s)
         And 1 Agent Group(s) is created with all tags contained in the agent
@@ -632,7 +632,7 @@ Scenario: agent dnstap with mixed tags subscription to a group with policies cre
         And 1 Agent Group(s) is created with 2 orb tag(s) (lower case)
         And 3 simple policies dnstap are applied to the group
         And a new agent is created with 2 orb tag(s)
-    When an agent(input_type:dnstap, settings: {"tcp":"0.0.0.0:available_port", "only_hosts":"0.0.0.0/32"}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"dnstap","tcp":"0.0.0.0:available_port", "only_hosts":"0.0.0.0/32"}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
     Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
         And this agent's heartbeat shows that 1 groups are matching the agent
@@ -649,7 +649,7 @@ Scenario: agent dnstap with only agent tags subscription to a group with policie
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a new agent is created with 0 orb tag(s)
-    When an agent(input_type:dnstap, settings: {"tcp":"0.0.0.0:available_port", "only_hosts":"0.0.0.0/32"}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"dnstap","tcp":"0.0.0.0:available_port", "only_hosts":"0.0.0.0/32"}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And 3 simple policies same input_type as created via config file are applied to the group
@@ -671,7 +671,7 @@ Scenario: agent dnstap with only agent tags subscription to a group with policie
         And 1 Agent Group(s) is created with 1 orb tag(s) (lower case)
         And 3 simple policies dnstap are applied to the group
         And a new agent is created with 0 orb tag(s)
-    When an agent(input_type:dnstap, settings: {{"tcp":"0.0.0.0:available_port", "only_hosts":"0.0.0.0/32"}) is provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"dnstap","tcp":"0.0.0.0:available_port", "only_hosts":"0.0.0.0/32"}) is provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
     Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
         And this agent's heartbeat shows that 1 groups are matching the agent
@@ -688,7 +688,7 @@ Scenario: agent dnstap with mixed tags subscription to a group with policies cre
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a new agent is created with 2 orb tag(s)
-    When an agent(input_type:dnstap, settings: {"tcp":"0.0.0.0:available_port", "only_hosts":"0.0.0.0/32"}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"dnstap","tcp":"0.0.0.0:available_port", "only_hosts":"0.0.0.0/32"}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
         And edit the orb tags on agent and use 2 orb tag(s)
         And 1 Agent Group(s) is created with all tags contained in the agent
@@ -711,7 +711,7 @@ Scenario: agent dnstap with mixed tags subscription to a group with policies cre
         And 1 Agent Group(s) is created with 2 orb tag(s) (lower case)
         And 3 simple policies dnstap are applied to the group
         And a new agent is created with 2 orb tag(s)
-    When an agent(input_type:dnstap, settings: {"tcp":"0.0.0.0:available_port", "only_hosts":"0.0.0.0/32"}) is provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"dnstap","tcp":"0.0.0.0:available_port", "only_hosts":"0.0.0.0/32"}) is provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
     Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
         And this agent's heartbeat shows that 1 groups are matching the agent
@@ -731,7 +731,7 @@ Scenario: agent netprobe with only agent tags subscription to a group with polic
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:netprobe, settings: {"test_type":"ping", "packets_per_test":3, "interval_msec":3000, "timeout_msec":1500, "packets_interval_msec":50, "packet_payload_size":56, "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"netprobe","test_type":"ping", "packets_per_test":3, "interval_msec":3000, "timeout_msec":1500, "packets_interval_msec":50, "packet_payload_size":56, "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And 3 simple policies same input_type as created via config file are applied to the group
@@ -753,7 +753,7 @@ Scenario: agent netprobe with only agent tags subscription to a group with polic
         And 1 Agent Group(s) is created with 1 orb tag(s) (lower case)
         And 3 advanced policies netprobe are applied to the group
         And a new agent is created with 0 orb tag(s)
-    When an agent(input_type:netprobe, settings: {"test_type":"ping", "packets_per_test":3, "interval_msec":3000, "timeout_msec":1500, "packets_interval_msec":50, "packet_payload_size":56, "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"netprobe","test_type":"ping", "packets_per_test":3, "interval_msec":3000, "timeout_msec":1500, "packets_interval_msec":50, "packet_payload_size":56, "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
     Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
         And this agent's heartbeat shows that 1 groups are matching the agent
@@ -770,7 +770,7 @@ Scenario: agent netprobe with mixed tags subscription to a group with policies c
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:netprobe, settings: {"test_type":"ping", "packets_per_test":3, "interval_msec":3000, "timeout_msec":1500, "packets_interval_msec":50, "packet_payload_size":56, "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"netprobe","test_type":"ping", "packets_per_test":3, "interval_msec":3000, "timeout_msec":1500, "packets_interval_msec":50, "packet_payload_size":56, "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
         And edit the orb tags on agent and use 2 orb tag(s)
         And 1 Agent Group(s) is created with all tags contained in the agent
@@ -793,7 +793,7 @@ Scenario: agent netprobe with mixed tags subscription to a group with policies c
         And 1 Agent Group(s) is created with 2 orb tag(s) (lower case)
         And 3 simple policies netprobe are applied to the group
         And a new agent is created with 2 orb tag(s)
-    When an agent(input_type:netprobe, settings: {"test_type":"ping", "packets_per_test":3, "interval_msec":3000, "timeout_msec":1500, "packets_interval_msec":50, "packet_payload_size":56, "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"netprobe","test_type":"ping", "packets_per_test":3, "interval_msec":3000, "timeout_msec":1500, "packets_interval_msec":50, "packet_payload_size":56, "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
     Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
         And this agent's heartbeat shows that 1 groups are matching the agent
@@ -811,7 +811,7 @@ Scenario: agent netprobe with only agent tags subscription to a group with polic
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a new agent is created with 0 orb tag(s)
-    When an agent(input_type:netprobe, settings: {"test_type":"ping", "packets_per_test":3, "interval_msec":3000, "timeout_msec":1500, "packets_interval_msec":50, "packet_payload_size":56, "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: True. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"netprobe","test_type":"ping", "packets_per_test":3, "interval_msec":3000, "timeout_msec":1500, "packets_interval_msec":50, "packet_payload_size":56, "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: True. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And 3 simple policies same input_type as created via config file are applied to the group
@@ -834,7 +834,7 @@ Scenario: agent netprobe with only agent tags subscription to a group with polic
         And 1 Agent Group(s) is created with 1 orb tag(s) (lower case)
         And 3 simple policies netprobe are applied to the group
         And a new agent is created with 0 orb tag(s)
-    When an agent(input_type:netprobe, settings: {"test_type":"ping", "packets_per_test":3, "interval_msec":3000, "timeout_msec":1500, "packets_interval_msec":50, "packet_payload_size":56, "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"netprobe","test_type":"ping", "packets_per_test":3, "interval_msec":3000, "timeout_msec":1500, "packets_interval_msec":50, "packet_payload_size":56, "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
     Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
         And this agent's heartbeat shows that 1 groups are matching the agent
@@ -852,7 +852,7 @@ Scenario: agent netprobe with mixed tags subscription to a group with policies c
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a new agent is created with 2 orb tag(s)
-    When an agent(input_type:netprobe, settings: {"test_type":"ping", "packets_per_test":3, "interval_msec":3000, "timeout_msec":1500, "packets_interval_msec":50, "packet_payload_size":56, "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"netprobe","test_type":"ping", "packets_per_test":3, "interval_msec":3000, "timeout_msec":1500, "packets_interval_msec":50, "packet_payload_size":56, "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is provisioned via a configuration file on port available with 3 agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
         And edit the orb tags on agent and use 2 orb tag(s)
         And 1 Agent Group(s) is created with all tags contained in the agent
@@ -876,7 +876,7 @@ Scenario: agent netprobe with mixed tags subscription to a group with policies c
         And 1 Agent Group(s) is created with 2 orb tag(s) (lower case)
         And 3 simple policies netprobe are applied to the group
         And a new agent is created with 2 orb tag(s)
-    When an agent(input_type:netprobe, settings: {"test_type":"ping", "packets_per_test":3, "interval_msec":3000, "timeout_msec":1500, "packets_interval_msec":50, "packet_payload_size":56, "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"netprobe","test_type":"ping", "packets_per_test":3, "interval_msec":3000, "timeout_msec":1500, "packets_interval_msec":50, "packet_payload_size":56, "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is provisioned via a configuration file on port available with matching 1 group agent tags and has status online. [Overwrite default: False. Paste only file: False]
         And pktvisor state is running
     Then 3 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
         And this agent's heartbeat shows that 1 groups are matching the agent
diff --git a/python-test/features/metrics.feature b/python-test/features/metrics.feature
index 002c89f0a..a4f86734a 100644
--- a/python-test/features/metrics.feature
+++ b/python-test/features/metrics.feature
@@ -8,7 +8,7 @@ Scenario: netprobe handler with default metric groups configuration
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:netprobe, settings: {"test_type":"ping", "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"netprobe","test_type":"ping", "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a netprobe policy netprobe with tap_selector matching all tag(s) of the tap from an agent, default metric_groups enabled, default metric_groups disabled and settings: default is applied to the group
@@ -26,7 +26,7 @@ Scenario: netprobe handler with all metric groups enabled
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:netprobe, settings: {"test_type":"ping", "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"netprobe","test_type":"ping", "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a netprobe policy netprobe with tap_selector matching all tag(s) of the tap from an agent, all metric_groups enabled, none metric_groups disabled and settings: default is applied to the group
@@ -44,7 +44,7 @@ Scenario: netprobe handler with all metric groups disabled
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:netprobe, settings: {"test_type":"ping", "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"netprobe","test_type":"ping", "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a netprobe policy netprobe with tap_selector matching all tag(s) of the tap from an agent, none metric_groups enabled, all metric_groups disabled and settings: default is applied to the group
@@ -61,7 +61,7 @@ Scenario: netprobe handler with only counters metric groups enabled
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:netprobe, settings: {"test_type":"ping", "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"netprobe","test_type":"ping", "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a netprobe policy netprobe with tap_selector matching all tag(s) of the tap from an agent, counters metric_groups enabled, quantiles, histograms metric_groups disabled and settings: default is applied to the group
@@ -79,7 +79,7 @@ Scenario: netprobe handler with only quantiles metric groups enabled
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:netprobe, settings: {"test_type":"ping", "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"netprobe","test_type":"ping", "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a netprobe policy netprobe with tap_selector matching all tag(s) of the tap from an agent, quantiles metric_groups enabled, counters, histograms metric_groups disabled and settings: default is applied to the group
@@ -97,7 +97,7 @@ Scenario: netprobe handler with only histograms metric groups enabled
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:netprobe, settings: {"test_type":"ping", "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"netprobe","test_type":"ping", "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a netprobe policy netprobe with tap_selector matching all tag(s) of the tap from an agent, histograms metric_groups enabled, quantiles, counters metric_groups disabled and settings: default is applied to the group
@@ -115,7 +115,7 @@ Scenario: netprobe handler with counters and histograms metric groups enabled an
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:netprobe, settings: {"test_type":"ping", "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"netprobe","test_type":"ping", "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a netprobe policy netprobe with tap_selector matching all tag(s) of the tap from an agent, counters, histograms metric_groups enabled, quantiles metric_groups disabled and settings: default is applied to the group
@@ -133,7 +133,7 @@ Scenario: netprobe handler with counters and quantiles metric groups enabled and
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:netprobe, settings: {"test_type":"ping", "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"netprobe","test_type":"ping", "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a netprobe policy netprobe with tap_selector matching all tag(s) of the tap from an agent, counters, quantiles metric_groups enabled, histograms metric_groups disabled and settings: default is applied to the group
@@ -151,7 +151,7 @@ Scenario: netprobe handler with histograms and quantiles metric groups enabled a
     Given the Orb user has a registered account
         And the Orb user logs in
         And that a sink with default configuration type already exists
-    When an agent(input_type:netprobe, settings: {"test_type":"ping", "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"netprobe","test_type":"ping", "targets": {"www.google.com": {"target": "www.google.com"}, "orb_community": {"target": "orb.community"}}}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a netprobe policy netprobe with tap_selector matching all tag(s) of the tap from an agent, histograms, quantiles metric_groups enabled, counters metric_groups disabled and settings: default is applied to the group
@@ -172,7 +172,7 @@ Scenario: flow handler type netflow with default metric groups configuration
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, default metric_groups enabled, default metric_groups disabled and settings: default is applied to the group
@@ -193,7 +193,7 @@ Scenario: flow handler type netflow with all metric groups enabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, all metric_groups enabled, none metric_groups disabled and settings: default is applied to the group
@@ -214,7 +214,7 @@ Scenario: flow handler type netflow with all metric groups disabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, none metric_groups enabled, all metric_groups disabled and settings: default is applied to the group
@@ -234,7 +234,7 @@ Scenario: flow handler type netflow with only cardinality metric groups enabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, cardinality metric_groups enabled, top_tos, counters, by_packets, by_bytes, top_geo, conversations, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -255,7 +255,7 @@ Scenario: flow handler type netflow with only counters metric groups enabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, counters metric_groups enabled, top_tos, cardinality, by_packets, by_bytes, top_geo, conversations, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -276,7 +276,7 @@ Scenario: flow handler type netflow with only counters and by_bytes metric group
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, counters, by_bytes metric_groups enabled, top_tos, cardinality, by_packets, top_geo, conversations, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -297,7 +297,7 @@ Scenario: flow handler type netflow with only counters and by_packets metric gro
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, counters, by_packets metric_groups enabled, top_tos, cardinality, by_bytes, top_geo, conversations, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -318,7 +318,7 @@ Scenario: flow handler type netflow with only by_packets metric groups enabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, by_packets metric_groups enabled, top_tos, counters, cardinality, by_bytes, top_geo, conversations, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -338,7 +338,7 @@ Scenario: flow handler type netflow with only by_bytes metric groups enabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, by_bytes metric_groups enabled, top_tos, counters, by_packets, cardinality, top_geo, conversations, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -358,7 +358,7 @@ Scenario: flow handler type netflow with only top_geo metric groups enabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_geo metric_groups enabled, top_tos, counters, by_packets, by_bytes, cardinality, conversations, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -378,7 +378,7 @@ Scenario: flow handler type netflow with only top_geo and by_bytes metric groups
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_geo, by_bytes metric_groups enabled, top_tos, counters, by_packets, cardinality, conversations, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -398,7 +398,7 @@ Scenario: flow handler type netflow with only top_geo and by_packets metric grou
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_geo, by_packets metric_groups enabled, top_tos, counters, by_bytes, cardinality, conversations, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -419,7 +419,7 @@ Scenario: flow handler type netflow with only conversations metric groups enable
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, conversations metric_groups enabled, top_tos, counters, by_packets, by_bytes, top_geo, cardinality, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -439,7 +439,7 @@ Scenario: flow handler type netflow with only conversations and cardinality metr
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, conversations, cardinality metric_groups enabled, top_tos, counters, by_packets, by_bytes, top_geo, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -459,7 +459,7 @@ Scenario: flow handler type netflow with only conversations and by_bytes metric
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, conversations, by_bytes metric_groups enabled, top_tos, counters, by_packets, top_geo, cardinality, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -480,7 +480,7 @@ Scenario: flow handler type netflow with only conversations and by_packets metri
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, conversations, by_packets metric_groups enabled, top_tos, counters, by_bytes, top_geo, cardinality, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -501,7 +501,7 @@ Scenario: flow handler type netflow with only top_ports metric groups enabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_ports metric_groups enabled, top_tos, conversations, counters, by_packets, by_bytes, top_geo, cardinality, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -521,7 +521,7 @@ Scenario: flow handler type netflow with only top_ports and by_packets metric gr
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_ports, by_packets metric_groups enabled, top_tos, conversations, counters, by_bytes, top_geo, cardinality, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -542,7 +542,7 @@ Scenario: flow handler type netflow with only top_ports and by_bytes metric grou
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_ports, by_bytes metric_groups enabled, top_tos, conversations, counters, by_packets, top_geo, cardinality, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -563,7 +563,7 @@ Scenario: flow handler type netflow with only top_ips_ports metric groups enable
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_ips_ports metric_groups enabled, top_tos, conversations, counters, by_packets, by_bytes, top_geo, cardinality, top_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -583,7 +583,7 @@ Scenario: flow handler type netflow with only top_ips_ports and by_bytes metric
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_ips_ports, by_bytes metric_groups enabled, top_tos, conversations, counters, by_packets, top_geo, cardinality, top_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -604,7 +604,7 @@ Scenario: flow handler type netflow with only top_ips_ports and by_packets metri
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_ips_ports, by_packets metric_groups enabled, top_tos, conversations, counters, by_bytes, top_geo, cardinality, top_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -625,7 +625,7 @@ Scenario: flow handler type netflow with only top_interfaces metric groups enabl
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_interfaces metric_groups enabled, top_tos, conversations, counters, by_packets, by_bytes, top_geo, cardinality, top_ports, top_ips_ports, top_ips metric_groups disabled and settings: default is applied to the group
@@ -645,7 +645,7 @@ Scenario: flow handler type netflow with only top_interfaces and by_bytes metric
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_interfaces, by_bytes metric_groups enabled, top_tos, conversations, counters, by_packets, top_geo, cardinality, top_ports, top_ips_ports, top_ips metric_groups disabled and settings: default is applied to the group
@@ -666,7 +666,7 @@ Scenario: flow handler type netflow with only top_interfaces and by_packets metr
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_interfaces, by_packets metric_groups enabled, top_tos, conversations, counters, by_bytes, top_geo, cardinality, top_ports, top_ips_ports, top_ips metric_groups disabled and settings: default is applied to the group
@@ -686,7 +686,7 @@ Scenario: flow handler type netflow with only top_ips metric groups enabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_ips metric_groups enabled, top_tos, conversations, counters, by_packets, by_bytes, top_geo, cardinality, top_ports, top_ips_ports, top_interfaces metric_groups disabled and settings: default is applied to the group
@@ -706,7 +706,7 @@ Scenario: flow handler type netflow with only top_ips and by_packets metric grou
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_ips, by_packets metric_groups enabled, top_tos, conversations, counters, by_bytes, top_geo, cardinality, top_ports, top_ips_ports, top_interfaces metric_groups disabled and settings: default is applied to the group
@@ -727,7 +727,7 @@ Scenario: flow handler type netflow with only top_ips and by_bytes metric groups
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_ips, by_bytes metric_groups enabled, top_tos, conversations, counters, by_packets, top_geo, cardinality, top_ports, top_ips_ports, top_interfaces metric_groups disabled and settings: default is applied to the group
@@ -748,7 +748,7 @@ Scenario: flow handler type netflow with only top_tos metric groups enabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_tos metric_groups enabled, top_ips, by_bytes, conversations, counters, by_packets, top_geo, cardinality, top_ports, top_ips_ports, top_interfaces metric_groups disabled and settings: default is applied to the group
@@ -768,7 +768,7 @@ Scenario: flow handler type netflow with only top_tos and by_bytes metric groups
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_tos, by_bytes metric_groups enabled, top_ips, conversations, counters, by_packets, top_geo, cardinality, top_ports, top_ips_ports, top_interfaces metric_groups disabled and settings: default is applied to the group
@@ -789,7 +789,7 @@ Scenario: flow handler type netflow with only top_tos and by_packets metric grou
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type netflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"netflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_tos, by_packets metric_groups enabled, top_ips, by_bytes, conversations, counters, top_geo, cardinality, top_ports, top_ips_ports, top_interfaces metric_groups disabled and settings: default is applied to the group
@@ -812,7 +812,7 @@ Scenario: flow handler type sflow with default metric groups configuration
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, default metric_groups enabled, default metric_groups disabled and settings: default is applied to the group
@@ -833,7 +833,7 @@ Scenario: flow handler type sflow with all metric groups enabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, all metric_groups enabled, none metric_groups disabled and settings: default is applied to the group
@@ -854,7 +854,7 @@ Scenario: flow handler type sflow with all metric groups disabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, none metric_groups enabled, all metric_groups disabled and settings: default is applied to the group
@@ -874,7 +874,7 @@ Scenario: flow handler type sflow with only cardinality metric groups enabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, cardinality metric_groups enabled, top_tos, counters, by_packets, by_bytes, top_geo, conversations, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -895,7 +895,7 @@ Scenario: flow handler type sflow with only counters metric groups enabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, counters metric_groups enabled, top_tos, cardinality, by_packets, by_bytes, top_geo, conversations, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -916,7 +916,7 @@ Scenario: flow handler type sflow with only counters and by_bytes metric groups
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, counters, by_bytes metric_groups enabled, top_tos, cardinality, by_packets, top_geo, conversations, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -937,7 +937,7 @@ Scenario: flow handler type sflow with only counters and by_packets metric group
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, counters, by_packets metric_groups enabled, top_tos, cardinality, by_bytes, top_geo, conversations, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -958,7 +958,7 @@ Scenario: flow handler type sflow with only by_packets metric groups enabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, by_packets metric_groups enabled, top_tos, counters, cardinality, by_bytes, top_geo, conversations, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -978,7 +978,7 @@ Scenario: flow handler type sflow with only by_bytes metric groups enabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, by_bytes metric_groups enabled, top_tos, counters, by_packets, cardinality, top_geo, conversations, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -998,7 +998,7 @@ Scenario: flow handler type sflow with only top_geo metric groups enabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_geo metric_groups enabled, top_tos, counters, by_packets, by_bytes, cardinality, conversations, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -1017,7 +1017,7 @@ Scenario: flow handler type sflow with only top_geo and by_bytes metric groups e
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_geo, by_bytes metric_groups enabled, top_tos, counters, by_packets, cardinality, conversations, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -1038,7 +1038,7 @@ Scenario: flow handler type sflow with only top_geo and by_packets metric groups
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_geo, by_packets metric_groups enabled, top_tos, counters, by_bytes, cardinality, conversations, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -1059,7 +1059,7 @@ Scenario: flow handler type sflow with only conversations metric groups enabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, conversations metric_groups enabled, top_tos, counters, by_packets, by_bytes, top_geo, cardinality, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -1079,7 +1079,7 @@ Scenario: flow handler type sflow with only conversations and cardinality metric
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, conversations, cardinality metric_groups enabled, top_tos, counters, by_packets, by_bytes, top_geo, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -1099,7 +1099,7 @@ Scenario: flow handler type sflow with only conversations and by_bytes metric gr
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, conversations, by_bytes metric_groups enabled, top_tos, counters, by_packets, top_geo, cardinality, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -1120,7 +1120,7 @@ Scenario: flow handler type sflow with only conversations and by_packets metric
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, conversations, by_packets metric_groups enabled, top_tos, counters, by_bytes, top_geo, cardinality, top_ports, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -1141,7 +1141,7 @@ Scenario: flow handler type sflow with only top_ports metric groups enabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_ports metric_groups enabled, top_tos, conversations, counters, by_packets, by_bytes, top_geo, cardinality, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -1160,7 +1160,7 @@ Scenario: flow handler type sflow with only top_ports and by_bytes metric groups
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_ports, by_bytes metric_groups enabled, top_tos, conversations, counters, by_packets, top_geo, cardinality, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -1181,7 +1181,7 @@ Scenario: flow handler type sflow with only top_ports and by_packets metric grou
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_ports, by_packets metric_groups enabled, top_tos, conversations, counters, by_bytes, top_geo, cardinality, top_ips_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -1202,7 +1202,7 @@ Scenario: flow handler type sflow with only top_ips_ports metric groups enabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_ips_ports metric_groups enabled, top_tos, conversations, counters, by_packets, by_bytes, top_geo, cardinality, top_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -1222,7 +1222,7 @@ Scenario: flow handler type sflow with only top_ips_ports and by_bytes metric gr
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_ips_ports, by_bytes metric_groups enabled, top_tos, conversations, counters, by_packets, top_geo, cardinality, top_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -1243,7 +1243,7 @@ Scenario: flow handler type sflow with only top_ips_ports and by_packets metric
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_ips_ports, by_packets metric_groups enabled, top_tos, conversations, counters, by_bytes, top_geo, cardinality, top_ports, top_interfaces, top_ips metric_groups disabled and settings: default is applied to the group
@@ -1263,7 +1263,7 @@ Scenario: flow handler type sflow with only top_interfaces metric groups enabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_interfaces metric_groups enabled, top_tos, conversations, counters, by_packets, by_bytes, top_geo, cardinality, top_ports, top_ips_ports, top_ips metric_groups disabled and settings: default is applied to the group
@@ -1282,7 +1282,7 @@ Scenario: flow handler type sflow with only top_interfaces and by_bytes metric g
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_interfaces, by_bytes metric_groups enabled, top_tos, conversations, counters, by_packets, top_geo, cardinality, top_ports, top_ips_ports, top_ips metric_groups disabled and settings: default is applied to the group
@@ -1303,7 +1303,7 @@ Scenario: flow handler type sflow with only top_interfaces and by_packets metric
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_interfaces, by_packets metric_groups enabled, top_tos, conversations, counters, by_bytes, top_geo, cardinality, top_ports, top_ips_ports, top_ips metric_groups disabled and settings: default is applied to the group
@@ -1324,7 +1324,7 @@ Scenario: flow handler type sflow with only top_ips metric groups enabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_ips metric_groups enabled, top_tos, conversations, counters, by_packets, by_bytes, top_geo, cardinality, top_ports, top_ips_ports, top_interfaces metric_groups disabled and settings: default is applied to the group
@@ -1343,7 +1343,7 @@ Scenario: flow handler type sflow with only top_ips and by_bytes metric groups e
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_ips, by_bytes metric_groups enabled, top_tos, conversations, counters, by_packets, top_geo, cardinality, top_ports, top_ips_ports, top_interfaces metric_groups disabled and settings: default is applied to the group
@@ -1364,7 +1364,7 @@ Scenario: flow handler type sflow with only top_ips and by_packets metric groups
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_ips, by_packets metric_groups enabled, top_tos, conversations, counters, by_bytes, top_geo, cardinality, top_ports, top_ips_ports, top_interfaces metric_groups disabled and settings: default is applied to the group
@@ -1385,7 +1385,7 @@ Scenario: flow handler type sflow with only top_tos metric groups enabled
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_tos metric_groups enabled, top_ips, by_packets, conversations, counters, by_bytes, top_geo, cardinality, top_ports, top_ips_ports, top_interfaces metric_groups disabled and settings: default is applied to the group
@@ -1405,7 +1405,7 @@ Scenario: flow handler type sflow with only top_tos and by_bytes metric groups e
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_tos, by_bytes metric_groups enabled, top_ips, by_packets, conversations, counters, top_geo, cardinality, top_ports, top_ips_ports, top_interfaces metric_groups disabled and settings: default is applied to the group
@@ -1426,7 +1426,7 @@ Scenario: flow handler type sflow with only top_tos and by_packets metric groups
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: 192.168.100.2/24
         And a virtual switch is configured and is up with type sflow and target \"192.168.100.2:available\"
-    When an agent(input_type:flow, settings: {"bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"flow","bind":"192.168.100.2", "port":"switch", "flow_type":"sflow"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a flow policy flow with tap_selector matching all tag(s) of the tap from an agent, top_tos, by_packets metric_groups enabled, top_ips, conversations, counters, by_bytes, top_geo, cardinality, top_ports, top_ips_ports, top_interfaces metric_groups disabled and settings: default is applied to the group
@@ -1448,7 +1448,7 @@ Scenario: pcap handler with default metric groups configuration
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a pcap policy pcap with tap_selector matching all tag(s) of the tap from an agent, default metric_groups enabled, default metric_groups disabled and settings: default is applied to the group
@@ -1468,7 +1468,7 @@ Scenario: pcap handler with all metric groups enabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a pcap policy pcap with tap_selector matching all tag(s) of the tap from an agent, all metric_groups enabled, none metric_groups disabled and settings: default is applied to the group
@@ -1488,7 +1488,7 @@ Scenario: pcap handler with all metric groups disabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a pcap policy pcap with tap_selector matching all tag(s) of the tap from an agent, none metric_groups enabled, all metric_groups disabled and settings: default is applied to the group
@@ -1510,7 +1510,7 @@ Scenario: bgp handler with default metric groups configuration
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a bgp policy pcap with tap_selector matching all tag(s) of the tap from an agent, default metric_groups enabled, default metric_groups disabled and settings: default is applied to the group
@@ -1530,7 +1530,7 @@ Scenario: bgp handler with all metric groups enabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a bgp policy pcap with tap_selector matching all tag(s) of the tap from an agent, all metric_groups enabled, none metric_groups disabled and settings: default is applied to the group
@@ -1550,7 +1550,7 @@ Scenario: bgp handler with all metric groups disabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a bgp policy pcap with tap_selector matching all tag(s) of the tap from an agent, none metric_groups enabled, all metric_groups disabled and settings: default is applied to the group
@@ -1572,7 +1572,7 @@ Scenario: dhcp handler with default metric groups configuration
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dhcp policy pcap with tap_selector matching all tag(s) of the tap from an agent, default metric_groups enabled, default metric_groups disabled and settings: default is applied to the group
@@ -1592,7 +1592,7 @@ Scenario: dhcp handler with all metric groups enabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dhcp policy pcap with tap_selector matching all tag(s) of the tap from an agent, all metric_groups enabled, none metric_groups disabled and settings: default is applied to the group
@@ -1612,7 +1612,7 @@ Scenario: dhcp handler with all metric groups disabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dhcp policy pcap with tap_selector matching all tag(s) of the tap from an agent, none metric_groups enabled, all metric_groups disabled and settings: default is applied to the group
@@ -1634,7 +1634,7 @@ Scenario: net handler with default metric groups configuration
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a net policy pcap with tap_selector matching all tag(s) of the tap from an agent, default metric_groups enabled, default metric_groups disabled and settings: default is applied to the group
@@ -1654,7 +1654,7 @@ Scenario: net handler with all metric groups enabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a net policy pcap with tap_selector matching all tag(s) of the tap from an agent, all metric_groups enabled, none metric_groups disabled and settings: default is applied to the group
@@ -1674,7 +1674,7 @@ Scenario: net handler with all metric groups disabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a net policy pcap with tap_selector matching all tag(s) of the tap from an agent, none metric_groups enabled, all metric_groups disabled and settings: default is applied to the group
@@ -1693,7 +1693,7 @@ Scenario: net handler with only cardinality metric groups enabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a net policy pcap with tap_selector matching all tag(s) of the tap from an agent, cardinality metric_groups enabled, counters, top_geo, top_ips metric_groups disabled and settings: default is applied to the group
@@ -1713,7 +1713,7 @@ Scenario: net handler with only counters metric groups enabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a net policy pcap with tap_selector matching all tag(s) of the tap from an agent, counters metric_groups enabled, cardinality, top_geo, top_ips metric_groups disabled and settings: default is applied to the group
@@ -1733,7 +1733,7 @@ Scenario: net handler with only top_geo metric groups enabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a net policy pcap with tap_selector matching all tag(s) of the tap from an agent, top_geo metric_groups enabled, counters, cardinality, top_ips metric_groups disabled and settings: default is applied to the group
@@ -1753,7 +1753,7 @@ Scenario: net handler with only top_ips metric groups enabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a net policy pcap with tap_selector matching all tag(s) of the tap from an agent, top_ips metric_groups enabled, counters, top_geo, cardinality metric_groups disabled and settings: default is applied to the group
@@ -1775,7 +1775,7 @@ Scenario: dns handler with default metric groups configuration
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, default metric_groups enabled, default metric_groups disabled and settings: default is applied to the group
@@ -1795,7 +1795,7 @@ Scenario: dns handler with all metric groups enabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, all metric_groups enabled, none metric_groups disabled and settings: default is applied to the group
@@ -1815,7 +1815,7 @@ Scenario: dns handler with all metric groups disabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, none metric_groups enabled, all metric_groups disabled and settings: default is applied to the group
@@ -1834,7 +1834,7 @@ Scenario: dns handler with only top_ecs metric groups enabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, top_ecs metric_groups enabled, quantiles, top_qnames_details, cardinality, counters, dns_transaction, top_qnames, top_ports metric_groups disabled and settings: default is applied to the group
@@ -1854,7 +1854,7 @@ Scenario: dns handler with only top_qnames_details metric groups enabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, top_qnames_details metric_groups enabled, quantiles, top_ecs, cardinality, counters, dns_transaction, top_qnames, top_ports metric_groups disabled and settings: default is applied to the group
@@ -1874,7 +1874,7 @@ Scenario: dns handler with only cardinality metric groups enabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, cardinality metric_groups enabled, quantiles, top_qnames_details, top_ecs, counters, dns_transaction, top_qnames, top_ports metric_groups disabled and settings: default is applied to the group
@@ -1894,7 +1894,7 @@ Scenario: dns handler with only counters metric groups enabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, counters metric_groups enabled, quantiles, top_qnames_details, cardinality, top_ecs, dns_transaction, top_qnames, top_ports metric_groups disabled and settings: default is applied to the group
@@ -1914,7 +1914,7 @@ Scenario: dns handler with only dns_transaction metric groups enabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, dns_transaction metric_groups enabled, quantiles, top_qnames_details, cardinality, counters, top_ecs, top_qnames, top_ports metric_groups disabled and settings: default is applied to the group
@@ -1934,7 +1934,7 @@ Scenario: dns handler with only top_qnames metric groups enabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, top_qnames metric_groups enabled, quantiles, top_qnames_details, cardinality, counters, dns_transaction, top_ecs, top_ports metric_groups disabled and settings: default is applied to the group
@@ -1954,7 +1954,7 @@ Scenario: dns handler with only top_ports metric groups enabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, top_ports metric_groups enabled, quantiles, top_qnames_details, cardinality, counters, dns_transaction, top_qnames, top_ecs metric_groups disabled and settings: default is applied to the group
@@ -1974,7 +1974,7 @@ Scenario: dns handler with only histograms metric groups enabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, histograms metric_groups enabled, quantiles, top_ports, top_qnames_details, cardinality, counters, dns_transaction, top_qnames, top_ecs metric_groups disabled and settings: default is applied to the group
@@ -1993,7 +1993,7 @@ Scenario: dns handler with only histograms and dns_transaction metric groups ena
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, histograms, dns_transaction metric_groups enabled, quantiles, top_ports, top_qnames_details, cardinality, counters, dns_transaction, top_qnames, top_ecs metric_groups disabled and settings: default is applied to the group
@@ -2013,7 +2013,7 @@ Scenario: dns handler with only quantiles metric groups enabled
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked", "host_spec":"fe80::a00:27ff:fed4:10bb/48,192.168.0.0/24,75.75.75.75/32"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, quantiles metric_groups enabled, histograms, top_ports, top_qnames_details, cardinality, counters, dns_transaction, top_qnames, top_ecs metric_groups disabled and settings: default is applied to the group
@@ -2034,7 +2034,7 @@ Scenario: dns handler with default metric groups configuration (v2)
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, default metric_groups enabled, default metric_groups disabled and settings: {"require_version":"2.0"} is applied to the group
@@ -2054,7 +2054,7 @@ Scenario: dns handler with all metric groups enabled (v2)
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, all metric_groups enabled, none metric_groups disabled and settings: {"require_version":"2.0"} is applied to the group
@@ -2074,7 +2074,7 @@ Scenario: dns handler with all metric groups disabled (v2)
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, none metric_groups enabled, all metric_groups disabled and settings: {"require_version":"2.0"} is applied to the group
@@ -2093,7 +2093,7 @@ Scenario: dns handler with only top_ecs metric groups enabled (v2)
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, top_ecs metric_groups enabled, cardinality, counters, top_qnames, top_ports, top_size, xact_times, quantiles, top_qtypes, top_rcodes metric_groups disabled and settings: {"require_version":"2.0"} is applied to the group
@@ -2113,7 +2113,7 @@ Scenario: dns handler with only top_ports metric groups enabled (v2)
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, top_ports metric_groups enabled, top_ecs, cardinality, counters, top_qnames, top_size, xact_times, quantiles, top_qtypes, top_rcodes metric_groups disabled and settings: {"require_version":"2.0"} is applied to the group
@@ -2133,7 +2133,7 @@ Scenario: dns handler with only top_size metric groups enabled (v2)
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, top_size metric_groups enabled, top_ecs, cardinality, counters, top_qnames, top_ports, xact_times, quantiles, top_qtypes, top_rcodes metric_groups disabled and settings: {"require_version":"2.0"} is applied to the group
@@ -2153,7 +2153,7 @@ Scenario: dns handler with only xact_times metric groups enabled (v2)
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, xact_times metric_groups enabled, top_ecs, cardinality, counters, top_qnames, top_ports, top_size, quantiles, top_qtypes, top_rcodes metric_groups disabled and settings: {"require_version":"2.0"} is applied to the group
@@ -2173,7 +2173,7 @@ Scenario: dns handler with only cardinality metric groups enabled (v2)
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, cardinality metric_groups enabled, top_ecs, counters, top_qnames, top_ports, top_size, xact_times, quantiles, top_qtypes, top_rcodes metric_groups disabled and settings: {"require_version":"2.0"} is applied to the group
@@ -2193,7 +2193,7 @@ Scenario: dns handler with only counters metric groups enabled (v2)
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, counters metric_groups enabled, top_ecs, cardinality, top_qnames, top_ports, top_size, xact_times, quantiles, top_qtypes, top_rcodes metric_groups disabled and settings: {"require_version":"2.0"} is applied to the group
@@ -2213,7 +2213,7 @@ Scenario: dns handler with only top_qnames metric groups enabled (v2)
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, top_qnames metric_groups enabled, top_ecs, cardinality, counters, top_ports, top_size, xact_times, quantiles, top_qtypes, top_rcodes metric_groups disabled and settings: {"require_version":"2.0"} is applied to the group
@@ -2233,7 +2233,7 @@ Scenario: dns handler with only quantiles metric groups enabled (v2)
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, quantiles metric_groups enabled, top_ecs, cardinality, counters, top_qnames, top_ports, top_size, xact_times, top_qtypes, top_rcodes metric_groups disabled and settings: {"require_version":"2.0"} is applied to the group
@@ -2253,7 +2253,7 @@ Scenario: dns handler with only top_qtypes metric groups enabled (v2)
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, top_qtypes metric_groups enabled, top_ecs, cardinality, counters, top_qnames, top_ports, top_size, xact_times, quantiles, top_rcodes metric_groups disabled and settings: {"require_version":"2.0"} is applied to the group
@@ -2273,7 +2273,7 @@ Scenario: dns handler with only top_rcodes metric groups enabled (v2)
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a dns policy pcap with tap_selector matching all tag(s) of the tap from an agent, top_rcodes metric_groups enabled, top_ecs, cardinality, counters, top_qnames, top_ports, top_size, xact_times, quantiles, top_qtypes metric_groups disabled and settings: {"require_version":"2.0"} is applied to the group
@@ -2295,7 +2295,7 @@ Scenario: net handler with default metric groups configuration (v2)
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a net policy pcap with tap_selector matching all tag(s) of the tap from an agent, default metric_groups enabled, default metric_groups disabled and settings: {"require_version":"2.0"} is applied to the group
@@ -2315,7 +2315,7 @@ Scenario: net handler with all metric groups enabled (v2)
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a net policy pcap with tap_selector matching all tag(s) of the tap from an agent, all metric_groups enabled, none metric_groups disabled and settings: {"require_version":"2.0"} is applied to the group
@@ -2335,7 +2335,7 @@ Scenario: net handler with all metric groups disabled (v2)
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a net policy pcap with tap_selector matching all tag(s) of the tap from an agent, none metric_groups enabled, all metric_groups disabled and settings: {"require_version":"2.0"} is applied to the group
@@ -2354,7 +2354,7 @@ Scenario: net handler with only cardinality metric groups enabled (v2)
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a net policy pcap with tap_selector matching all tag(s) of the tap from an agent, cardinality metric_groups enabled, quantiles, counters, top_geo, top_ips metric_groups disabled and settings: {"require_version":"2.0"} is applied to the group
@@ -2374,7 +2374,7 @@ Scenario: net handler with only counters metric groups enabled (v2)
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a net policy pcap with tap_selector matching all tag(s) of the tap from an agent, counters metric_groups enabled, quantiles, cardinality, top_geo, top_ips metric_groups disabled and settings: {"require_version":"2.0"} is applied to the group
@@ -2394,7 +2394,7 @@ Scenario: net handler with only top_geo metric groups enabled (v2)
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a net policy pcap with tap_selector matching all tag(s) of the tap from an agent, top_geo metric_groups enabled, quantiles, counters, cardinality, top_ips metric_groups disabled and settings: {"require_version":"2.0"} is applied to the group
@@ -2414,7 +2414,7 @@ Scenario: net handler with only top_ips metric groups enabled (v2)
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a net policy pcap with tap_selector matching all tag(s) of the tap from an agent, top_ips metric_groups enabled, quantiles, counters, top_geo, cardinality metric_groups disabled and settings: {"require_version":"2.0"} is applied to the group
@@ -2434,7 +2434,7 @@ Scenario: net handler with only quantiles metric groups enabled (v2)
         And the Orb user logs in
         And that a sink with default configuration type already exists
         And a mocked interface is configured with mtu: 65000 and ip: None
-    When an agent(input_type:pcap, settings: {"iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
+    When an agent(backend_type:pktvisor, settings: {"input_type":"pcap","iface":"mocked"}) is self-provisioned via a configuration file on port available with 1 agent tags and has status online. [Overwrite default: False. Paste only file: True]
         And pktvisor state is running
         And 1 Agent Group(s) is created with all tags contained in the agent
         And a net policy pcap with tap_selector matching all tag(s) of the tap from an agent, quantiles metric_groups enabled, top_ips, counters, top_geo, cardinality metric_groups disabled and settings: {"require_version":"2.0"} is applied to the group
diff --git a/python-test/features/migration.feature b/python-test/features/migration.feature
deleted file mode 100644
index 0c4d3c085..000000000
--- a/python-test/features/migration.feature
+++ /dev/null
@@ -1,93 +0,0 @@
-@migration @AUTORETRY
-Feature: Migration tests
-
-@pre-migration
-Scenario: Agent legacy + sink legacy -> sink OTEL
-    Given the Orb user has a registered account
-        And the Orb user logs in
-        And that an agent with 1 orb tag(s) and OTEL disabled already exists and is online within 30 seconds
-        And pktvisor state is running
-        And referred agent is subscribed to 1 group
-        And this agent's heartbeat shows that 1 groups are matching the agent
-        And that a/an legacy sink already exists (migration)
-        And 2 simple policies are applied to the group
-        And this agent's heartbeat shows that 2 policies are applied and all has status running
-        And the container logs contain the message "policy applied successfully" referred to each policy within 30 seconds
-        And the container logs that were output after all policies have been applied contain the message "scraped metrics for policy" referred to each applied policy within 180 seconds
-        And referred sink must have active state on response within 120 seconds
-        And 2 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
-    When the sink is updated and OTEL is enabled
-        And referred sink must have active state on response after 120 seconds
-
-
-@pre-migration
-Scenario: Agent legacy + sink OTEL
-    Given the Orb user has a registered account
-        And the Orb user logs in
-        And that an agent with 1 orb tag(s) and OTEL disabled already exists and is online within 30 seconds
-        And pktvisor state is running
-        And referred agent is subscribed to 1 group
-        And this agent's heartbeat shows that 1 groups are matching the agent
-        And that a/an OTEL sink already exists (migration)
-        And 2 simple policies are applied to the group
-        And this agent's heartbeat shows that 2 policies are applied and all has status running
-        And the container logs contain the message "policy applied successfully" referred to each policy within 30 seconds
-        And the container logs that were output after all policies have been applied contain the message "scraped metrics for policy" referred to each applied policy within 180 seconds
-        And referred sink must have active state on response within 120 seconds
-        And 2 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
-
-
-@pre-migration
-Scenario: Adding policies to an Agent legacy after migrate sink legacy to sink OTEL
-    Given the Orb user has a registered account
-        And the Orb user logs in
-        And that an agent with 1 orb tag(s) and OTEL disabled already exists and is online within 30 seconds
-        And pktvisor state is running
-        And that a/an legacy sink already exists (migration)
-        And the sink is updated and OTEL is enabled
-        And referred agent is subscribed to 1 group
-        And this agent's heartbeat shows that 1 groups are matching the agent
-    When 2 simple policies are applied to the group
-    Then this agent's heartbeat shows that 2 policies are applied and all has status running
-        And the container logs contain the message "policy applied successfully" referred to each policy within 30 seconds
-        And the container logs that were output after all policies have been applied contain the message "scraped metrics for policy" referred to each applied policy within 180 seconds
-        And referred sink must have active state on response within 120 seconds
-        And 2 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
-        And referred sink must have active state on response within 120 seconds
-
-
-@pre-migration
-Scenario: Adding policies to an Agent legacy after migrate sink legacy to sink OTEL and agent legacy to otel
-    Given the Orb user has a registered account
-        And the Orb user logs in
-        And that an agent with 1 orb tag(s) and OTEL disabled already exists and is online within 30 seconds
-        And pktvisor state is running
-        And that a/an legacy sink already exists (migration)
-        And referred agent is subscribed to 1 group
-        And this agent's heartbeat shows that 1 groups are matching the agent
-        And 2 simple policies are applied to the group
-        And this agent's heartbeat shows that 2 policies are applied and all has status running
-        And the container logs contain the message "policy applied successfully" referred to each policy within 30 seconds
-        And the container logs that were output after all policies have been applied contain the message "scraped metrics for policy" referred to each applied policy within 180 seconds
-        And referred sink must have active state on response within 120 seconds
-        And 2 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
-        And referred sink must have active state on response within 120 seconds
-    When the sink is updated and OTEL is enabled
-        And stop the orb-agent container
-        And the agent container is started on an available port and use otel:enabled env vars
-        And the agent status is online
-        And this agent's heartbeat shows that 1 groups are matching the agent
-        And this agent's heartbeat shows that 2 policies are applied and all has status running
-        And 2 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
-        And referred sink must have active state on response after 120 seconds
-        And 2 simple policies are applied to the group
-    Then this agent's heartbeat shows that 4 policies are applied and all has status running
-        And 4 dataset(s) have validity valid and 0 have validity invalid in 30 seconds
-        And referred sink must have active state on response within 120 seconds
-
-
-@pos-migration
-Scenario: Check if all sinks are OTEL after migration
-    Given the Orb user has a registered account
-        And the Orb user logs in
-    Then all existing sinks must have OTEL enabled
\ No newline at end of file
diff --git a/python-test/features/steps/agent_config_file.py b/python-test/features/steps/agent_config_file.py
index 8ffc1d77e..4571f5249 100644
--- a/python-test/features/steps/agent_config_file.py
+++ b/python-test/features/steps/agent_config_file.py
@@ -1,43 +1,25 @@
 import yaml
 from utils import create_tags_set
-
 from taps import *
+from logger import Logger
+
+log = Logger().logger_instance()
 
 default_path_config_file = "/opt/orb"
 
 
-class FleetAgent:
-    def __init__(self):
-        pass
-
-    @classmethod
-    def config_file_of_orb_agent(cls, name, token, iface, orb_url, base_orb_mqtt, tap_name, tls_verify=True,
-                                 auto_provision=True, orb_cloud_mqtt_id=None, orb_cloud_mqtt_key=None,
-                                 orb_cloud_mqtt_channel_id=None, input_type="pcap", input_tags='3', settings=None,
-                                 include_otel_env_var=False, enable_otel=True, overwrite_default=False):
-        if isinstance(include_otel_env_var, str):
-            assert_that(include_otel_env_var.lower(), any_of("true", "false"), "Unexpected value for "
-                                                                               "'include_otel_env_var'.")
-            include_otel_env_var = eval(include_otel_env_var.title())
-        else:
-            assert_that(include_otel_env_var, any_of(False, True), "Unexpected value for 'include_otel_env_var'")
-        if isinstance(enable_otel, str):
-            assert_that(enable_otel.lower(), any_of("true", "false"), "Unexpected value for "
-                                                                      "'enable_otel'.")
-            enable_otel = eval(enable_otel.title())
-        else:
-            assert_that(enable_otel, any_of(False, True), "Unexpected value for 'enable_otel'")
+class ConfigFiles:
+    backend_type = None
 
-            assert_that(tls_verify, any_of(equal_to(True), equal_to(False)), "Unexpected value for tls_verify on "
-                                                                             "agent pcap config file creation")
+    def __init__(self, config_type):
+        assert_that(config_type, any_of(equal_to("pktvisor"), equal_to("otel"), equal_to("orb_agent")),
+                    f"Unsuported agent backend type: {config_type}")
+        self.config_type = config_type
 
-        assert_that(auto_provision, any_of(equal_to(True), equal_to(False)), "Unexpected value for auto_provision "
-                                                                             "on agent pcap config file creation")
+    def pktvisor_config_file(self, tap_name, input_type="pcap", input_tags="3", settings=None):
+        assert_that(self.config_type, equal_to("pktvisor"))
         assert_that(input_type, any_of(equal_to("pcap"), equal_to("flow"), equal_to("dnstap"), equal_to("netprobe")),
                     "Unexpect type of input type.")
-        if "iface" in settings.keys() and isinstance(settings["iface"], str) and \
-                (settings["iface"].lower() == "default" or settings["iface"].lower() == "mocked"):
-            settings['iface'] = iface
         tap = Taps()
         if input_type == "pcap":
             tap.add_pcap(tap_name, **settings)
@@ -50,80 +32,111 @@ def config_file_of_orb_agent(cls, name, token, iface, orb_url, base_orb_mqtt, ta
         if input_tags is not None and input_tags != '0':
             tap_tags = create_tags_set(input_tags, tag_prefix='testtaptag', string_mode='lower')
             tap.add_tag(tap_name, tap_tags)
-        if overwrite_default is True:
-            pkt_name_file = "agent"
-        else:
-            pkt_name_file = name
-        if auto_provision:
-            agent = {
-                "version": "1.0",
-                "visor": {
-                    "taps": tap.taps
-                },
-                "orb": {
-                    "backends": {
-                        "pktvisor": {
-                            "binary": "/usr/local/sbin/pktvisord",
-                            "config_file": f"{default_path_config_file}/{pkt_name_file}.yaml"
-                        }
-                    },
-                    "tls": {
-                        "verify": tls_verify
-                    },
-                    "cloud": {
-                        "config": {
-                            "auto_provision": auto_provision,
-                            "agent_name": name
-                        },
-                        "api": {
-                            "address": orb_url,
-                            "token": token
-                        },
-                        "mqtt": {
-                            "address": base_orb_mqtt
-                        }
-                    }
-                }
+        pktvisor_backend = \
+            {"visor": {
+                "taps": tap.taps
+            }}
+        return pktvisor_backend, tap.taps
+
+    def otel_config_file(self):
+        assert_that(self.config_type, equal_to("otel"))
+        return dict()
+
+    def orb_agent_config_file(self, backend_type, config_file, auto_provision, port, backend_settings, cloud_settings,
+                              orb_url, base_orb_mqtt, tls_verify=True):
+        assert_that(self.config_type, equal_to("orb_agent"))
+        agent = AgentConfigs(tls_verify)
+        agent.add_backend(backend_type, config_file, port, **backend_settings)
+        agent.set_cloud(auto_provision, orb_url, base_orb_mqtt, **cloud_settings)
+        return agent.config
+
+
+class AgentConfigs:
+    def __init__(self, tls_verify=True):
+        assert_that(tls_verify, any_of(equal_to(True), equal_to(False)), "Unexpected value for tls_verify on "
+                                                                         "agent config file creation")
+        self.config = {
+            "version": "1.0",
+            "orb": {
+                "backends": {},
+                "cloud": {},
+                "tls": {"verify": tls_verify}
             }
-            if include_otel_env_var is True:
-                agent['orb']['otel'] = {"enable": enable_otel}
+        }
+
+    def add_backend(self, backend_type, config_file, port, **settings):
+        backend = {backend_type: {}}
+        if config_file is not None:
+            backend[backend_type].update({"config_file": config_file})
+        backend[backend_type].update(settings)
+        if backend_type == "pktvisor":
+            backend[backend_type].update({"api_port": port})
+        elif backend_type == "otel":
+            backend[backend_type].update({"otlp_port": port})
+        self.config["orb"]["backends"].update(backend)
+        return self.config
+
+    def remove_backend(self, backend):
+        self.config["backends"].pop(backend, None)
+        return self.config
+
+    def set_cloud(self, auto_provision, orb_url, base_orb_mqtt, **settings):
+        assert_that(auto_provision, any_of(equal_to(True), equal_to(False)), "Unexpected value for auto_provision "
+                                                                             "on agent config file creation")
+        settings_log = settings.copy()
+        if "token" in settings.keys():
+            settings_log["token"] = "********"
+        log.debug(f"Settings for agent cloud: {settings_log}")
+
+        cloud_config = {"auto_provision": auto_provision}
+        cloud_api = {"address": orb_url}
+        cloud_mqtt = {"address": base_orb_mqtt}
+
+        if auto_provision:
+            assert_that(settings, has_key("name"), "Missing agent name for auto provision agent")
+            assert_that(settings, has_key("token"), "Missing token for auto provision agent")
+            cloud_config.update({"agent_name": settings["name"]})
+            cloud_api.update({"token": settings["token"]})
         else:
-            assert_that(orb_cloud_mqtt_id, not_(is_(None)), "orb_cloud_mqtt_id must have a valid value")
-            assert_that(orb_cloud_mqtt_channel_id, not_(is_(None)), "orb_cloud_mqtt_channel_id must have a valid value")
-            assert_that(orb_cloud_mqtt_key, not_(is_(None)), "orb_cloud_mqtt_key must have a valid value")
-            agent = {
-                "version": "1.0",
-                "visor": {
-                    "taps": tap.taps
-                },
-                "orb": {
-                    "backends": {
-                        "pktvisor": {
-                            "binary": "/usr/local/sbin/pktvisord",
-                            "config_file": f"{default_path_config_file}/{pkt_name_file}.yaml"
-                        }
-                    },
-                    "tls": {
-                        "verify": tls_verify
-
-                    },
-                    "cloud": {
-                        "config": {
-                            "auto_provision": auto_provision
-                        },
-                        "api": {
-                            "address": orb_url
-                        },
-                        "mqtt": {
-                            "address": base_orb_mqtt,
-                            "id": orb_cloud_mqtt_id,
-                            "key": orb_cloud_mqtt_key,
-                            "channel_id": orb_cloud_mqtt_channel_id
-                        }
-                    }
-                }
-            }
-            if include_otel_env_var is True:
-                agent['orb']['otel'] = {"enable": enable_otel}
-        agent = yaml.dump(agent)
-        return agent, tap.taps
+            assert_that(settings, has_key("orb_cloud_mqtt_id"), "Missing id for cloud mqtt")
+            assert_that(settings, has_key("orb_cloud_mqtt_key"), "Missing key for cloud mqtt")
+            assert_that(settings, has_key("orb_cloud_mqtt_channel_id"), "Missing channel id for cloud mqtt")
+            mqtt_configs = {"id": settings["orb_cloud_mqtt_id"], "key": settings["orb_cloud_mqtt_key"],
+                            "channel_id": settings["orb_cloud_mqtt_channel_id"]}
+            cloud_mqtt.update(mqtt_configs)
+
+        cloud = {"api": cloud_api, "mqtt": cloud_mqtt, "config": cloud_config}
+
+        self.config["orb"]["cloud"].update(cloud)
+        return self.config
+
+
+class FleetAgent:
+    def __init__(self):
+        pass
+
+    @classmethod
+    def config_file_of_orb_agent(cls, backend_type, auto_provision, port, backend_settings,
+                                 cloud_settings, orb_url, base_orb_mqtt, tls_verify=True, backend_file=None,
+                                 config_file="default", overwrite_default=False):
+        assert_that(tls_verify, any_of(equal_to(True), equal_to(False)), "Unexpected value for tls_verify on "
+                                                                         "agent pcap config file creation")
+        assert_that(overwrite_default, any_of(equal_to(True), equal_to(False)),
+                    "Unexpected value for overwrite_default")
+        agent_name = cloud_settings.get("name", None)
+        assert_that(agent_name, not_none(), "Missing agent name for agent config file")
+        if overwrite_default is True:
+            name_agent_file = "agent"
+        else:
+            name_agent_file = agent_name
+        cloud_settings.update({"name": agent_name})
+        if config_file == "default":
+            config_file = f"{default_path_config_file}/{name_agent_file}.yaml"
+        orb_agent_file = ConfigFiles("orb_agent").orb_agent_config_file(backend_type, config_file, auto_provision, port,
+                                                                        backend_settings, cloud_settings,
+                                                                        orb_url, base_orb_mqtt, tls_verify=True)
+        if backend_file is not None:
+            assert_that(isinstance(backend_file, dict), equal_to(True), f"Invalid backend file: {backend_file}")
+            orb_agent_file.update(backend_file)
+        agent = yaml.dump(orb_agent_file)
+        return agent
diff --git a/python-test/features/steps/control_agent_group_ui.py b/python-test/features/steps/agent_group_ui.py
similarity index 98%
rename from python-test/features/steps/control_agent_group_ui.py
rename to python-test/features/steps/agent_group_ui.py
index 286bc7b50..1fff430d4 100644
--- a/python-test/features/steps/control_agent_group_ui.py
+++ b/python-test/features/steps/agent_group_ui.py
@@ -1,10 +1,10 @@
 from behave import when, then, step
-from test_config import TestConfig
+from configs import TestConfig
 from ui_utils import *
 from hamcrest import *
 from utils import random_string, create_tags_set
 from page_objects import *
-from control_plane_agent_groups import agent_group_name_prefix, agent_group_description, list_agent_groups
+from agent_groups import agent_group_name_prefix, agent_group_description, list_agent_groups
 
 configs = TestConfig.configs()
 orb_url = configs.get('orb_url')
diff --git a/python-test/features/steps/control_plane_agent_groups.py b/python-test/features/steps/agent_groups.py
similarity index 90%
rename from python-test/features/steps/control_plane_agent_groups.py
rename to python-test/features/steps/agent_groups.py
index d5489c781..cd50b3e04 100644
--- a/python-test/features/steps/control_plane_agent_groups.py
+++ b/python-test/features/steps/agent_groups.py
@@ -1,16 +1,19 @@
 import re
-from test_config import TestConfig
+from configs import TestConfig
 from local_agent import get_orb_agent_logs
 from users import get_auth_token
-from utils import random_string, filter_list_by_parameter_start_with, generate_random_string_with_predefined_prefix, \
-    create_tags_set, check_logs_contain_message_and_name, threading_wait_until, validate_json
+from utils import (random_string, filter_list_by_parameter_start_with, generate_random_string_with_predefined_prefix, \
+                   create_tags_set, check_logs_contain_message_and_name, threading_wait_until, validate_json,
+                   return_api_post_response, return_api_get_response, return_api_delete_response,
+                   return_api_put_response)
 from behave import given, then, step
 from hamcrest import *
-import requests
 from random import sample
 import json
 import random
+from logger import Logger
 
+log = Logger().logger_instance()
 configs = TestConfig.configs()
 agent_group_name_prefix = 'test_group_name_'
 agent_group_description = "This is an agent group"
@@ -44,8 +47,8 @@ def create_agent_group_matching_agent(context, amount_of_agent_groups, amount_of
                                                      f"Agent:{context.agent}")
     for group in range(int(amount_of_agent_groups)):
         agent_group_name = agent_group_name_prefix + random_string()
-        agent_group_data = generate_group_with_valid_json(context.token, agent_group_name, group_description,
-                                                          tags_to_group, context.agent_groups)
+        generate_group_with_valid_json(context.token, agent_group_name, group_description,
+                                       tags_to_group, context.agent_groups)
 
 
 @step("{amount_of_agent_groups} Agent Group(s) is created with {orb_tags} orb tag(s) (lower case)")
@@ -317,20 +320,16 @@ def create_agent_group(token, name, description, tags, expected_status_code=201)
     """
 
     json_request = {"name": name, "description": description, "tags": tags}
-    headers_request = {'Content-type': 'application/json', 'Accept': '*/*', 'Authorization': f'Bearer {token}'}
     if expected_status_code == 201:
         assert_that(len(tags), greater_than(0), f"Tags is required to created a group. Json used: {json_request}")
-    response = requests.post(orb_url + '/api/v1/agent_groups', json=json_request, headers=headers_request,
-                             verify=verify_ssl_bool)
-    try:
-        response_json = response.json()
-    except ValueError:
-        response_json = response.text
-    assert_that(response.status_code, equal_to(expected_status_code),
-                f"Request to create agent group failed with status= {str(response.status_code)}. Response="
-                f" {str(response_json)}. Json used: {json_request}")
+    status_code, response = return_api_post_response(f"{orb_url}/api/v1/agent_groups",
+                                                     request_body=json_request, token=token, verify=verify_ssl_bool)
 
-    return response_json
+    assert_that(status_code, equal_to(expected_status_code),
+                f"Request to create agent group failed with status= {str(status_code)}. Response="
+                f" {str(response)}. Json used: {json_request}")
+
+    return response
 
 
 def get_agent_group(token, agent_group_id):
@@ -341,15 +340,14 @@ def get_agent_group(token, agent_group_id):
     :param (str) agent_group_id: that identifies the agent group to be fetched
     :returns: (dict) the fetched agent group
     """
-
-    get_groups_response = requests.get(orb_url + '/api/v1/agent_groups/' + agent_group_id,
-                                       headers={'Authorization': f'Bearer {token}'}, verify=verify_ssl_bool)
-
-    assert_that(get_groups_response.status_code, equal_to(200),
+    status_code, response = return_api_get_response(f"{orb_url}/api/v1/agent_groups/{agent_group_id}",
+                                                    token=token,
+                                                    verify=verify_ssl_bool)
+    assert_that(status_code, equal_to(200),
                 'Request to get agent group id=' + agent_group_id + ' failed with status=' + str(
-                    get_groups_response.status_code))
+                    status_code))
 
-    return get_groups_response.json()
+    return response
 
 
 def list_agent_groups(token, limit=100, offset=0):
@@ -382,15 +380,18 @@ def list_up_to_limit_agent_groups(token, limit=100, offset=0):
     :param (int) offset: Number of items to skip during retrieval. Default = 0.
     :returns: (list) a list of agent groups, (int) total groups on orb, (int) offset
     """
+    status_code, response = return_api_get_response(f"{orb_url}/api/v1/agent_groups",
+                                                    token=token, verify=verify_ssl_bool,
+                                                    params={"limit": limit, "offset": offset})
 
-    response = requests.get(orb_url + '/api/v1/agent_groups', headers={'Authorization': f'Bearer {token}'},
-                            params={"limit": limit, "offset": offset}, verify=verify_ssl_bool)
+    assert_that(status_code, equal_to(200),
+                'Request to list agent groups failed with status=' + str(status_code))
 
-    assert_that(response.status_code, equal_to(200),
-                'Request to list agent groups failed with status=' + str(response.status_code))
+    assert_that(response, has_key('agentGroups'), f"Response does not contain agentGroups. Response: {str(response)}")
+    assert_that(response, has_key('total'), f"Response does not contain total. Response: {str(response)}")
+    assert_that(response, has_key('offset'), f"Response does not contain offset. Response: {str(response)}")
 
-    agent_groups_as_json = response.json()
-    return agent_groups_as_json['agentGroups'], agent_groups_as_json['total'], agent_groups_as_json['offset']
+    return response['agentGroups'], response['total'], response['offset']
 
 
 def delete_agent_groups(token, list_of_agent_groups):
@@ -412,12 +413,10 @@ def delete_agent_group(token, agent_group_id):
     :param (str) token: used for API authentication
     :param (str) agent_group_id: that identifies the agent group to be deleted
     """
-
-    response = requests.delete(orb_url + '/api/v1/agent_groups/' + agent_group_id,
-                               headers={'Authorization': f'Bearer {token}'}, verify=verify_ssl_bool)
-
-    assert_that(response.status_code, equal_to(204), 'Request to delete agent group id='
-                + agent_group_id + ' failed with status=' + str(response.status_code))
+    status_code, response = return_api_delete_response(f"{orb_url}/api/v1/agent_groups/{agent_group_id}",
+                                                       token=token, verify=verify_ssl_bool)
+    assert_that(status_code, equal_to(204), 'Request to delete agent group id='
+                + agent_group_id + ' failed with status=' + str(status_code))
 
 
 @threading_wait_until
@@ -462,24 +461,17 @@ def edit_agent_group(token, agent_group_id, name, description, tags, expected_st
                     "validate_only": False}
     json_request = {parameter: value for parameter, value in json_request.items() if value is not None}
 
-    headers_request = {'Content-type': 'application/json', 'Accept': '*/*', 'Authorization': f'Bearer {token}'}
-
-    group_edited_response = requests.put(orb_url + '/api/v1/agent_groups/' + agent_group_id, json=json_request,
-                                         headers=headers_request, verify=verify_ssl_bool)
-
+    status_code, response = return_api_put_response(f"{orb_url}/api/v1/agent_groups/{agent_group_id}",
+                                                    request_body=json_request, token=token, verify=verify_ssl_bool)
     if tags == {} or name == {}:
         expected_status_code = 400
-    try:
-        response_json = group_edited_response.json()
-    except ValueError:
-        response_json = group_edited_response.text
-        
-    assert_that(group_edited_response.status_code, equal_to(expected_status_code),
+
+    assert_that(status_code, equal_to(expected_status_code),
                 'Request to edit agent group failed with status=' + "status code =" +
-                str(group_edited_response.status_code) + "response =" + str(response_json) +
+                str(status_code) + "response =" + str(response) +
                 " json used: " + str(json_request))
 
-    return response_json, group_edited_response.status_code
+    return response, status_code
 
 
 def return_matching_groups(token, existing_agent_groups, agent_json):
@@ -544,6 +536,7 @@ def generate_group_with_valid_json(token, agent_group_name, group_description, t
     """
     agent_group_data = create_agent_group(token, agent_group_name, group_description,
                                           tags_to_group)
+    log.debug(f"Created agent group data: {agent_group_data}")
     group_id = agent_group_data['id']
     agent_groups[group_id] = agent_group_name
 
diff --git a/python-test/features/steps/control_plane_agents.py b/python-test/features/steps/agents.py
similarity index 72%
rename from python-test/features/steps/control_plane_agents.py
rename to python-test/features/steps/agents.py
index 4f7d4c1ec..d6e66454c 100644
--- a/python-test/features/steps/control_plane_agents.py
+++ b/python-test/features/steps/agents.py
@@ -1,12 +1,11 @@
-from test_config import TestConfig
+from configs import TestConfig
 from utils import *
 from local_agent import run_local_agent_container, run_agent_config_file, get_orb_agent_logs, get_logs_and_check
-from control_plane_agent_groups import return_matching_groups, tags_to_match_k_groups
+from agent_groups import return_matching_groups, tags_to_match_k_groups
 from behave import given, then, step
 from hamcrest import *
 from datetime import datetime
-import requests
-from agent_config_file import FleetAgent
+from agent_config_file import FleetAgent, ConfigFiles
 import yaml
 from yaml.loader import SafeLoader
 import re
@@ -46,33 +45,6 @@ def check_if_agents_exist(context, orb_tags, status):
                                                  f"Agent logs: {get_orb_agent_logs(context.container_id)}."
                                                  f"\nLogs: {logs}")
 
-# this step is only necessary for OTEL migration tests, so we can exclude it after the migration
-@given("that an agent with {orb_tags} orb tag(s) and OTEL {otel_type} already exists and is {status} within {timeout} seconds")
-def check_if_agents_exist(context, orb_tags, otel_type, status, timeout):
-    timeout = int(timeout)
-    assert_that(otel_type, any_of("enabled", "disabled"), "Invalid otel type")
-    otel_map = {"enabled":"true", "disabled":"false"}
-    context.agent_name = generate_random_string_with_predefined_prefix(agent_name_prefix)
-    context.orb_tags = create_tags_set(orb_tags)
-    context.agent = create_agent(context.token, context.agent_name, context.orb_tags)
-    context.agent_key = context.agent["key"]
-    token = context.token
-    run_local_agent_container(context, "available", include_otel_env_var="true", enable_otel=otel_map[otel_type])
-    agent_id = context.agent['id']
-    existing_agents = get_agent(token, agent_id)
-    assert_that(len(existing_agents), greater_than(0), "Agent not created")
-    logs = get_orb_agent_logs(context.container_id)
-    agent_status, context.agent = wait_until_expected_agent_status(token, agent_id, status, timeout=timeout)
-    assert_that(agent_status, is_(equal_to(status)),
-                f"Agent did not get '{status}' after {str(timeout)} seconds, but was '{agent_status}'. \n"
-                f"Agent: {json.dumps(context.agent, indent=4)}. \n Logs: {logs}")
-    local_orb_path = configs.get("local_orb_path")
-    agent_schema_path = local_orb_path + "/python-test/features/steps/schemas/agent_schema.json"
-    is_schema_valid = validate_json(context.agent, agent_schema_path)
-    assert_that(is_schema_valid, equal_to(True), f"Invalid agent json. \n Agent = {context.agent}."
-                                                 f"Agent logs: {get_orb_agent_logs(context.container_id)}."
-                                                 f"\nLogs: {logs}")
-
 
 @step('a new agent is created with {orb_tags} orb tag(s)')
 def agent_is_created(context, orb_tags):
@@ -227,6 +199,17 @@ def list_policies_applied_to_an_agent_and_referred_status(context, amount_of_pol
                 f"Agent: {context.agent}. \n Logs: {logs}")
 
 
+@step("the version of policy in agent must be {policy_version}")
+def check_agent_version_policy(context, policy_version):
+    assert_that(policy_version.isdigit(), equal_to(True), "Policy version must be a number")
+    policy_version = int(policy_version)
+    policy_id = context.policy.get("id")
+    agent, correct_version = wait_policy_version_in_agent(context.token, context.agent.get("id"),
+                                                          policy_id, policy_version)
+    assert_that(correct_version, equal_to(True), f"Policy {policy_id} version "
+                                                 f"{policy_version} was not applied. Agent: {agent}")
+
+
 @step("this agent's heartbeat shows that {amount_of_policies} policies are applied to the agent")
 def list_policies_applied_to_an_agent(context, amount_of_policies):
     context.agent, context.list_agent_policies_id = get_policies_applied_to_an_agent(context.token, context.agent['id'],
@@ -334,20 +317,22 @@ def check_agent_exists_on_backend(token, agent_name, event=None):
     return agent, event.is_set()
 
 
-@step("an agent(input_type:{input_type}, settings: {settings}) is {provision} via a configuration file on port {port} "
-      "with {agent_tags} agent tags and has status {status}. [Overwrite default: {overwrite_default}. Paste only "
-      "file: {paste_only_file}. Use specif backend for pktvisor {pkt_config}]")
-def provision_agent_using_config_file_drop_pkt_config(context, input_type, settings, provision, port, agent_tags,
-                                                      status, overwrite_default, paste_only_file, pkt_config):
-    pkt_config = json.loads(pkt_config)
-    provision_agent_using_config_file(context, input_type, settings, provision, port, agent_tags, status,
-                                      overwrite_default, paste_only_file, pkt_config=pkt_config)
+@step("an agent(backend_type:{backend_type}, settings: {settings}) is {provision} via a configuration file on "
+      "port {port} with {agent_tags} agent tags and has status {status}. [Overwrite default: {overwrite_default}. "
+      "Paste only file: {paste_only_file}. Use specific backend config {specific_backend_config}]")
+def provision_agent_using_config_file_drop_pkt_config(context, backend_type, settings, provision, port, agent_tags,
+                                                      status, overwrite_default, paste_only_file,
+                                                      specific_backend_config):
+    specific_backend_config = json.loads(specific_backend_config)
+    provision_agent_using_config_file(context, backend_type, settings, provision, port, agent_tags, status,
+                                      overwrite_default, paste_only_file,
+                                      specific_backend_config=specific_backend_config)
 
 
-@step("an agent(input_type:{input_type}, settings: {settings}) is {provision} via a configuration file on port {port} "
-      "with {agent_tags} agent tags and has status {status}. [Overwrite default: {overwrite_default}. Paste only "
+@step("an agent(backend_type:{backend_type}, settings: {settings}) is {provision} via a configuration file on port {"
+      "port} with {agent_tags} agent tags and has status {status}. [Overwrite default: {overwrite_default}. Paste only "
       "file: {paste_only_file}]")
-def provision_agent_using_config_file(context, input_type, settings, provision, port, agent_tags, status,
+def provision_agent_using_config_file(context, backend_type, settings, provision, port, agent_tags, status,
                                       overwrite_default, paste_only_file, **kwargs):
     assert_that(provision, any_of(equal_to("self-provisioned"), equal_to("provisioned")), "Unexpected provision "
                                                                                           "attribute")
@@ -371,11 +356,6 @@ def provision_agent_using_config_file(context, input_type, settings, provision,
             settings["port"] = port_to_attach
     if "port" in settings.keys() and settings["port"] == "switch":
         settings["port"] = context.switch_port
-    if 'input_tags' in settings.keys():
-        input_tags = settings['input_tags']
-        settings.pop('input_tags')
-    else:
-        input_tags = '3'
     if provision == "provisioned":
         auto_provision = "false"
         orb_cloud_mqtt_id = context.agent['id']
@@ -393,35 +373,43 @@ def provision_agent_using_config_file(context, input_type, settings, provision,
         interface = context.mock_iface_name
     else:
         interface = configs.get('orb_agent_interface', 'auto')
+    settings["iface"] = interface
     orb_url = configs.get('orb_url')
-    base_orb_address = configs.get('orb_address')
     context.port = return_port_by_availability(context, True)
     if "tap_name" in context:
         tap_name = context.tap_name
     else:
         tap_name = agent_name
-    pkt_configs = {"binary": "default", "config_file": "default"}
-    if 'pkt_config' in kwargs.keys():
-        if "binary" in kwargs['pkt_config'].keys():
-            pkt_configs["binary"] = kwargs['pkt_config']["binary"]
-        if "config_file" in kwargs['pkt_config'].keys():
-            pkt_configs["config_file"] = kwargs['pkt_config']["config_file"]
+    settings["tap_name"] = tap_name
     context.agent_file_name, tags_on_agent, context.tap, safe_config_file = \
-        create_agent_config_file(context.token, agent_name, interface, agent_tags, orb_url, base_orb_address,
+        create_agent_config_file(backend_type, context.token, agent_name, agent_tags, orb_url,
                                  context.port,
-                                 context.agent_groups, tap_name, input_type, input_tags, auto_provision,
+                                 context.agent_groups, auto_provision,
                                  orb_cloud_mqtt_id, orb_cloud_mqtt_key, orb_cloud_mqtt_channel_id, settings,
-                                 overwrite_default, paste_only_file, pkt_configs['binary'], pkt_configs['config_file'])
-    for key, value in context.tap.items():
-        if 'tags' in value.keys():
-            context.tap_tags.update({key: value['tags']})
+                                 overwrite_default, paste_only_file, **kwargs)
+    if backend_type == "pktvisor":
+        for key, value in context.tap.items():
+            if 'tags' in value.keys():
+                context.tap_tags.update({key: value['tags']})
+    else:
+        context.tap_tags = {}
     context.container_id = run_agent_config_file(context.agent_file_name, overwrite_default, paste_only_file)
     if context.container_id not in context.containers_id.keys():
         context.containers_id[context.container_id] = str(context.port)
-    log = f"web server listening on localhost:{context.port}"
-    agent_started, logs = get_logs_and_check(context.container_id, log, element_to_check="log")
-    assert_that(agent_started, equal_to(True), f"Log {log} not found on agent logs. Agent Name: {agent_name}.\n"
-                                               f"Logs:{logs}")
+    if backend_type == "pktvisor":
+        log_message = f"web server listening on localhost:{context.port}"
+        agent_started, logs, log_line = get_logs_and_check(context.container_id, log_message, element_to_check="log")
+        assert_that(agent_started, equal_to(True), f"Log {log_message} not found on agent logs."
+                                                   f" Agent Name: {agent_name}. Logs:{logs}")
+    else:
+        log_message = f"Started receiver for OTLP in orb-agent"
+        agent_started, logs, log_line = get_logs_and_check(context.container_id, log_message, element_to_check="msg")
+        assert_that(agent_started, equal_to(True), f"Log {log_message} not found on agent logs."
+                                                   f" Agent Name: {agent_name}. Logs:{logs}")
+        assert_that(str(log_line.get("port", "")), equal_to(str(context.port)), f"Log {log_message} related to port "
+                                                                                f"{context.port} not found on agent "
+                                                                                f"logs. Logs: {logs}")
+
     context.agent, is_agent_created = check_agent_exists_on_backend(context.token, agent_name, timeout=60)
     logs = get_orb_agent_logs(context.container_id)
     assert_that(is_agent_created, equal_to(True), f"Agent {agent_name} not found in /agents route."
@@ -444,12 +432,12 @@ def provision_agent_using_config_file(context, input_type, settings, provision,
 @step("remotely restart the agent")
 def reset_agent_remotely(context):
     context.considered_timestamp_reset = datetime.now().timestamp()
-    headers_request = {'Content-type': 'application/json', 'Accept': '*/*', 'Authorization': f'Bearer {context.token}'}
-    response = requests.post(f"{orb_url}/api/v1/agents/{context.agent['id']}/rpc/reset", headers=headers_request,
-                             verify=verify_ssl_bool)
+    status_code, repsonse = (
+        return_api_post_response(f"{orb_url}/api/v1/agents/{context.agent['id']}/rpc/reset",
+                                 token=context.token, verify=verify_ssl_bool))
     logs = get_orb_agent_logs(context.container_id)
-    assert_that(response.status_code, equal_to(200),
-                f"Request to restart agent failed with status= {str(response.status_code)}. \n Agent: {context.agent}\n"
+    assert_that(status_code, equal_to(200),
+                f"Request to restart agent failed with status= {str(status_code)}. \n Agent: {context.agent}\n"
                 f" Logs: {logs}")
 
 
@@ -462,13 +450,13 @@ def check_agent_backend_pktvisor_routes(context, route):
                             "inputs": "backends/pktvisor/inputs",
                             "handlers": "backends/pktvisor/handlers"}
 
-    response = requests.get(orb_url + '/api/v1/agents/' + agent_backend_routes[route],
-                            headers={'Authorization': f'Bearer {context.token}'}, verify=verify_ssl_bool)
-    assert_that(response.status_code, equal_to(200),
-                f"Request to get {route} route failed with status =" + str(response.status_code))
+    status_code, response = return_api_get_response(f"{orb_url}/api/v1/agents/{agent_backend_routes[route]}",
+                                                    token=context.token, verify=verify_ssl_bool)
+    assert_that(status_code, equal_to(200),
+                f"Request to get {route} route failed with status =" + str(status_code))
     local_orb_path = configs.get("local_orb_path")
     route_schema_path = local_orb_path + f"/python-test/features/steps/schemas/{route}_schema.json"
-    is_schema_valid = validate_json(response.json(), route_schema_path)
+    is_schema_valid = validate_json(response, route_schema_path)
     assert_that(is_schema_valid, equal_to(True), f"Invalid route json. \n Route = {route}")
 
 
@@ -597,8 +585,7 @@ def wait_until_expected_backend_state(token, agent_id, backend, state, event=Non
     :param (obj) event: threading.event
     """
 
-    agent = get_agent(token, agent_id)
-    backend_state = agent["last_hb_data"]["backend_state"][backend]['state']
+    backend_state, agent = get_backend_info(token, agent_id, backend, "state")
     if backend_state == state:
         event.set()
         return backend_state, agent
@@ -618,39 +605,51 @@ def wait_until_expected_backend_error(token, agent_id, backend, error, event=Non
     :param (obj) event: threading.event
     """
 
-    agent = get_agent(token, agent_id)
-    if 'error' in agent["last_hb_data"]["backend_state"][backend].keys():
-        backend_error = agent["last_hb_data"]["backend_state"][backend]['error']
-        if backend_error == error:
-            event.set()
-            return backend_error, agent
+    backend_error, agent = get_backend_info(token, agent_id, backend, "error")
+    if backend_error == error:
+        event.set()
         return backend_error, agent
     else:
         return None, agent
 
 
-def get_agent(token, agent_id, status_code=200):
+def get_backend_info(token, agent_id, backend, info):
+    """
+    Get the backend state for a specific agent.
+
+    :param str token: Access token for authentication
+    :param str agent_id: ID of the agent
+    :param str backend: Name of the agent backend
+    :param str info: Info requested
+    :return: The agent backend required info
+    :rtype: str or None
+    """
+    agent = get_agent(token, agent_id)
+    try:
+        last_hb_data = agent.get("last_hb_data", {})
+        backend_info = last_hb_data.get("backend_state", {}).get(backend, {}).get(info)
+        return backend_info, agent
+    except Exception as e:
+        log.error(f"Error getting backend {info}: {e}. Agent: {agent}")
+        return None, agent
+
+
+def get_agent(token, agent_id, expected_status_code=200):
     """
     Gets an agent from Orb control plane
 
     :param (str) token: used for API authentication
     :param (str) agent_id: that identifies agent to be fetched
-    :param (int) status_code: status code that must be returned on response
+    :param (int) expected_status_code: status code that must be returned on response
     :returns: (dict) the fetched agent
     """
+    status_code, response = return_api_get_response(f"{orb_url}/api/v1/agents/{agent_id}", token=token,
+                                                    verify=verify_ssl_bool)
+    assert_that(status_code, equal_to(expected_status_code),
+                f"Request to get agent id= {agent_id} failed with status= {status_code}:"
+                f"{response}")
 
-    get_agents_response = requests.get(orb_url + '/api/v1/agents/' + agent_id,
-                                       headers={'Authorization': f'Bearer {token}'}, verify=verify_ssl_bool)
-    try:
-        response_json = get_agents_response.json()
-    except ValueError:
-        response_json = ValueError
-
-    assert_that(get_agents_response.status_code, equal_to(status_code),
-                f"Request to get agent id= {agent_id} failed with status= {str(get_agents_response.status_code)}:"
-                f"{str(response_json)}")
-
-    return response_json
+    return response
 
 
 def list_agents(token, limit=100, offset=0):
@@ -685,16 +684,12 @@ def list_up_to_limit_agents(token, limit=100, offset=0):
     :returns: (list) a list of agents, (int) total agents on orb, (int) offset
     """
 
-    response = requests.get(orb_url + '/api/v1/agents', headers={'Authorization': f'Bearer {token}'},
-                            params={"limit": limit, "offset": offset}, verify=verify_ssl_bool)
-    try:
-        response_json = response.json()
-    except ValueError:
-        response_json = response.text
-    assert_that(response.status_code, equal_to(200),
-                f"Request to list agents failed with status= {str(response.status_code)}:{str(response_json)}")
-    agents_as_json = response.json()
-    return agents_as_json['agents'], agents_as_json['total'], agents_as_json['offset']
+    status_code, response = return_api_get_response(f"{orb_url}/api/v1/agents", token=token,
+                                                    params={"limit": limit, "offset": offset}, verify=verify_ssl_bool)
+
+    assert_that(status_code, equal_to(200),
+                f"Request to list agents failed with status= {str(status_code)}:{str(response)}")
+    return response['agents'], response['total'], response['offset']
 
 
 def delete_agents(token, list_of_agents):
@@ -716,30 +711,23 @@ def delete_agent(token, agent_id):
     :param (str) token: used for API authentication
     :param (str) agent_id: that identifies the agent to be deleted
     """
+    status_code, response = return_api_delete_response(f"{orb_url}/api/v1/agents/{agent_id}", token=token,
+                                                       verify=verify_ssl_bool)
 
-    response = requests.delete(orb_url + '/api/v1/agents/' + agent_id,
-                               headers={'Authorization': f'Bearer {token}'}, verify=verify_ssl_bool)
-
-    assert_that(response.status_code, equal_to(204), 'Request to delete agent id='
-                + agent_id + ' failed with status=' + str(response.status_code))
+    assert_that(status_code, equal_to(204), f"Request to delete agent id= {agent_id} failed with status= {status_code}")
 
 
 @threading_wait_until
 def wait_until_agent_being_created(token, name, tags, expected_status_code=201, event=None):
     json_request = {"name": name, "orb_tags": tags, "validate_only": False}
-    headers_request = {'Content-type': 'application/json', 'Accept': '*/*',
-                       'Authorization': f'Bearer {token}'}
 
-    response = requests.post(orb_url + '/api/v1/agents', json=json_request, headers=headers_request,
-                             verify=verify_ssl_bool)
-    try:
-        response_json = response.json()
-    except ValueError:
-        response_json = response.text
-    if response.status_code == expected_status_code:
+    status_code, response = return_api_post_response(f"{orb_url}/api/v1/agents", token=token,
+                                                     request_body=json_request,
+                                                     verify=verify_ssl_bool)
+    if status_code == expected_status_code:
         event.set()
-        return response, response_json
-    return response, response_json
+        return status_code, response
+    return status_code, response
 
 
 def create_agent(token, name, tags, expected_status_code=201):
@@ -752,11 +740,11 @@ def create_agent(token, name, tags, expected_status_code=201):
     :param expected_status_code: status code to be returned on response
     :returns: (dict) a dictionary containing the created agent data
     """
-    response, response_json = wait_until_agent_being_created(token, name, tags, expected_status_code)
-    assert_that(response.status_code, equal_to(expected_status_code),
-                'Request to create agent failed with status=' + str(response.status_code) + ":" + str(response_json))
+    status_code, response = wait_until_agent_being_created(token, name, tags, expected_status_code)
+    assert_that(status_code, equal_to(expected_status_code),
+                'Request to create agent failed with status=' + str(status_code) + ":" + str(response))
 
-    return response_json
+    return response
 
 
 def edit_agent(token, agent_id, name, tags, expected_status_code=200):
@@ -770,18 +758,13 @@ def edit_agent(token, agent_id, name, tags, expected_status_code=200):
     """
 
     json_request = {"name": name, "orb_tags": tags, "validate_only": False}
-    headers_request = {'Content-type': 'application/json', 'Accept': '*/*',
-                       'Authorization': f'Bearer {token}'}
-    response = requests.put(orb_url + '/api/v1/agents/' + agent_id, json=json_request, headers=headers_request,
-                            verify=verify_ssl_bool)
-    try:
-        response_json = response.json()
-    except ValueError:
-        response_json = response.text
-    assert_that(response.status_code, equal_to(expected_status_code),
-                'Request to edit agent failed with status=' + str(response.status_code) + ":" + str(response_json))
+    status_code, response = return_api_put_response(orb_url + '/api/v1/agents/' + agent_id, request_body=json_request,
+                                                    token=token, verify=verify_ssl_bool)
+
+    assert_that(status_code, equal_to(expected_status_code),
+                'Request to edit agent failed with status=' + str(status_code) + ":" + str(response))
 
-    return response_json
+    return response
 
 
 @threading_wait_until
@@ -842,35 +825,122 @@ def get_groups_to_which_agent_is_matching(token, agent_id, groups_matching_ids,
     return list_groups_id, agent
 
 
-def create_agent_config_file(token, agent_name, iface, agent_tags, orb_url, base_orb_address, port,
-                             existing_agent_groups, tap_name, input_type="pcap", input_tags='3', auto_provision="true",
+def create_agent_config_file(backend_type, token, agent_name, agent_tags, orb_url, port,
+                             existing_agent_groups, auto_provision="true",
                              orb_cloud_mqtt_id=None, orb_cloud_mqtt_key=None, orb_cloud_mqtt_channel_id=None,
-                             settings=None, overwrite_default=False, only_file=False, pktvisor_binary=None,
-                             pktvisor_config_file=None):
+                             settings=None, overwrite_default=False, only_file=False, **kwargs):
+    """
+    Create a file .yaml with configs of the agent that will be provisioned
+
+    :param backend_type: agent backend type
+    :param (str) token: used for API authentication
+    :param (str) agent_name: name of the agent that will be created
+    :param (str) agent_tags: agent tags
+    :param orb_url: url address of ORB
+    :param (str) port: port on which agent must run.
+    :param (dict) existing_agent_groups: all agent groups available
+    :param (str) auto_provision: if true auto_provision the agent. If false, provision an agent already existent on orb
+    :param (str) orb_cloud_mqtt_id: agent mqtt id.
+    :param (str) orb_cloud_mqtt_key: agent mqtt key.
+    :param (str) orb_cloud_mqtt_channel_id: agent mqtt channel id.
+    :param (dict) settings: settings of input
+    :param (bool) overwrite_default: if True and only_file is False saves the agent as "agent.yaml". Else, save it with
+    agent name
+    :param (bool) only_file: is true copy only the file. If false, copy the directory.
+    :return: path to the directory where the agent config file was created
+    """
+    assert_that(auto_provision, any_of(equal_to("true"), equal_to("false")), "Unexpected value for auto_provision "
+                                                                             "on agent config file creation")
+    verify_ssl_str = configs.get('verify_ssl')
+    verify_ssl = str_to_bool(verify_ssl_str)
+    auto_provision = str_to_bool(auto_provision)
+
+    if re.match(r"matching (\d+|all|the) group*", agent_tags):
+        amount_of_group = re.search(r"(\d+|all|the)", agent_tags).groups()[0]
+        all_used_tags = tags_to_match_k_groups(token, amount_of_group, existing_agent_groups)
+        tags = {"tags": all_used_tags}
+    else:
+        tags = {"tags": create_tags_set(agent_tags)}
+    mqtt_url = configs.get('mqtt_url')
+    cloud_settings = {"orb_cloud_mqtt_id": orb_cloud_mqtt_id,
+                      "orb_cloud_mqtt_key": orb_cloud_mqtt_key,
+                      "orb_cloud_mqtt_channel_id": orb_cloud_mqtt_channel_id,
+                      "name": agent_name,
+                      "token": token}
+    if backend_type == "pktvisor":
+        assert_that(settings, has_key("iface"), f"Missing iface on agent config file creation")
+        assert_that(settings, has_key("tap_name"), f"Missing tap_name on agent config file creation")
+        tap_name = settings.get('tap_name')
+        settings.pop('tap_name', None)
+        input_type = settings.get('input_type', 'pcap')
+        settings.pop('input_type', None)
+        input_tags = settings.get('input_tags', '3')
+        settings.pop('input_tags', None)
+        backend_file, taps = ConfigFiles(backend_type).pktvisor_config_file(tap_name, input_type, input_tags,
+                                                                            settings)
+        if "specific_backend_config" in kwargs.keys() and "binary" in kwargs["specific_backend_config"].keys():
+            binary = kwargs["specific_backend_config"]["binary"]
+            if isinstance(binary, str) and binary.lower() == "none":
+                binary = None
+        else:
+            binary = "/usr/local/sbin/pktvisord"
+        backend_settings = {"binary": binary}
+        backend_settings = remove_empty_from_json(backend_settings)
+    elif backend_type == "otel":
+        backend_file = ConfigFiles(backend_type).otel_config_file()
+        taps = {}
+        backend_settings = {}
+    else:
+        raise Exception(f"Unexpected value for backend_type on agent config file creation: {backend_type}")
+    if "specific_backend_config" in kwargs.keys() and "config_file" in kwargs["specific_backend_config"].keys():
+        config_file = kwargs["specific_backend_config"]["config_file"]
+        if isinstance(config_file, str) and config_file.lower() == "none":
+            config_file = None
+    else:
+        config_file = "default"
+
+    agent_config_file = FleetAgent.config_file_of_orb_agent(backend_type, auto_provision,
+                                                            f"{port}", backend_settings, cloud_settings,
+                                                            orb_url, mqtt_url, backend_file=backend_file,
+                                                            tls_verify=verify_ssl, overwrite_default=overwrite_default,
+                                                            config_file=config_file)
+    agent_config_file = yaml.load(agent_config_file, Loader=SafeLoader)
+    agent_config_file['orb'].update(tags)
+    agent_config_file_yaml = yaml.dump(agent_config_file)
+    safe_agent_config_file = agent_config_file.copy()
+    if "token" in safe_agent_config_file['orb']['cloud']['api'].keys():
+        safe_agent_config_file['orb']['cloud']['api']['token'] = "token omitted for security reason"
+    log.debug(f"Agent file: {safe_agent_config_file}")
+    dir_path = configs.get("local_orb_path")
+    if overwrite_default is True and only_file is False:
+        agent_name = "agent"
+    with open(f"{dir_path}/{agent_name}.yaml", "w+") as f:
+        f.write(agent_config_file_yaml)
+    return agent_name, tags, taps, safe_agent_config_file
+
+
+def create_agent_with_otel_backend_config_file(token, agent_name, agent_tags, orb_url, port,
+                                               existing_agent_groups, auto_provision="true",
+                                               orb_cloud_mqtt_id=None, orb_cloud_mqtt_key=None,
+                                               orb_cloud_mqtt_channel_id=None,
+                                               overwrite_default=False, only_file=False, otel_config_file=None):
     """
     Create a file .yaml with configs of the agent that will be provisioned
 
     :param (str) token: used for API authentication
     :param (str) agent_name: name of the agent that will be created
-    :param (str) iface: network interface
     :param (str) agent_tags: agent tags
     :param (str) orb_url: entire orb url
-    :param (str) base_orb_address: base orb url address
     :param (str) port: port on which agent must run.
     :param (dict) existing_agent_groups: all agent groups available
-    :param (str) tap_name: name of the input tap
-    :param (str) input_type: type of tap on agent. Default: pcap
-    :param (str) input_tags: tags to be inserted on input tap
     :param (str) auto_provision: if true auto_provision the agent. If false, provision an agent already existent on orb
     :param (str) orb_cloud_mqtt_id: agent mqtt id.
     :param (str) orb_cloud_mqtt_key: agent mqtt key.
     :param (str) orb_cloud_mqtt_channel_id: agent mqtt channel id.
-    :param (str) settings: settings of input
     :param (bool) overwrite_default: if True and only_file is False saves the agent as "agent.yaml". Else, save it with
     agent name
     :param (bool) only_file: is true copy only the file. If false, copy the directory.
-    :param (str) pktvisor_binary: path to pktvisor binary.
-    :param (str) pktvisor_config_file: path to pktvisor binary.
+    :param (str) otel_config_file: path to otel config file.
     :return: path to the directory where the agent config file was created
     """
     assert_that(auto_provision, any_of(equal_to("true"), equal_to("false")), "Unexpected value for auto_provision "
@@ -884,48 +954,34 @@ def create_agent_config_file(token, agent_name, iface, agent_tags, orb_url, base
         tags = {"tags": all_used_tags}
     else:
         tags = {"tags": create_tags_set(agent_tags)}
-    include_otel_env_var = configs.get('include_otel_env_var')
-    enable_otel = configs.get('enable_otel')
     mqtt_url = configs.get('mqtt_url')
     if configs.get('verify_ssl') == 'false':
-        agent_config_file, tap = FleetAgent.config_file_of_orb_agent(agent_name, token, iface, orb_url, mqtt_url,
-                                                                     tap_name,
-                                                                     tls_verify=False, auto_provision=auto_provision,
-                                                                     orb_cloud_mqtt_id=orb_cloud_mqtt_id,
-                                                                     orb_cloud_mqtt_key=orb_cloud_mqtt_key,
-                                                                     orb_cloud_mqtt_channel_id=orb_cloud_mqtt_channel_id,
-                                                                     input_type=input_type, input_tags=input_tags,
-                                                                     settings=settings,
-                                                                     include_otel_env_var=include_otel_env_var,
-                                                                     enable_otel=enable_otel,
-                                                                     overwrite_default=overwrite_default)
+        agent_config_file = (
+            FleetAgent.config_file_of_orb_agent_with_otel_backend(agent_name, token, orb_url,
+                                                                  mqtt_url, tls_verify=True,
+                                                                  auto_provision=auto_provision,
+                                                                  orb_cloud_mqtt_id=orb_cloud_mqtt_id,
+                                                                  orb_cloud_mqtt_key=orb_cloud_mqtt_key,
+                                                                  orb_cloud_mqtt_channel_id=orb_cloud_mqtt_channel_id,
+                                                                  overwrite_default=overwrite_default))
     else:
-        agent_config_file, tap = FleetAgent.config_file_of_orb_agent(agent_name, token, iface, orb_url, mqtt_url,
-                                                                     tap_name,
-                                                                     auto_provision=auto_provision,
-                                                                     orb_cloud_mqtt_id=orb_cloud_mqtt_id,
-                                                                     orb_cloud_mqtt_key=orb_cloud_mqtt_key,
-                                                                     orb_cloud_mqtt_channel_id=orb_cloud_mqtt_channel_id,
-                                                                     input_type=input_type, input_tags=input_tags,
-                                                                     settings=settings,
-                                                                     include_otel_env_var=include_otel_env_var,
-                                                                     enable_otel=enable_otel,
-                                                                     overwrite_default=overwrite_default)
+        agent_config_file = (
+            FleetAgent.config_file_of_orb_agent_with_otel_backend(agent_name, token, orb_url,
+                                                                  mqtt_url, tls_verify=True,
+                                                                  auto_provision=auto_provision,
+                                                                  orb_cloud_mqtt_id=orb_cloud_mqtt_id,
+                                                                  orb_cloud_mqtt_key=orb_cloud_mqtt_key,
+                                                                  orb_cloud_mqtt_channel_id=orb_cloud_mqtt_channel_id,
+                                                                  overwrite_default=overwrite_default))
     agent_config_file = yaml.load(agent_config_file, Loader=SafeLoader)
-    if pktvisor_config_file is None or pktvisor_config_file == "None":
-        agent_config_file['orb']['backends']['pktvisor'].pop("config_file", None)
-    elif pktvisor_config_file == "default":
-        pass
-    else:
-        agent_config_file['orb']['backends']['pktvisor']["config_file"] = pktvisor_config_file
-    if pktvisor_binary is None or pktvisor_binary == "None":
-        agent_config_file['orb']['backends']['pktvisor'].pop("binary", None)
-    elif pktvisor_binary == "default":
+    if otel_config_file is None or otel_config_file == "None":
+        agent_config_file['orb']['backends']['otel'].pop("config_file", None)
+    elif otel_config_file == "default":
         pass
     else:
-        agent_config_file['orb']['backends']['pktvisor']["binary"] = pktvisor_binary
+        agent_config_file['orb']['backends']['otel']["config_file"] = otel_config_file
     agent_config_file['orb'].update(tags)
-    agent_config_file['orb']['backends']['pktvisor'].update({"api_port": f"{port}"})
+    agent_config_file['orb']['backends']['otel'].update({"otlp_port": int(f"{port}")})
     agent_config_file_yaml = yaml.dump(agent_config_file)
     safe_agent_config_file = agent_config_file.copy()
     if "token" in safe_agent_config_file['orb']['cloud']['api'].keys():
@@ -935,7 +991,7 @@ def create_agent_config_file(token, agent_name, iface, agent_tags, orb_url, base
         agent_name = "agent"
     with open(f"{dir_path}/{agent_name}.yaml", "w+") as f:
         f.write(agent_config_file_yaml)
-    return agent_name, tags, tap, safe_agent_config_file
+    return agent_name, tags, safe_agent_config_file
 
 
 @threading_wait_until
@@ -978,3 +1034,20 @@ def get_agent_tags(token, agent_id, expected_tags, event=None):
     else:
         event.wait(1)
     return agent, event.is_set()
+
+
+@threading_wait_until
+def wait_policy_version_in_agent(token, agent_id, policy_id, policy_version, event=None):
+    """
+
+    :param (str) token: used for API authentication
+    :param (str) agent_id: that identifies the agent to be checked
+    :param (str) policy_id: that identifies the policy to be checked
+    :param (int) policy_version: that identifies the version to be checked
+    :param (obj) event: threading.event
+    :return: agent data, if the version was found
+    """
+    agent = get_agent(token, agent_id)
+    if agent.get("last_hb_data", '').get("policy_state", '').get(policy_id, '').get("version", '') == policy_version:
+        event.set()
+    return agent, event.is_set()
diff --git a/python-test/features/steps/control_agents_ui.py b/python-test/features/steps/agents_ui.py
similarity index 99%
rename from python-test/features/steps/control_agents_ui.py
rename to python-test/features/steps/agents_ui.py
index f11c5f9af..0b6ea91fa 100644
--- a/python-test/features/steps/control_agents_ui.py
+++ b/python-test/features/steps/agents_ui.py
@@ -1,12 +1,12 @@
 from behave import given, then, step
 from ui_utils import *
-from control_plane_agents import agent_name_prefix, get_agent
+from agents import agent_name_prefix, get_agent
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.common.by import By
 from selenium.common.exceptions import TimeoutException
 from utils import random_string, create_tags_set, threading_wait_until
-from test_config import TestConfig
+from configs import TestConfig
 from hamcrest import *
 from page_objects import *
 
diff --git a/python-test/features/steps/test_config.py b/python-test/features/steps/configs.py
similarity index 64%
rename from python-test/features/steps/test_config.py
rename to python-test/features/steps/configs.py
index 12b63fd76..20e9e3dd4 100644
--- a/python-test/features/steps/test_config.py
+++ b/python-test/features/steps/configs.py
@@ -23,6 +23,17 @@ def _read_configs():
     parser.read('test_config.ini')
     configs = parser['test_config']
 
+    # log level
+    log_level = configs.get("log_level", "debug")
+    configs["log_level"] = log_level.lower()
+    assert_that(configs.get('log_level'), any_of("debug", "info", "warning", "error", "critical"),
+                'Invalid log level')
+
+    # stream logs
+    stream_logs = configs.get("stream_logs", "true")
+    assert_that(stream_logs.lower(), any_of("true", "false"), 'Invalid log stream option')
+    configs["stream_logs"] = stream_logs.lower()
+
     # Make sure mandatory parameters are set!
     assert_that(configs.get('orb_address'), not_none(), 'No Orb URL was provided!')
     assert_that(configs.get('orb_address'), not_(""), 'No Orb URL was provided!')
@@ -35,14 +46,25 @@ def _read_configs():
     assert_that(configs.get('password'), has_length(greater_than_or_equal_to(8)),
                 'Orb password must be at least 8 digits')
 
-    assert_that(configs.get('prometheus_username'), not_none(), 'No prometheus username was provided!')
-    assert_that(configs.get('prometheus_username'), not_(""), 'No prometheus username was provided!')
+    configs['sink_backend_type'] = configs.get("sink_backend_type", "prometheus")
+    if configs['sink_backend_type'] == "otlphttp":
+        assert_that(configs.get('otlp_publisher_username'), not_none(), 'No otlp_publisher username was provided!')
+        assert_that(configs.get('otlp_publisher_username'), not_(""), 'No otlp_publisher username was provided!')
+
+        assert_that(configs.get('otlp_publisher_key'), not_none(), 'No Orb otlp_publisher key was provided!')
+        assert_that(configs.get('otlp_publisher_key'), not_(""), 'No Orb otlp_publisher key was provided!')
+
+        assert_that(configs.get('otlp_publisher_endpoint'), not_none(), 'No Orb otlp_publisher endpoint was provided!')
+        assert_that(configs.get('otlp_publisher_endpoint'), not_(""), 'No Orb otlp_publisher endpoint was provided!')
+    else:
+        assert_that(configs.get('prometheus_username'), not_none(), 'No prometheus username was provided!')
+        assert_that(configs.get('prometheus_username'), not_(""), 'No prometheus username was provided!')
 
-    assert_that(configs.get('prometheus_key'), not_none(), 'No Orb prometheus key was provided!')
-    assert_that(configs.get('prometheus_key'), not_(""), 'No Orb prometheus key was provided!')
+        assert_that(configs.get('prometheus_key'), not_none(), 'No Orb prometheus key was provided!')
+        assert_that(configs.get('prometheus_key'), not_(""), 'No Orb prometheus key was provided!')
 
-    assert_that(configs.get('remote_prometheus_endpoint'), not_none(), 'No Orb prometheus endpoint was provided!')
-    assert_that(configs.get('remote_prometheus_endpoint'), not_(""), 'No Orb prometheus endpoint was provided!')
+        assert_that(configs.get('remote_prometheus_endpoint'), not_none(), 'No Orb prometheus endpoint was provided!')
+        assert_that(configs.get('remote_prometheus_endpoint'), not_(""), 'No Orb prometheus endpoint was provided!')
 
     local_orb_path = configs.get("orb_path",
                                  os.path.dirname(os.getcwd()))  # orb_path is required if user will use docker to test,
@@ -79,15 +101,5 @@ def _read_configs():
     assert_that(is_credentials_registered, any_of(equal_to('true'), equal_to('false')),
                 'Invalid value to is_credentials_registered parameter. A boolean value is expected.')
     configs['is_credentials_registered'] = is_credentials_registered
-    include_otel_env_var = configs.get("include_otel_env_var", "false").lower()
-    configs["include_otel_env_var"] = include_otel_env_var
-    enable_otel = configs.get('enable_otel', 'true').lower()
-    assert_that(enable_otel, any_of(equal_to('true'), equal_to('false')),
-                'Invalid value to enable_otel parameter. A boolean value is expected.')
-    configs['enable_otel'] = enable_otel
-    if include_otel_env_var == "false" and enable_otel == "false":
-        raise ValueError("'enable_otel' is false, but the variable is not being included in the commands because of "
-                         "'include_otel_env_var' is false. Check your parameters.")
-    configs['backend_type'] = configs.get("backend_type", "prometheus")
 
     return configs
diff --git a/python-test/features/steps/control_dataset_ui.py b/python-test/features/steps/dataset_ui.py
similarity index 98%
rename from python-test/features/steps/control_dataset_ui.py
rename to python-test/features/steps/dataset_ui.py
index eaa72e373..aeae3c204 100644
--- a/python-test/features/steps/control_dataset_ui.py
+++ b/python-test/features/steps/dataset_ui.py
@@ -1,9 +1,9 @@
 from behave import step
-from test_config import TestConfig
-from control_plane_sink import get_sink
+from configs import TestConfig
+from sink import get_sink
 from ui_utils import *
 from page_objects import *
-from control_plane_datasets import list_datasets
+from datasets import list_datasets
 
 configs = TestConfig.configs()
 orb_url = configs.get('orb_url')
diff --git a/python-test/features/steps/control_plane_datasets.py b/python-test/features/steps/datasets.py
similarity index 95%
rename from python-test/features/steps/control_plane_datasets.py
rename to python-test/features/steps/datasets.py
index 4e650dec5..62c987292 100644
--- a/python-test/features/steps/control_plane_datasets.py
+++ b/python-test/features/steps/datasets.py
@@ -1,10 +1,10 @@
 import random
-
 from behave import then, step
-from utils import random_string, filter_list_by_parameter_start_with, validate_json, threading_wait_until
+from utils import (random_string, filter_list_by_parameter_start_with, validate_json, threading_wait_until,
+                   return_api_post_response)
 from hamcrest import *
 import requests
-from test_config import TestConfig
+from configs import TestConfig
 from datetime import datetime
 from random import choice
 
@@ -176,19 +176,15 @@ def create_dataset(token, name_label, policy_id, agent_group_id, sink_id, expect
 
     json_request = {"name": name_label, "agent_group_id": agent_group_id, "agent_policy_id": policy_id,
                     "sink_ids": sink_id}
-    header_request = {'Content-type': 'application/json', 'Accept': '*/*', 'Authorization': f'Bearer {token}'}
+    status_code, response = return_api_post_response(f"{orb_url}/api/v1/policies/dataset",
+                                                     request_body=json_request, token=token,
+                                                     verify=verify_ssl_bool)
 
-    response = requests.post(orb_url + '/api/v1/policies/dataset', json=json_request, headers=header_request,
-                             verify=verify_ssl_bool)
-    try:
-        response_json = response.json()
-    except ValueError:
-        response_json = response.text
-    assert_that(response.status_code, equal_to(expected_status_code),
-                'Request to create dataset failed with status=' + str(response.status_code) + ': ' +
-                str(response_json))
+    assert_that(status_code, equal_to(expected_status_code),
+                'Request to create dataset failed with status=' + str(status_code) + ': ' +
+                str(response))
 
-    return response_json
+    return response
 
 
 def edit_dataset(token, dataset_id, name_label, policy_id, agent_group_id, sink_id, expected_status_code=200):
diff --git a/python-test/features/steps/local_agent.py b/python-test/features/steps/local_agent.py
index 29460d7fa..fff33ea4c 100644
--- a/python-test/features/steps/local_agent.py
+++ b/python-test/features/steps/local_agent.py
@@ -1,7 +1,7 @@
 from utils import safe_load_json, random_string, threading_wait_until, return_port_by_availability
 from behave import then, step
 from hamcrest import *
-from test_config import TestConfig, LOCAL_AGENT_CONTAINER_NAME
+from configs import TestConfig, LOCAL_AGENT_CONTAINER_NAME
 import docker
 import subprocess
 import shlex
@@ -11,7 +11,9 @@
 from datetime import datetime
 import ciso8601
 from metrics import expected_metrics_by_handlers_and_groups, wait_until_metrics_scraped
+from logger import Logger
 
+log = Logger().logger_instance()
 
 configs = TestConfig.configs()
 verify_ssl_bool = eval(configs.get('verify_ssl').title())
@@ -36,25 +38,16 @@ def check_metrics_by_handler(context, handler_type):
     else:
         extra_metrics_present = sorted(extra_metrics_present)
     assert_that(correct_metrics, equal_to(True), f"Metrics are not the expected. "
-                                           f"Metrics expected that are not present: {expected_metrics_not_present}."
-                                           f"Extra metrics present: {extra_metrics_present}")
+                                                 f"Metrics expected that are not present: {expected_metrics_not_present}."
+                                                 f"Extra metrics present: {extra_metrics_present}")
 
 
 @step('the agent container is started on an {status_port} port')
 def run_local_agent_container(context, status_port, **kwargs):
     use_orb_live_address_pattern = configs.get("use_orb_live_address_pattern")
     verify_ssl = configs.get('verify_ssl')
-    if "include_otel_env_var" in kwargs: # this if/else logic can be removed after otel migration (only else is needed)
-        include_otel_env_var = kwargs["include_otel_env_var"]
-    else:
-        include_otel_env_var = configs.get("include_otel_env_var")
-    if "enable_otel" in kwargs: # this if/else logic can be removed after otel migration (only else is needed)
-        enable_otel = kwargs["enable_otel"]
-    else:
-        enable_otel = configs.get("enable_otel")
-
     env_vars = create_agent_env_vars_set(context.agent['id'], context.agent['channel_id'], context.agent_key,
-                                         verify_ssl, use_orb_live_address_pattern, include_otel_env_var, enable_otel)
+                                         verify_ssl, use_orb_live_address_pattern)
     env_vars.update(kwargs)
     assert_that(status_port, any_of(equal_to("available"), equal_to("unavailable")), "Unexpected value for port")
     availability = {"available": True, "unavailable": False}
@@ -75,7 +68,7 @@ def run_local_agent_container(context, status_port, **kwargs):
         log = f"web server listening on localhost:{context.port}"
     else:
         log = f"unable to bind to localhost:{context.port}"
-    agent_started, logs = get_logs_and_check(context.container_id, log, element_to_check="log")
+    agent_started, logs, log_line = get_logs_and_check(context.container_id, log, element_to_check="log")
     assert_that(agent_started, equal_to(True),
                 f"Log {log} not found on agent logs. Agent Name: {context.agent['name']}."
                 f"\n Logs:{logs}")
@@ -89,9 +82,7 @@ def run_local_agents_with_extra_env_vars(context, status_port, group):
         "PCAP": {"PKTVISOR_PCAP_IFACE_DEFAULT": configs.get("orb_agent_interface", "auto")},
         "NETFLOW": {"PKTVISOR_NETFLOW": "true", "PKTVISOR_NETFLOW_PORT_DEFAULT": 9995},
         "SFLOW": {"PKTVISOR_SFLOW": "true", "PKTVISOR_SFLOW_PORT_DEFAULT": 9994},
-        "DNSTAP": {"PKTVISOR_DNSTAP": "true", "PKTVISOR_DNSTAP_PORT_DEFAULT": 9990},
-        # this line below is only necessary for OTEL migration tests, so we can exclude it after the migration
-        "OTEL:ENABLED": {"ORB_OTEL_ENABLE": "true"}
+        "DNSTAP": {"PKTVISOR_DNSTAP": "true", "PKTVISOR_DNSTAP_PORT_DEFAULT": 9990}
     }
     if group == "ALL":
         vars_by_input["ALL"] = dict()
@@ -111,7 +102,7 @@ def check_agent_logs_considering_timestamp(context, condition, text_to_match, ti
         considered_timestamp = context.considered_timestamp_reset
     else:
         considered_timestamp = context.considered_timestamp
-    text_found, logs = get_logs_and_check(context.container_id, text_to_match, considered_timestamp,
+    text_found, logs, log_line = get_logs_and_check(context.container_id, text_to_match, considered_timestamp,
                                           timeout=time_to_wait)
     assert_that(text_found, is_(True), f"Message {text_to_match} was not found in the agent logs!. \n\n"
                                        f"Container logs: {json.dumps(logs, indent=4)}")
@@ -128,7 +119,7 @@ def check_errors_on_agent_logs(context, type_of_message):
 
 @then('the container logs should contain the message "{text_to_match}" within {time_to_wait} seconds')
 def check_agent_msg_in_logs(context, text_to_match, time_to_wait):
-    text_found, logs = get_logs_and_check(context.container_id, text_to_match, timeout=time_to_wait)
+    text_found, logs, log_line = get_logs_and_check(context.container_id, text_to_match, timeout=time_to_wait)
 
     assert_that(text_found, is_(True), f"Message {text_to_match} was not found in the agent logs!. \n\n"
                                        f"Container logs: {json.dumps(logs, indent=4)}")
@@ -137,7 +128,7 @@ def check_agent_msg_in_logs(context, text_to_match, time_to_wait):
 @then('the container logs should contain "{error_log}" as log within {time_to_wait} seconds')
 def check_agent_log_in_logs(context, error_log, time_to_wait):
     error_log = error_log.replace(":port", f":{context.port}")
-    text_found, logs = get_logs_and_check(context.container_id, error_log, element_to_check="log", timeout=time_to_wait)
+    text_found, logs, log_line = get_logs_and_check(context.container_id, error_log, element_to_check="log", timeout=time_to_wait)
     assert_that(text_found, is_(True), f"Log {error_log} was not found in the agent logs!. \n\n"
                                        f"Container logs: {json.dumps(logs, indent=4)}")
 
@@ -165,12 +156,9 @@ def run_container_using_ui_command(context, status_port):
     assert_that(status_port, any_of(equal_to("available"), equal_to("unavailable")), "Unexpected value for port")
     availability = {"available": True, "unavailable": False}
     context.port = return_port_by_availability(context, availability[status_port])
-    include_otel_env_var = configs.get("include_otel_env_var")
-    enable_otel = configs.get("enable_otel")
     verify_ssl = configs.get("verify_ssl")
     context.container_id = run_local_agent_from_terminal(context.agent_provisioning_command,
-                                                         verify_ssl, str(context.port),
-                                                         include_otel_env_var, enable_otel)
+                                                         verify_ssl, str(context.port))
     assert_that(context.container_id, is_not((none())), f"Agent container was not run")
     rename_container(context.container_id, LOCAL_AGENT_CONTAINER_NAME + context.agent['name'][-5:])
     if context.container_id not in context.containers_id.keys():
@@ -216,7 +204,7 @@ def remove_all_orb_agent_test_containers(context):
 
 
 def create_agent_env_vars_set(agent_id, agent_channel_id, agent_mqtt_key, verify_ssl,
-                              use_orb_live_address_pattern, include_otel_env_var, enable_otel):
+                              use_orb_live_address_pattern):
     """
     Create the set of environmental variables to be passed to the agent
     :param agent_id: id of the agent
@@ -225,8 +213,6 @@ def create_agent_env_vars_set(agent_id, agent_channel_id, agent_mqtt_key, verify
     :param verify_ssl: ignore process to verify tls if false
     :param use_orb_live_address_pattern: if true, uses the shortcut orb_cloud_address.
                                               if false sets api and mqtt address.
-    :param include_otel_env_var: If true, use the environmental variable "ORB_OTEL_ENABLE" on agent provisioning command
-    :param enable_otel: Value to be used in variable "ORB_OTEL_ENABLE"
     :return: set of environmental variables
     """
     orb_address = configs.get('orb_address')
@@ -245,8 +231,6 @@ def create_agent_env_vars_set(agent_id, agent_channel_id, agent_mqtt_key, verify
 
     if verify_ssl == 'false':
         env_vars["ORB_TLS_VERIFY"] = "false"
-    if include_otel_env_var == "true":
-        env_vars["ORB_OTEL_ENABLE"] = enable_otel
     return env_vars
 
 
@@ -279,67 +263,37 @@ def get_orb_agent_logs(container_id):
     return container.logs().decode("utf-8").split("\n")
 
 
-def check_logs_contain_message(logs, expected_message, event, start_time=0):
+def check_logs_contain_entry(logs, element_to_check, expected_entry, start_time=0):
     """
-    Gets the logs from Orb agent container
+    Check if the logs from Orb agent container contain a specific entry
 
     :param (list) logs: list of log lines
-    :param (str) expected_message: message that we expect to find in the logs
-    :param (obj) event: threading.event
-    :param (int) start_time: time to be considered as initial time. Default: None
-    :returns: (bool) whether expected message was found in the logs
+    :param (str) element_to_check: key to search in the logs
+    :param (str) expected_entry: entry that we expect to find in the logs
+    :param (int) start_time: time to be considered as the initial time. Default: 0
+    :returns: (bool) whether the expected entry was found in the logs
     """
-
     for log_line in logs:
         log_line = safe_load_json(log_line)
 
-        if log_line is not None and log_line['msg'] == expected_message and isinstance(log_line['ts'], int) and \
-                log_line['ts'] > start_time:
-            event.set()
-            return event.is_set()
-        elif log_line is not None and log_line['msg'] == expected_message and isinstance(log_line['ts'], str) and \
-                datetime.timestamp(ciso8601.parse_datetime(log_line['ts'])) > start_time:
-            event.set()
-            return event.is_set()
-
-    return event.is_set()
-
-
-def check_logs_contain_log(logs, expected_log, event, start_time=0):
-    """
-    Check if the logs from Orb agent container contain specific log
+        if log_line is not None and element_to_check in log_line.keys() and isinstance(log_line['ts'], (int, str)):
+            log_timestamp = (
+                log_line['ts']
+                if isinstance(log_line['ts'], int)
+                else datetime.timestamp(ciso8601.parse_datetime(log_line['ts']))
+            )
 
-    :param (list) logs: list of log lines
-    :param (str) expected_log: log that we expect to find in the logs
-    :param (obj) event: threading.event
-    :param (int) start_time: time to be considered as initial time. Default: None
-    :returns: (bool) whether expected message was found in the logs
-    """
+            if expected_entry in log_line.get(element_to_check, '') and log_timestamp > start_time:
+                return True, log_line
 
-    for log_line in logs:
-        log_line = safe_load_json(log_line)
-
-        if log_line is not None and "log" in log_line.keys() and expected_log in log_line['log'] and isinstance(
-                log_line['ts'], int) and \
-                log_line['ts'] > start_time:
-            event.set()
-            return event.is_set()
-        elif log_line is not None and "log" in log_line.keys() and expected_log in log_line['log'] and isinstance(
-                log_line['ts'], str) and \
-                datetime.timestamp(ciso8601.parse_datetime(log_line['ts'])) > start_time:
-            event.set()
-            return event.is_set()
-
-    return event.is_set()
+    return False, None
 
 
-def run_local_agent_from_terminal(command, verify_ssl, pktvisor_port,
-                                  include_otel_env_var="false", enable_otel="true"):
+def run_local_agent_from_terminal(command, verify_ssl, pktvisor_port):
     """
     :param (str) command: docker command to provision an agent
     :param (bool) verify_ssl: False if orb address doesn't have a valid certificate.
     :param (str or int) pktvisor_port: Port on which pktvisor should run
-    :param (str): if 'true', ORB_OTEL_ENABLE env ver is included on command provisioning of the agent
     :return: agent container ID
     """
     command = command.replace("\\\n", " ")
@@ -347,8 +301,6 @@ def run_local_agent_from_terminal(command, verify_ssl, pktvisor_port,
     if verify_ssl == 'false':
         args.insert(-1, "-e")
         args.insert(-1, "ORB_TLS_VERIFY=false")
-    if include_otel_env_var == "true":
-        args.insert(-1, f"ORB_OTEL_ENABLE={enable_otel}")
     if pktvisor_port != 'default':
         args.insert(-1, "-e")
         args.insert(-1, f"ORB_BACKENDS_PKTVISOR_API_PORT={pktvisor_port}")
@@ -408,11 +360,10 @@ def get_logs_and_check(container_id, expected_message, start_time=0, element_to_
     """
     assert_that(element_to_check, any_of(equal_to("msg"), equal_to("log")), "Unexpected value for element to check.")
     logs = get_orb_agent_logs(container_id)
-    if element_to_check == "msg":
-        text_found = check_logs_contain_message(logs, expected_message, event, start_time)
-    else:
-        text_found = check_logs_contain_log(logs, expected_message, event, start_time)
-    return text_found, logs
+    message_found, log_line = check_logs_contain_entry(logs, element_to_check, expected_message, start_time)
+    if message_found is True:
+        event.set()
+    return message_found, logs, log_line
 
 
 def run_agent_config_file(agent_name, overwrite_default=False, only_file=False, config_file_path="/opt/orb",
@@ -443,6 +394,7 @@ def run_agent_config_file(agent_name, overwrite_default=False, only_file=False,
         command = f"docker run -d -v {volume} --net=host {agent_image}"
     else:
         command = f"docker run -d -v {volume} --net=host {agent_image} run -c {agent_command}"
+    log.debug(f"Run Agent Command: {command}")
     args = shlex.split(command)
     terminal_running = subprocess.Popen(args, stdout=subprocess.PIPE)
     subprocess_return = terminal_running.stdout.read().decode()
diff --git a/python-test/features/steps/logger.py b/python-test/features/steps/logger.py
new file mode 100644
index 000000000..a6690dd02
--- /dev/null
+++ b/python-test/features/steps/logger.py
@@ -0,0 +1,35 @@
+import logging
+from colorlog import ColoredFormatter
+from configs import TestConfig
+
+configs = TestConfig.configs()
+
+
+class Logger:
+    _LOG_DEFAULT_FORMAT = "  %(log_color)s%(levelname)-8s%(reset)s | %(asctime)s | %(log_color)s%(message)s%(reset)s"
+
+    def __init__(self):
+        log_level_options = \
+            {"debug": logging.DEBUG,
+             "info": logging.INFO,
+             "warning": logging.WARNING,
+             "error": logging.ERROR,
+             "critical": logging.CRITICAL}
+        log_level = log_level_options[configs["log_level"]]
+        self._init_logger(log_level)
+
+    def _init_logger(self, log_level):
+        logging.root.setLevel(log_level)
+        formatter = ColoredFormatter(self._LOG_DEFAULT_FORMAT)
+        stream = logging.StreamHandler()
+        stream.setLevel(log_level)
+        stream.setFormatter(formatter)
+        self._logger = logging.getLogger("pythonConfig")
+        self._logger.setLevel(log_level)
+        if self._logger.hasHandlers():
+            self._logger.handlers.clear()
+        if configs["stream_logs"] == "true":
+            self._logger.addHandler(stream)
+
+    def logger_instance(self):
+        return self._logger
diff --git a/python-test/features/steps/login.py b/python-test/features/steps/login.py
index 20c46e91a..c5bdfcfe1 100644
--- a/python-test/features/steps/login.py
+++ b/python-test/features/steps/login.py
@@ -1,5 +1,5 @@
 from behave import given, when, then
-from test_config import TestConfig
+from configs import TestConfig
 from hamcrest import *
 from users import authenticate, register_account
 from utils import random_string, insert_str
@@ -62,10 +62,10 @@ def request_account_registration(context, password_status, username, company):
         if len(password) > 8: passwords_to_test.append(password[:-1])
         for current_password in passwords_to_test:
             response, status_code = register_account(email, current_password, company, username, 409)
-            assert_that(response.json()['error'], equal_to('entity already exists'), 'Wrong message on API response')
+            assert_that(response['error'], equal_to('entity already exists'), 'Wrong message on API response')
     else:
         response, status_code = register_account(email, password, company, username, 409)
-        assert_that(response.json()['error'], equal_to('entity already exists'), 'Wrong message on API response')
+        assert_that(response['error'], equal_to('entity already exists'), 'Wrong message on API response')
 
 
 @then('account register should not be changed')
diff --git a/python-test/features/steps/login_ui.py b/python-test/features/steps/login_ui.py
index 12bce8b9f..0573c2255 100644
--- a/python-test/features/steps/login_ui.py
+++ b/python-test/features/steps/login_ui.py
@@ -1,6 +1,6 @@
 from users import authenticate
 from behave import given, when, then, step
-from test_config import TestConfig
+from configs import TestConfig
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
 from ui_utils import go_to_page, input_text_by_id
diff --git a/python-test/features/steps/metrics.py b/python-test/features/steps/metrics.py
index fae388bb0..aa324027a 100644
--- a/python-test/features/steps/metrics.py
+++ b/python-test/features/steps/metrics.py
@@ -2,7 +2,9 @@
 import requests
 from prometheus_client.parser import text_string_to_metric_families
 from utils import threading_wait_until
+from logger import Logger
 
+log = Logger().logger_instance()
 
 @threading_wait_until
 def wait_until_metrics_scraped(local_prometheus_endpoint, expected_metrics, event=None):
@@ -15,11 +17,16 @@ def wait_until_metrics_scraped(local_prometheus_endpoint, expected_metrics, even
     (set) metrics that exists
     """
     metrics_present = set()
-    metrics = requests.get(local_prometheus_endpoint)
-    for family in text_string_to_metric_families(metrics.text):
+    response = requests.get(local_prometheus_endpoint)
+    log.info(f"{response.request.method} {response.url} -> Status Code: {response.status_code}")
+    log.debug(f"Metrics: {response.text}")
+    for family in text_string_to_metric_families(response.text):
         for sample in family.samples:
             metrics_present.add(sample.name)
     metrics_dif = metrics_present.symmetric_difference(expected_metrics)
+    log.debug(f"Metrics present: {metrics_present}")
+    log.debug(f"Expected metrics: {expected_metrics}")
+    log.debug(f"Metrics difference: {metrics_dif}")
     if metrics_dif == set() or metrics_dif == {}:
         event.set()
     return event.is_set(), metrics_dif, metrics_present
@@ -537,6 +544,7 @@ def expected_metrics_by_handlers_and_groups(handler, groups_enabled, groups_disa
                 ("all" in groups_enabled and "counters" not in groups_disabled):
             metric_groups.add("netprobe_attempts")
             metric_groups.add("netprobe_dns_lookup_failures")
+            metric_groups.add("netprobe_connect_failures")
             metric_groups.add("netprobe_packets_timeout")
             metric_groups.add("netprobe_successes")
             if (("quantiles" in groups_enabled and "quantiles" not in groups_disabled) or
diff --git a/python-test/features/steps/mocked_interface.py b/python-test/features/steps/mocked_interface.py
index d4c385fe9..4a229f9a2 100644
--- a/python-test/features/steps/mocked_interface.py
+++ b/python-test/features/steps/mocked_interface.py
@@ -1,6 +1,6 @@
 from hamcrest import *
 from behave import given, then, step
-from test_config import TestConfig
+from configs import TestConfig
 from utils import random_string, send_terminal_commands, return_port_by_availability
 import os
 import json
diff --git a/python-test/features/steps/control_plane_policies.py b/python-test/features/steps/policies.py
similarity index 89%
rename from python-test/features/steps/control_plane_policies.py
rename to python-test/features/steps/policies.py
index 42e6c57c8..51f0b817d 100644
--- a/python-test/features/steps/control_plane_policies.py
+++ b/python-test/features/steps/policies.py
@@ -1,17 +1,21 @@
 from hamcrest import *
-import requests
 from behave import given, then, step
-from utils import random_string, filter_list_by_parameter_start_with, safe_load_json, remove_empty_from_json, \
-    threading_wait_until, UtilsManager, create_tags_set, is_json, values_to_boolean
+from utils import (random_string, filter_list_by_parameter_start_with, safe_load_json, remove_empty_from_json, \
+                   threading_wait_until, UtilsManager, create_tags_set, is_json, values_to_boolean,
+                   return_api_post_response,
+                   return_api_get_response, return_api_put_response, return_api_delete_response)
 from local_agent import get_orb_agent_logs
-from test_config import TestConfig
+from configs import TestConfig
 from datetime import datetime
-from control_plane_datasets import create_new_dataset, list_datasets
+from datasets import create_new_dataset, list_datasets
 from random import choice, choices, sample
 from deepdiff import DeepDiff
 import json
 import ciso8601
+import yaml
+from logger import Logger
 
+log = Logger().logger_instance()
 policy_name_prefix = "test_policy_name_"
 configs = TestConfig.configs()
 orb_url = configs.get('orb_url')
@@ -260,6 +264,43 @@ def check_policy_attribute(context, attribute, value):
         raise Exception(f"Attribute {attribute} not found on policy")
 
 
+@step("otel policy version must be {policy_version}")
+def check_otel_policy_version(context, policy_version):
+    assert_that(policy_version.isdigit(), equal_to(True), "Policy version must be a number")
+    policy_version = int(policy_version)
+    policy_id = context.policy["id"]
+    assert_that(context.policy.get("version"), equal_to(policy_version), f"Unexpected policy version in policy "
+                                                                         f"{policy_id}")
+
+
+@step("update otel policy using endpoint(s)={target_endpoint} and collection_interval={seconds}")
+def update_otel_policy(context, target_endpoint, seconds):
+    target_endpoints = target_endpoint.split(",")
+    context.updated_policy_data = context.policy.get("policy")
+    context.updated_policy_data["receivers"]["httpcheck"]["collection_interval"] = seconds
+    targets = list()
+    for endpoint in target_endpoints:
+        targets.append(
+            {'endpoint': endpoint, 'method': 'GET'}
+        )
+    context.updated_policy_data["receivers"]["httpcheck"]["targets"] = targets
+    policy_yaml = yaml.dump(context.updated_policy_data)
+    policy_json = make_otel_policy_json(context.policy['name'], context.policy.get("description"), policy_yaml)
+    context.considered_timestamp = datetime.now().timestamp()
+    context.policy = edit_policy(context.token, context.policy['id'], policy_json)
+
+
+@step("updated fields were correctly present in updated otel policy")
+def check_otel_policy_updated(context):
+    context.policy = get_policy(context.token, context.policy['id'])
+    assert_that(context.updated_policy_data["receivers"]["httpcheck"]["collection_interval"],
+                equal_to(context.policy.get("policy")["receivers"]["httpcheck"]["collection_interval"]),
+                f"Collection interval not updated. {context.policy}")
+    assert_that(context.updated_policy_data["receivers"]["httpcheck"]["targets"],
+                equal_to(context.policy.get("policy")["receivers"]["httpcheck"]["targets"]),
+                f"Targets not updated. {context.policy}")
+
+
 @then("referred policy {condition} be listed on the orb policies list")
 def check_policies(context, **condition):
     if len(condition) > 0:
@@ -360,7 +401,7 @@ def check_agent_logs_for_policies_considering_timestamp(context, condition, text
         policies_without_message = set(context.list_agent_policies_id).difference(policies_have_expected_message)
         for policy in policies_without_message:
             policies_data.append(get_policy(context.token, policy))
-
+    log.debug(f"Agent logs: {logs}")
     assert_that(policies_have_expected_message, equal_to(set(context.list_agent_policies_id)),
                 f"Message '{text_to_match}' for policy "
                 f"'{policies_data}'"
@@ -383,6 +424,24 @@ def check_agent_logs_for_policies(context, text_to_match, time_to_wait):
                 f"Agent Logs: {logs}")
 
 
+@step('{amount_of_policies} policies with otel backend and yaml format are applied to the group')
+def apply_n_otel_policies(context, amount_of_policies):
+    policies = return_policies_otel(int(amount_of_policies))
+    for policy_data in policies:
+        name = f"{policy_name_prefix}otel_{random_string(10)}"
+        description = "policy with otel backend"
+        policy_yaml = yaml.dump(policy_data)
+        policy_json = make_otel_policy_json(name, description, policy_yaml)
+        context.policy = create_policy(context.token, policy_json)
+        check_policies(context)
+        if 'policies_created' in context:
+            context.policies_created[context.policy['id']] = context.policy['name']
+        else:
+            context.policies_created = dict()
+            context.policies_created[context.policy['id']] = context.policy['name']
+        create_new_dataset(context, 1, 'last', 1, 'sink')
+
+
 @step('{amount_of_policies} {type_of_policies} policies are applied to the group')
 def apply_n_policies(context, amount_of_policies, type_of_policies):
     args_for_policies = return_policies_type(int(amount_of_policies), type_of_policies)
@@ -438,7 +497,7 @@ def duplicate_policy_with_same_name(context, times):
         if i <= 2:
             duplicated_policy = create_duplicated_policy(context.token, context.policy['id'])
         else:
-            duplicated_policy = create_duplicated_policy(context.token, context.policy['id'], status_code=409)
+            duplicated_policy = create_duplicated_policy(context.token, context.policy['id'], expected_status_code=409)
         context.duplicate_policies.append(duplicated_policy)
 
 
@@ -473,31 +532,26 @@ def check_duplicated_policies_status(context, amount_successfully_policies, amou
                                                                           f".")
 
 
-def create_duplicated_policy(token, policy_id, new_policy_name=None, status_code=201):
+def create_duplicated_policy(token, policy_id, new_policy_name=None, expected_status_code=201):
     """
 
     :param (str) token: used for API authentication
     :param (str) policy_id: id of policy that will be duplicated
     :param (str) new_policy_name: name for the new policy created
-    :param (int) status_code: status code that must return on response
+    :param (int) expected_status_code: status code that must return on response
     :return: (dict) new policy created
     """
     json_request = {"name": new_policy_name}
     json_request = remove_empty_from_json(json_request)
-    headers_request = {'Content-type': 'application/json', 'Accept': 'application/json',
-                       'Authorization': f'Bearer {token}'}
     post_url = f"{orb_url}/api/v1/policies/agent/{policy_id}/duplicate"
-    response = requests.post(post_url, json=json_request, headers=headers_request, verify=verify_ssl_bool)
-    try:
-        response_json = response.json()
-    except ValueError:
-        response_json = response.text
-    assert_that(response.status_code, equal_to(status_code),
-                'Request to create duplicated policy failed with status=' + str(response.status_code) + ': '
-                + str(response_json))
+    status_code, response = return_api_post_response(post_url, request_body=json_request, token=token,
+                                                     verify=verify_ssl_bool)
+    assert_that(status_code, equal_to(expected_status_code),
+                'Request to create duplicated policy failed with status=' + str(status_code) + ': '
+                + str(response))
     if status_code == 201:
-        compare_two_policies(token, policy_id, response.json()['id'])
-    return response_json
+        compare_two_policies(token, policy_id, response['id'])
+    return response
 
 
 def compare_two_policies(token, id_policy_one, id_policy_two):
@@ -528,19 +582,14 @@ def create_policy(token, json_request, expected_status_code=201):
 
     """
 
-    headers_request = {'Content-type': 'application/json', 'Accept': '*/*', 'Authorization': f'Bearer {token}'}
+    status_code, response = return_api_post_response(f"{orb_url}/api/v1/policies/agent", request_body=json_request,
+                                                     token=token, verify=verify_ssl_bool)
 
-    response = requests.post(orb_url + '/api/v1/policies/agent', json=json_request, headers=headers_request,
-                             verify=verify_ssl_bool)
-    try:
-        response_json = response.json()
-    except ValueError:
-        response_json = response.text
-    assert_that(response.status_code, equal_to(expected_status_code),
-                'Request to create policy failed with status=' + str(response.status_code) + ': '
-                + str(response_json))
+    assert_that(status_code, equal_to(expected_status_code),
+                'Request to create policy failed with status=' + str(status_code) + ': '
+                + str(response))
 
-    return response_json
+    return response
 
 
 def edit_policy(token, policy_id, json_request, expected_status_code=200):
@@ -553,19 +602,15 @@ def edit_policy(token, policy_id, json_request, expected_status_code=200):
     :param (int) expected_status_code: status to be returned on response
     :return: response of policy editing
     """
-    headers_request = {'Content-type': 'application/json', 'Accept': '*/*', 'Authorization': f'Bearer {token}'}
 
-    response = requests.put(orb_url + f"/api/v1/policies/agent/{policy_id}", json=json_request,
-                            headers=headers_request, verify=verify_ssl_bool)
-    try:
-        response_json = response.json()
-    except ValueError:
-        response_json = response.text
-    assert_that(response.status_code, equal_to(expected_status_code),
-                'Request to editing policy failed with status=' + str(response.status_code) + ': '
-                + str(response_json))
+    status_code, response = return_api_put_response(f"{orb_url}/api/v1/policies/agent/{policy_id}",
+                                                    request_body=json_request, token=token, verify=verify_ssl_bool)
+
+    assert_that(status_code, equal_to(expected_status_code),
+                'Request to editing policy failed with status=' + str(status_code) + ': '
+                + str(response))
 
-    return response_json
+    return response
 
 
 def make_policy_json(name, handler_label, handler, description=None, tap="default_pcap",
@@ -643,6 +688,16 @@ def make_policy_json(name, handler_label, handler, description=None, tap="defaul
     return json_request
 
 
+def make_otel_policy_json(name, description, policy_data):
+    json_payload = {"name": name,
+                    "backend": "otel",
+                    "policy_data": policy_data,
+                    "description": description,
+                    "format": "yaml"}
+    json_request = remove_empty_from_json(json_payload.copy())
+    return json_request
+
+
 def make_policy_flow_json(name, handler_label, handler, description=None, tap="default_flow",
                           input_type="flow", port=None, bind=None, flow_type=None, sample_rate_scaling=None,
                           only_devices=None, only_ips=None, only_ports=None, only_interfaces=None, geoloc_notfound=None,
@@ -716,7 +771,7 @@ def make_policy_netprobe_json(name, handler_label, handler, description=None, ta
     assert_that(handler, equal_to("netprobe"), "Unexpected handler for policy")
     assert_that(name, not_none(), "Unable to create policy without name")
 
-    #netprobe configs are on tap level
+    # netprobe configs are on tap level
     json_request = {"name": name,
                     "description": description,
                     "backend": backend_type,
@@ -757,17 +812,14 @@ def get_policy(token, policy_id, expected_status_code=200):
     :returns: (dict) the fetched policy
     """
 
-    get_policy_response = requests.get(orb_url + '/api/v1/policies/agent/' + policy_id,
-                                       headers={'Authorization': f'Bearer {token}'}, verify=verify_ssl_bool)
-    try:
-        response_json = get_policy_response.json()
-    except ValueError:
-        response_json = get_policy_response.text
-    assert_that(get_policy_response.status_code, equal_to(expected_status_code),
-                'Request to get policy id=' + policy_id + ' failed with status= ' + str(get_policy_response.status_code)
-                + " response= " + str(response_json))
+    status_code, response = return_api_get_response(f"{orb_url}/api/v1/policies/agent/{policy_id}", token=token,
+                                                    verify=verify_ssl_bool)
+
+    assert_that(status_code, equal_to(expected_status_code),
+                'Request to get policy id=' + policy_id + ' failed with status= ' + str(status_code)
+                + " response= " + str(response))
 
-    return response_json
+    return response
 
 
 def list_policies(token, limit=100, offset=0):
@@ -802,19 +854,17 @@ def list_up_to_limit_policies(token, limit=100, offset=0):
     :returns: (list) a list of policies, (int) total policies on orb, (int) offset
     """
 
-    response = requests.get(orb_url + '/api/v1/policies/agent', headers={'Authorization': f'Bearer {token}'},
-                            params={'limit': limit, 'offset': offset}, verify=verify_ssl_bool)
-    try:
-        response_json = response.json()
-    except ValueError:
-        response_json = response.text
+    status_code, response = return_api_get_response(f"{orb_url}/api/v1/policies/agent", token=token,
+                                                    params={'limit': limit, 'offset': offset}, verify=verify_ssl_bool)
 
-    assert_that(response.status_code, equal_to(200),
-                'Request to list policies failed with status=' + str(response.status_code) + ': '
-                + str(response_json))
+    assert_that(status_code, equal_to(200),
+                'Request to list policies failed with status=' + str(status_code) + ': '
+                + str(response))
+    assert_that(response, has_key('data'), f"Response does not contain 'data' key: {response}")
+    assert_that(response, has_key('total'), f"Response does not contain 'total' key: {response}")
+    assert_that(response, has_key('offset'), f"Response does not contain 'offset' key: {response}")
 
-    policies_as_json = response_json
-    return policies_as_json['data'], policies_as_json['total'], policies_as_json['offset']
+    return response['data'], response['total'], response['offset']
 
 
 def delete_policies(token, list_of_policies):
@@ -837,11 +887,11 @@ def delete_policy(token, policy_id):
     :param (str) policy_id: that identifies the policy to be deleted
     """
 
-    response = requests.delete(orb_url + '/api/v1/policies/agent/' + policy_id,
-                               headers={'Authorization': f'Bearer {token}'}, verify=verify_ssl_bool)
+    status_code, response = return_api_delete_response(f"{orb_url}/api/v1/policies/agent/{policy_id}",
+                                                       token=token, verify=verify_ssl_bool)
 
-    assert_that(response.status_code, equal_to(204), 'Request to delete policy id='
-                + policy_id + ' failed with status=' + str(response.status_code))
+    assert_that(status_code, equal_to(204), 'Request to delete policy id='
+                + policy_id + ' failed with status=' + str(status_code))
 
 
 def check_logs_contain_message_for_policies(logs, expected_message, list_agent_policies_id, considered_timestamp):
@@ -957,6 +1007,68 @@ def list_datasets_for_a_policy(policy_id, datasets_list):
     return id_of_related_datasets
 
 
+def return_policies_otel(k):
+    policies_otel = list()
+    policies_otel.append({
+        "receivers": {
+            "httpcheck": {
+                "targets": [
+                    {
+                        "endpoint": "http://orb.community",
+                        "method": "GET"
+                    },
+                    {
+                        "endpoint": "https://orb.live",
+                        "method": "GET"
+                    }
+                ],
+                "collection_interval": "60s"
+            }
+        },
+        "extensions": None,
+        "exporters": None,
+        "service": {
+            "pipelines": {
+                "metrics": {
+                    "exporters": None,
+                    "receivers": [
+                        "httpcheck"
+                    ]
+                }
+            }
+        }
+    })
+    policies_otel.append({
+        "receivers": {
+            "httpcheck": {
+                "targets": [
+                    {
+                        "endpoint": "https://github.com/orb-community/orb",
+                        "method": "GET"
+                    }
+                ],
+                "collection_interval": "10s"
+            }
+        },
+        "extensions": None,
+        "exporters": None,
+        "service": {
+            "pipelines": {
+                "metrics": {
+                    "exporters": ["otlp"],
+                    "receivers": [
+                        "httpcheck"
+                    ]
+                }
+            }
+        }
+    })
+    if k <= len(policies_otel):
+        return sample(policies_otel, k=k)
+
+    return choices(policies_otel, k=k)
+
+
 def return_policies_type(k, policies_type='mixed', input_type="pcap"):
     assert_that(policies_type, any_of(equal_to('mixed'), any_of('simple'), any_of('advanced')),
                 "Unexpected value for policies type")
@@ -994,7 +1106,8 @@ def return_policies_type(k, policies_type='mixed', input_type="pcap"):
         }
 
         if input_type != "dnstap":
-            advanced['advanced_dhcp'] = "handler=dhcp, description='policy_dhcp', host_specification=10.0.1.0/24,10.0.2.1/32,2001:db8::/64, bpf_filter_expression=udp port 53, pcap_source=libpcap"
+            advanced[
+                'advanced_dhcp'] = "handler=dhcp, description='policy_dhcp', host_specification=10.0.1.0/24,10.0.2.1/32,2001:db8::/64, bpf_filter_expression=udp port 53, pcap_source=libpcap"
             simple['simple_dhcp'] = "handler=dhcp"
 
     mixed = dict()
diff --git a/python-test/features/steps/control_policies_ui.py b/python-test/features/steps/policies_ui.py
similarity index 98%
rename from python-test/features/steps/control_policies_ui.py
rename to python-test/features/steps/policies_ui.py
index 115b4ad92..123534ab8 100644
--- a/python-test/features/steps/control_policies_ui.py
+++ b/python-test/features/steps/policies_ui.py
@@ -1,6 +1,6 @@
 from behave import step
-from control_plane_policies import parse_policy_params, get_policy, make_policy_json, list_policies
-from test_config import TestConfig
+from policies import parse_policy_params, get_policy, make_policy_json, list_policies
+from configs import TestConfig
 from ui_utils import *
 from utils import remove_empty_from_json
 from page_objects import *
diff --git a/python-test/features/steps/control_plane_sink.py b/python-test/features/steps/sink.py
similarity index 62%
rename from python-test/features/steps/control_plane_sink.py
rename to python-test/features/steps/sink.py
index a3264e25f..ba2c1b21d 100644
--- a/python-test/features/steps/control_plane_sink.py
+++ b/python-test/features/steps/sink.py
@@ -1,9 +1,9 @@
 from behave import given, when, then, step
-from test_config import TestConfig
-from utils import random_string, filter_list_by_parameter_start_with, threading_wait_until, validate_json, \
-    remove_empty_from_json
+from configs import TestConfig
+from utils import (random_string, filter_list_by_parameter_start_with, threading_wait_until, validate_json, \
+                   remove_empty_from_json, return_api_get_response, return_api_put_response, return_api_post_response,
+                   return_api_delete_response)
 from hamcrest import *
-import requests
 import threading
 import yaml
 
@@ -11,53 +11,58 @@
 sink_name_prefix = "test_sink_label_name_"
 orb_url = configs.get('orb_url')
 verify_ssl_bool = eval(configs.get('verify_ssl').title())
-backend_type = configs.get('backend_type')
 
 
 @given("that the user has the prometheus/grafana credentials")
 def check_prometheus_grafana_credentials(context):
-    context.remote_prometheus_endpoint = configs.get('remote_prometheus_endpoint')
-    assert_that(context.remote_prometheus_endpoint, not_none(), 'No remote write endpoint to send Prometheus metrics '
-                                                                'to Grafana Cloud was provided!')
-    assert_that(context.remote_prometheus_endpoint, not_(""), 'No remote write endpoint to send Prometheus metrics to '
-                                                              'Grafana Cloud was provided!')
+    if configs.get("sink_backend_type") == "otlphttp":
+        context.remote_prometheus_endpoint = configs.get('otlp_publisher_endpoint')
+        assert_that(context.remote_prometheus_endpoint, not_none(), 'No remote write endpoint to send otlp '
+                                                                    'metrics'
+                                                                    'to Grafana Cloud was provided!')
+        assert_that(context.remote_prometheus_endpoint, not_(""), 'No remote write endpoint to send otlp '
+                                                                  'metrics to'
+                                                                  'Grafana Cloud was provided!')
+
+        context.prometheus_username = configs.get('otlp_publisher_username')
+        assert_that(context.prometheus_username, not_none(), 'No Grafana Cloud otlp username was provided!')
+        assert_that(context.prometheus_username, not_(""), 'No Grafana Cloud otlp username was provided!')
+
+        context.prometheus_key = configs.get('otlp_publisher_key')
+        assert_that(context.prometheus_key, not_none(), 'No Grafana Cloud API Key was provided!')
+        assert_that(context.prometheus_key, not_(""), 'No Grafana Cloud API Key was provided!')
+    else:
+        context.remote_prometheus_endpoint = configs.get('remote_prometheus_endpoint')
+        assert_that(context.remote_prometheus_endpoint, not_none(), 'No remote write endpoint to send Prometheus '
+                                                                    'metrics'
+                                                                    'to Grafana Cloud was provided!')
+        assert_that(context.remote_prometheus_endpoint, not_(""), 'No remote write endpoint to send Prometheus '
+                                                                  'metrics to'
+                                                                  'Grafana Cloud was provided!')
 
-    context.prometheus_username = configs.get('prometheus_username')
-    assert_that(context.prometheus_username, not_none(), 'No Grafana Cloud Prometheus username was provided!')
-    assert_that(context.prometheus_username, not_(""), 'No Grafana Cloud Prometheus username was provided!')
+        context.prometheus_username = configs.get('prometheus_username')
+        assert_that(context.prometheus_username, not_none(), 'No Grafana Cloud Prometheus username was provided!')
+        assert_that(context.prometheus_username, not_(""), 'No Grafana Cloud Prometheus username was provided!')
 
-    context.prometheus_key = configs.get('prometheus_key')
-    assert_that(context.prometheus_key, not_none(), 'No Grafana Cloud API Key was provided!')
-    assert_that(context.prometheus_key, not_(""), 'No Grafana Cloud API Key was provided!')
+        context.prometheus_key = configs.get('prometheus_key')
+        assert_that(context.prometheus_key, not_none(), 'No Grafana Cloud API Key was provided!')
+        assert_that(context.prometheus_key, not_(""), 'No Grafana Cloud API Key was provided!')
 
 
 @step("a new sink is created")
 def create_sink(context, **kwargs):
+    backend_type = configs.get("sink_backend_type")
     sink_label_name = sink_name_prefix + random_string(10)
     token = context.token
     endpoint = context.remote_prometheus_endpoint
     username = context.prometheus_username
     password = context.prometheus_key
-    if "enable_otel" in kwargs:  # this if/else logic can be removed after otel migration
-        kwargs["enable_otel"] = kwargs["enable_otel"].lower()
-        assert_that(kwargs["enable_otel"], any_of("true", "false"))
-        include_otel_env_var = "true"
-        enable_otel = kwargs["enable_otel"]
-    else:
-        include_otel_env_var = configs.get("include_otel_env_var")
-        enable_otel = configs.get("enable_otel")
-    otel_map = {"true": "enabled", "false": "disabled"}
     if "configuration_type" in kwargs:
         configuration_type = kwargs["configuration_type"].lower()
     else:
         configuration_type = ""
-    if include_otel_env_var == "true":
-        context.sink = create_new_sink(token, sink_label_name, endpoint, username, password, backend_type=backend_type,
-                                       include_otel=include_otel_env_var, otel=otel_map[enable_otel],
-                                       configuration_type=configuration_type)
-    else:
-        context.sink = create_new_sink(token, sink_label_name, endpoint, username, password, backend_type=backend_type,
-                                       configuration_type=configuration_type)
+    context.sink = create_new_sink(token, sink_label_name, endpoint, username, password, backend_type=backend_type,
+                                   configuration_type=configuration_type)
     local_orb_path = configs.get("local_orb_path")
     schema_map = {"prometheus": "/sink_schema.json", "otlphttp": "/sink_otlphttp_schema.json"}
     sink_schema_path = f"{local_orb_path}/python-test/features/steps/schemas{schema_map[backend_type]}"
@@ -77,20 +82,13 @@ def create_yaml_sink(context, configuration_type):
 
 @step("a new sink is is requested to be created with the same name as an existent one")
 def create_sink_with_conflict_name(context):
+    backend_type = configs.get("sink_backend_type")
     token = context.token
     endpoint = context.remote_prometheus_endpoint
     username = context.prometheus_username
     password = context.prometheus_key
-    include_otel_env_var = configs.get("include_otel_env_var")
-    enable_otel = configs.get("enable_otel")
-    otel_map = {"true": "enabled", "false": "disabled"}
-    if include_otel_env_var == "true":
-        context.error_message = create_new_sink(token, context.sink['name'], endpoint, username, password,
-                                                backend_type=backend_type, include_otel=include_otel_env_var,
-                                                otel=otel_map[enable_otel], expected_status_code=409)
-    else:
-        context.error_message = create_new_sink(token, context.sink['name'], endpoint, username, password,
-                                                backend_type=backend_type, expected_status_code=409)
+    context.error_message = create_new_sink(token, context.sink['name'], endpoint, username, password,
+                                            backend_type=backend_type, expected_status_code=409)
 
 
 @step("the name of last Sink is edited using an already existent one")
@@ -119,15 +117,6 @@ def new_sink(context, configuration_type):
         create_sink(context, configuration_type=configuration_type.lower())
 
 
-# this step is only necessary for OTEL migration tests, so we can exclude it after the migration
-@step("that a/an {sink_type} sink already exists (migration)")
-def new_sink(context, sink_type):
-    assert_that(sink_type, any_of("OTEL", "legacy"), "Unexpected type of sink")
-    otel_map = {"OTEL": "true", "legacy": "false"}
-    check_prometheus_grafana_credentials(context)
-    create_sink(context, enable_otel=otel_map[sink_type])
-
-
 @step("that {amount_of_sinks} sinks already exists")
 def new_multiple_sinks(context, amount_of_sinks):
     check_prometheus_grafana_credentials(context)
@@ -150,6 +139,7 @@ def remove_sink_from_orb(context, amount_of_sinks):
 
 @step("that a sink with invalid {credential} already exists")
 def create_invalid_sink(context, credential):
+    backend_type = configs.get("sink_backend_type")
     assert_that(credential, any_of(equal_to('endpoint'), equal_to('username'), equal_to('password')),
                 "Invalid prometheus field")
     check_prometheus_grafana_credentials(context)
@@ -158,18 +148,9 @@ def create_invalid_sink(context, credential):
     prometheus_credentials = {'endpoint': context.remote_prometheus_endpoint, 'username': context.prometheus_username,
                               'password': context.prometheus_key}
     prometheus_credentials[credential] = prometheus_credentials[credential][:-2]
-    include_otel_env_var = configs.get("include_otel_env_var")
-    enable_otel = configs.get("enable_otel")
-    otel_map = {"true": "enabled", "false": "disabled"}
-    if include_otel_env_var == "true":
-        context.sink = create_new_sink(token, sink_label_name, prometheus_credentials['endpoint'],
-                                       prometheus_credentials['username'], prometheus_credentials['password'],
-                                       backend_type=backend_type, include_otel=include_otel_env_var,
-                                       otel=otel_map[enable_otel])
-    else:
-        context.sink = create_new_sink(token, sink_label_name, prometheus_credentials['endpoint'],
-                                       prometheus_credentials['username'], prometheus_credentials['password'],
-                                       backend_type=backend_type)
+    context.sink = create_new_sink(token, sink_label_name, prometheus_credentials['endpoint'],
+                                   prometheus_credentials['username'], prometheus_credentials['password'],
+                                   backend_type=backend_type)
     local_orb_path = configs.get("local_orb_path")
     sink_schema_path = local_orb_path + "/python-test/features/steps/schemas/sink_schema.json"
     is_schema_valid = validate_json(context.sink, sink_schema_path)
@@ -196,36 +177,6 @@ def check_sink_status(context, status, time_to_wait):
     assert_that(context.sink['state'], equal_to(status), f"Sink {context.sink} state failed")
 
 
-# this step is only necessary for OTEL migration tests, so we can exclude it after the migration
-@step("the sink is updated and OTEL is {otel}")
-def edit_sink_field(context, otel):
-    assert_that(otel, any_of("enabled", "disabled"))
-    sink = get_sink(context.token, context.sink['id'])
-    sink['config']['authentication']['password'] = configs.get('prometheus_key')
-    sink['config']["opentelemetry"] = otel
-    context.sink = edit_sink(context.token, context.sink['id'], sink)
-
-
-# this step is only necessary for OTEL migration tests, so we can exclude it after the migration
-@step("all existing sinks must have OTEL enabled")
-def check_all_sinks_status(context):
-    all_sinks = list_sinks(context.token)
-    otel_sinks = list()
-    legacy_sinks = list()
-    migrated_sinks = list()
-    for sink in all_sinks:
-        if "opentelemetry" in sink["config"].keys() and sink["config"]["opentelemetry"] == "enabled":
-            otel_sinks.append(sink["id"])
-        else:
-            legacy_sinks.append(sink["id"])
-
-        if "migrated" in sink["config"].keys() and sink["config"]["migrated"] == "m3":
-            migrated_sinks.append(sink["id"])
-    print(f"{len(migrated_sinks)} of {len(all_sinks)} sinks have migration tags")
-    assert_that(len(otel_sinks), equal_to(len(all_sinks)), f"{len(legacy_sinks)} sinks are not with otel tag enabled: "
-                                                           f"{legacy_sinks}")
-
-
 @step("the sink {field_to_edit} is edited and an {type_of_field} one is used")
 def edit_sink_field(context, field_to_edit, type_of_field):
     assert_that(field_to_edit, any_of("remote host", "endpoint", "username", "password", "name", "description", "tags"),
@@ -270,23 +221,11 @@ def sink_partial_update(context, sink_keys):
             remote_host = context.remote_prometheus_endpoint
             username = context.prometheus_username
             password = context.prometheus_key
-            include_otel_env_var = configs.get("include_otel_env_var")
-            enable_otel = configs.get("enable_otel")
-            otel_map = {"true": "enabled", "false": "disabled"}
-            assert_that(enable_otel, any_of("true", "false"), "Unexpected value for 'enable_otel' on sinks "
-                                                              "partial update")
-            assert_that(include_otel_env_var, any_of("true", "false"), "Unexpected value for 'include_otel_env_var' on "
-                                                                       "sinks partial update")
             exporter_key = {"prometheus": "remote_host", "otlphttp": "endpoint"}
             sink_backend = context.sink.get("backend")
             assert_that(sink_backend, any_of("prometheus", "otlphttp"), f"Invalid sink backend: '{sink_backend}'")
-            if include_otel_env_var == "true":
-                sink_configs = {"authentication": {"type": "basicauth", "password": password, "username": username},
-                                "exporter": {exporter_key[sink_backend]: remote_host},
-                                "opentelemetry": otel_map[enable_otel]}
-            else:
-                sink_configs = {"authentication": {"type": "basicauth", "password": password, "username": username},
-                                "exporter": {exporter_key[sink_backend]: remote_host}}
+            sink_configs = {"authentication": {"type": "basicauth", "password": password, "username": username},
+                            "exporter": {exporter_key[sink_backend]: remote_host}}
             context.values_to_use_to_update_sink = {"name": f"{context.sink['name']}_updated",
                                                     "description": "this sink has been updated",
                                                     "tags": {"sink": "updated", "new": "tag"}, "config": sink_configs}
@@ -330,8 +269,7 @@ def clean_sinks(context):
 
 
 def create_new_sink(token, name_label, remote_host, username, password, backend_type=None,
-                    description=None, tag_key=None, tag_value=None, include_otel="false", otel="disabled",
-                    configuration_type="", expected_status_code=201):
+                    description=None, tag_key=None, tag_value=None, configuration_type="", expected_status_code=201):
     """
 
     Creates a new sink in Orb control plane
@@ -345,21 +283,14 @@ def create_new_sink(token, name_label, remote_host, username, password, backend_
     :param (str) description: description of sink
     :param (str) tag_key: the key of the tag to be added to this sink. Default: ''
     :param (str) tag_value: the value of the tag to be added to this sink. Default: None
-    :param (str) include_otel: if true it include 'opentelemetry' on sink's configs
-    :param (str) otel: the value to be used on 'opentelemetry' config
     :param (str) configuration_type: define in which type the configuration will be written
     :param (int) expected_status_code: status code expected as response
     :return: (dict) a dictionary containing the created sink data
     """
-    assert_that(include_otel, any_of("true", "false"), "Unexpected value for 'include_otel' on sinks creation")
     assert_that(backend_type, any_of("prometheus", equal_to("otlphttp")), f"Unexpected type of backend.")
     exporter_key = {"prometheus": "remote_host", "otlphttp": "endpoint"}
-    if include_otel == "true":
-        sink_configs = {"authentication": {"type": "basicauth", "password": password, "username": username},
-                        "exporter": {exporter_key[backend_type]: remote_host}, "opentelemetry": otel}
-    else:
-        sink_configs = {"authentication": {"type": "basicauth", "password": password, "username": username},
-                        "exporter": {exporter_key[backend_type]: remote_host}}
+    sink_configs = {"authentication": {"type": "basicauth", "password": password, "username": username},
+                    "exporter": {exporter_key[backend_type]: remote_host}}
     if configuration_type == "yaml":
         sink_configs_yaml = yaml.dump(sink_configs)
         json_request = {"name": name_label, "description": description, "tags": {tag_key: tag_value},
@@ -370,17 +301,15 @@ def create_new_sink(token, name_label, remote_host, username, password, backend_
     else:
         json_request = {"name": name_label, "description": description, "tags": {tag_key: tag_value},
                         "backend": backend_type, "config": sink_configs}
-    headers_request = {'Content-type': 'application/json', 'Accept': '*/*', 'Authorization': f'Bearer {token}'}
+
     json_request = remove_empty_from_json(json_request)
-    response = requests.post(orb_url + '/api/v1/sinks', json=json_request, headers=headers_request,
-                             verify=verify_ssl_bool)
-    try:
-        response_json = response.json()
-    except ValueError:
-        response_json = response.text
-    assert_that(response.status_code, equal_to(expected_status_code),
-                'Request to create sink failed with status=' + str(response.status_code) + ': ' + str(response_json))
-    return response_json
+
+    status_code, response = return_api_post_response(f"{orb_url}/api/v1/sinks", request_body=json_request,
+                                                     token=token, verify=verify_ssl_bool)
+
+    assert_that(status_code, equal_to(expected_status_code),
+                'Request to create sink failed with status=' + str(status_code) + ': ' + str(response))
+    return response
 
 
 def get_sink(token, sink_id):
@@ -392,19 +321,14 @@ def get_sink(token, sink_id):
     :returns: (dict) the fetched sink
     """
 
-    get_sink_response = requests.get(orb_url + '/api/v1/sinks/' + sink_id, headers={'Authorization': f'Bearer {token}'},
-                                     verify=verify_ssl_bool)
+    status_code, response = return_api_get_response(f"{orb_url}/api/v1/sinks/{sink_id}", token=token,
+                                                    verify=verify_ssl_bool)
 
-    try:
-        response_json = get_sink_response.json()
-    except ValueError:
-        response_json = get_sink_response.text
-
-    assert_that(get_sink_response.status_code, equal_to(200),
+    assert_that(status_code, equal_to(200),
                 'Request to get sink id=' + sink_id + ' failed with status=' + str(
-                    get_sink_response.status_code) + ': ' + str(response_json))
+                    status_code) + ': ' + str(response))
 
-    return response_json
+    return response
 
 
 def list_sinks(token, limit=100, offset=0):
@@ -438,19 +362,17 @@ def list_up_to_limit_sinks(token, limit=100, offset=0):
     :returns: (list) a list of sinks, (int) total sinks on orb, (int) offset
     """
 
-    response = requests.get(orb_url + '/api/v1/sinks', headers={'Authorization': f'Bearer {token}'},
-                            params={'limit': limit, 'offset': offset}, verify=verify_ssl_bool)
+    status_code, response = return_api_get_response(f"{orb_url}/api/v1/sinks", token=token,
+                                                    params={'limit': limit, 'offset': offset}, verify=verify_ssl_bool)
 
-    try:
-        response_json = response.json()
-    except ValueError:
-        response_json = response.text
+    assert_that(status_code, equal_to(200),
+                'Request to list sinks failed with status=' + str(status_code) + ': ' + str(response))
 
-    assert_that(response.status_code, equal_to(200),
-                'Request to list sinks failed with status=' + str(response.status_code) + ': ' + str(response_json))
+    assert_that(response, has_key('sinks'), f"Response does not contain 'sinks' key: {response}")
+    assert_that(response, has_key('total'), f"Response does not contain 'total' key: {response}")
+    assert_that(response, has_key('offset'), f"Response does not contain 'offset' key: {response}")
 
-    sinks_as_json = response.json()
-    return sinks_as_json['sinks'], sinks_as_json['total'], sinks_as_json['offset']
+    return response['sinks'], response['total'], response['offset']
 
 
 def delete_sinks(token, list_of_sinks):
@@ -473,11 +395,11 @@ def delete_sink(token, sink_id):
     :param (str) sink_id: that identifies the sink to be deleted
     """
 
-    response = requests.delete(orb_url + '/api/v1/sinks/' + sink_id, headers={'Authorization': f'Bearer {token}'},
-                               verify=verify_ssl_bool)
+    status_code, response = return_api_delete_response(f"{orb_url}/api/v1/sinks/{sink_id}", token=token,
+                                                       verify=verify_ssl_bool)
 
-    assert_that(response.status_code, equal_to(204),
-                'Request to delete sink id=' + sink_id + ' failed with status=' + str(response.status_code))
+    assert_that(status_code, equal_to(204),
+                f"Request to delete sink id= {sink_id} failed with status= {status_code}. Response: {response}.")
 
 
 @threading_wait_until
@@ -507,16 +429,10 @@ def edit_sink(token, sink_id, sink_body, expected_status_code=200):
     :returns: (dict) the edited agent group
     """
 
-    headers_request = {'Content-type': 'application/json', 'Accept': '*/*', 'Authorization': f'Bearer {token}'}
-
-    response = requests.put(orb_url + '/api/v1/sinks/' + sink_id, json=sink_body, headers=headers_request,
-                            verify=verify_ssl_bool)
-    try:
-        response_json = response.json()
-    except ValueError:
-        response_json = response.text
+    status_code, response = return_api_put_response(f"{orb_url}/api/v1/sinks/{sink_id}",
+                                                    request_body=sink_body, token=token, verify=verify_ssl_bool)
 
-    assert_that(response.status_code, equal_to(expected_status_code),
-                'Request to edit sink failed with status=' + str(response.status_code) + ":" + str(response_json))
+    assert_that(status_code, equal_to(expected_status_code),
+                'Request to edit sink failed with status=' + str(status_code) + ":" + str(response))
 
-    return response.json()
+    return response
diff --git a/python-test/features/steps/control_sink_ui.py b/python-test/features/steps/sink_ui.py
similarity index 99%
rename from python-test/features/steps/control_sink_ui.py
rename to python-test/features/steps/sink_ui.py
index 7d080cbc8..a219daf73 100644
--- a/python-test/features/steps/control_sink_ui.py
+++ b/python-test/features/steps/sink_ui.py
@@ -1,10 +1,10 @@
 from behave import when, then, step
-from test_config import TestConfig
+from configs import TestConfig
 from ui_utils import *
 from hamcrest import *
 from utils import random_string, create_tags_set
 from page_objects import *
-from control_plane_sink import sink_name_prefix, list_sinks
+from sink import sink_name_prefix, list_sinks
 
 configs = TestConfig.configs()
 orb_url = configs.get('orb_url')
diff --git a/python-test/features/steps/users.py b/python-test/features/steps/users.py
index 7f70eb087..3bb3f4277 100644
--- a/python-test/features/steps/users.py
+++ b/python-test/features/steps/users.py
@@ -1,8 +1,7 @@
 from hamcrest import *
 from behave import given, step, then
-from test_config import TestConfig
-import requests
-from utils import random_string
+from configs import TestConfig
+from utils import random_string, return_api_post_response, return_api_get_response
 
 configs = TestConfig.configs()
 orb_url = configs.get('orb_url')
@@ -62,7 +61,7 @@ def check_account_information(context, company_status, fullname_status):
     for metadata in expected_metadata.keys():
         assert_that(account_details["metadata"], has_key(metadata), f"Missing {metadata} in account metadata")
         assert_that(account_details["metadata"][metadata], equal_to(expected_metadata[metadata]),
-                f"Unexpected value for {metadata}")
+                    f"Unexpected value for {metadata}")
 
 
 @given("the Orb user has a registered account")
@@ -94,21 +93,13 @@ def authenticate(user_email, user_password, expected_status_code=201):
     :returns: (dict) response of auth request
     """
 
-    headers = {'Content-type': 'application/json', 'Accept': '*/*'}
     json_request = {'email': user_email, 'password': user_password}
     json_request = {parameter: value for parameter, value in json_request.items() if value}
-    response = requests.post(orb_url + '/api/v1/tokens',
-                             json=json_request,
-                             headers=headers,
-                             verify=verify_ssl_bool)
-    try:
-        response_json = response.json()
-    except ValueError:
-        response_json = response.text
-    assert_that(response.status_code, equal_to(expected_status_code),
-                f"Authentication failed with status= {str(response.status_code)}. Response: {str(response_json)}"
+    status_code, response = return_api_post_response(f"{orb_url}/api/v1/tokens", request_body=json_request)
+    assert_that(status_code, equal_to(expected_status_code),
+                f"Authentication failed with status= {str(status_code)}. Response: {str(response)}"
                 )
-    return response_json
+    return response
 
 
 def register_account(user_email, user_password, company_name=None, user_full_name=None, expected_status_code=201):
@@ -127,15 +118,13 @@ def register_account(user_email, user_password, company_name=None, user_full_nam
                                                                                  "fullName": user_full_name}}
     json_request['metadata'] = {parameter: value for parameter, value in json_request['metadata'].items() if value}
     json_request = {parameter: value for parameter, value in json_request.items() if value}
-    headers = {'Content-type': 'application/json', 'Accept': '*/*'}
-    response = requests.post(orb_url + '/api/v1/users',
-                             json=json_request,
-                             headers=headers,
-                             verify=verify_ssl_bool)
-    assert_that(response.status_code, equal_to(expected_status_code),
+
+    status_code, response = return_api_post_response(f"{orb_url}/api/v1/users",
+                                                     request_body=json_request, verify=verify_ssl_bool)
+    assert_that(status_code, equal_to(expected_status_code),
                 f"Current value of is_credentials_registered parameter = {configs.get('is_credentials_registered')}."
-                f"\nExpected status code for registering an account failed with status= {str(response.status_code)}.")
-    return response, response.status_code,
+                f"\nExpected status code for registering an account failed with status= {str(status_code)}.")
+    return response, status_code
 
 
 def get_account_information(token, expected_status_code=200):
@@ -145,14 +134,10 @@ def get_account_information(token, expected_status_code=200):
     :param (int) expected_status_code: expected request's status code. Default:200 (happy path).
     :return: (dict) account_response
     """
-    response = requests.get(orb_url + '/api/v1/users/profile',
-                            headers={'Authorization': f'Bearer {token}'}, verify=verify_ssl_bool)
-
-    try:
-        response_json = response.json()
-    except ValueError:
-        response_json = response.text
-    assert_that(response.status_code, equal_to(expected_status_code), f"Unexpected status code for get account data."
-                                                                      f"Status Code = {response.status_code}."
-                                                                      f"Response = {str(response_json)}")
-    return response_json
+    status_code, response = return_api_get_response(f"{orb_url}/api/v1/users/profile",
+                                                    token=token, verify=verify_ssl_bool)
+
+    assert_that(status_code, equal_to(expected_status_code), f"Unexpected status code for get account data."
+                                                             f"Status Code = {status_code}."
+                                                             f"Response = {str(response)}")
+    return response
diff --git a/python-test/features/steps/utils.py b/python-test/features/steps/utils.py
index 409c7f84b..cb68c1a4b 100644
--- a/python-test/features/steps/utils.py
+++ b/python-test/features/steps/utils.py
@@ -13,7 +13,10 @@
 from abc import ABC, abstractmethod
 import shlex
 import subprocess
+import requests
+from logger import Logger
 
+log = Logger().logger_instance()
 tag_prefix = "test_tag_"
 
 
@@ -135,6 +138,11 @@ def check_logs_contain_message_and_name(logs, expected_message, name, name_key):
     return False, "Logs doesn't contain the message and name expected"
 
 
+# Convert "true" and "false" strings to boolean values
+def str_to_bool(s):
+    return s.lower() == 'true'
+
+
 def values_to_boolean(json_file):
     """
     Transform boolean string values into boolean
@@ -269,6 +277,98 @@ def validate_json(json_data, path_to_file):
     return True
 
 
+def is_json(json_string):
+    """
+    Test if some string can be converted to json.
+    :param json_string: string to be tested
+    :return: bool: is string is a valid json, error_message or string in json
+    """
+    try:
+        json_converted = json.loads(json_string)
+    except ValueError as e:
+        return False, e
+    return True, json_converted
+
+
+def send_terminal_commands(command, cwd_run=None):
+    args = shlex.split(command)
+    p = subprocess.Popen(args, stdin=subprocess.PIPE, stderr=subprocess.PIPE,
+                         stdout=subprocess.PIPE, cwd=cwd_run, universal_newlines=True)
+    subprocess_return_terminal = p.communicate()
+    return subprocess_return_terminal
+
+
+def log_response(response):
+    if response.ok:
+        log.info(f"{response.request.method} {response.url} -> Status Code: {response.status_code}")
+    else:
+        log.error(
+            f"{response.request.method} {response.url} -> Status Code: {response.status_code},"
+            f" Response: {response.text}")
+        request_body = response.request.body
+        if request_body is not None:
+            request_body = request_body.decode("utf-8")
+            request_body = json.loads(request_body)
+            if "password" in request_body:
+                request_body["password"] = "********"
+        log.debug(f"Request body: {request_body}")
+
+
+def return_api_get_response(api_path, token=None, params=None, **kwargs):
+    headers_request = {'Content-type': 'application/json', 'Accept': '*/*', 'Authorization': f'Bearer {token}'}
+    if token is None:
+        headers_request.pop('Authorization', None)
+    response = requests.get(api_path, headers=headers_request, params=params, **kwargs)
+    log_response(response)
+    try:
+        response_json = response.json()
+    except ValueError:
+        response_json = response.text
+
+    return response.status_code, response_json
+
+
+def return_api_post_response(api_path, token=None, request_body=None, **kwargs):
+    headers_request = {'Content-type': 'application/json', 'Accept': '*/*', 'Authorization': f'Bearer {token}'}
+    if token is None:
+        headers_request.pop('Authorization', None)
+    response = requests.post(api_path, json=request_body, headers=headers_request, **kwargs)
+    log_response(response)
+    try:
+        response_json = response.json()
+    except ValueError:
+        response_json = response.text
+
+    return response.status_code, response_json
+
+
+def return_api_delete_response( api_path, request_body=None, token=None, **kwargs):
+    headers_request = {'Content-type': 'application/json', 'Accept': '*/*', 'Authorization': f'Bearer {token}'}
+    if request_body is not None:
+        response = requests.delete(api_path, json=request_body, headers=headers_request, **kwargs)
+    else:
+        response = requests.delete(api_path, headers=headers_request, **kwargs)
+    log_response(response)
+    try:
+        response_json = response.json()
+    except ValueError:
+        response_json = response.text
+
+    return response.status_code, response_json
+
+
+def return_api_put_response(api_path, request_body=None, token=None, **kwargs):
+    headers_request = {'Content-type': 'application/json', 'Accept': '*/*', 'Authorization': f'Bearer {token}'}
+    response = requests.put(api_path, json=request_body, headers=headers_request, **kwargs)
+    log_response(response)
+    try:
+        response_json = response.json()
+    except ValueError:
+        response_json = response.text
+
+    return response.status_code, response_json
+
+
 class UtilsManager(ABC):
     def __init__(self):
         pass
@@ -312,24 +412,3 @@ def update_object_with_filters_and_configs(self, dict_object, name, configs_list
     @abstractmethod
     def json(self):
         pass
-
-
-def is_json(json_string):
-    """
-    Test if some string can be converted to json.
-    :param json_string: string to be tested
-    :return: bool: is string is a valid json, error_message or string in json
-    """
-    try:
-        json_converted = json.loads(json_string)
-    except ValueError as e:
-        return False, e
-    return True, json_converted
-
-
-def send_terminal_commands(command, cwd_run=None):
-    args = shlex.split(command)
-    p = subprocess.Popen(args, stdin=subprocess.PIPE, stderr=subprocess.PIPE,
-                         stdout=subprocess.PIPE, cwd=cwd_run, universal_newlines=True)
-    subprocess_return_terminal = p.communicate()
-    return subprocess_return_terminal
diff --git a/python-test/requirements.txt b/python-test/requirements.txt
index 91cad9c05..62cee8a0a 100644
--- a/python-test/requirements.txt
+++ b/python-test/requirements.txt
@@ -1,15 +1,16 @@
 behave==1.2.6
-ciso8601==2.3.0
-docker==6.1.3
-PyHamcrest==2.0.4
+ciso8601==2.3.1
+colorlog==6.8.0
+docker==7.0.0
+PyHamcrest==2.1.0
 PyYAML==6.0.1
 retry==0.9.2
-selenium==4.11.0
-behavex==2.0.1
-deepdiff==6.3.1
-jsonschema==4.18.4
-mkdocs==1.5.1
-mkdocs-material==9.1.21
-prometheus-client==0.17.1
-psutil==5.9.5
-webdriver-manager==3.9.1
+selenium==4.16.0
+behavex==3.2.0
+deepdiff==6.7.1
+jsonschema==4.20.0
+mkdocs==1.5.3
+mkdocs-material==9.5.2
+prometheus-client==0.19.0
+psutil==5.9.7
+webdriver-manager==4.0.1
diff --git a/python-test/test_config.ini.tpl b/python-test/test_config.ini.tpl
index 6875045dd..b3ad8ffef 100644
--- a/python-test/test_config.ini.tpl
+++ b/python-test/test_config.ini.tpl
@@ -18,8 +18,6 @@ remote_prometheus_endpoint= <base URL to send Prometheus metrics to Grafana Clou
 # is_credentials_registered=False
 # headless=True
 # use_orb_live_address_pattern=True
-# include_otel_env_var=False
-# enable_otel=True
 
 # Required if use_orb_live_address_pattern is False:
 # orb_cloud_api_address=<orb api address>
diff --git a/sinker/backend/backend.go b/sinker/backend/backend.go
deleted file mode 100644
index 884bf9704..000000000
--- a/sinker/backend/backend.go
+++ /dev/null
@@ -1,38 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package backend
-
-import (
-	"github.com/orb-community/orb/fleet"
-	"github.com/orb-community/orb/fleet/pb"
-	"github.com/orb-community/orb/sinker/prometheus"
-)
-
-type Backend interface {
-	ProcessMetrics(agent *pb.AgentInfoRes, thingID string, data fleet.AgentMetricsRPCPayload) ([]prometheus.TimeSeries, error)
-}
-
-var registry = make(map[string]Backend)
-
-func Register(name string, b Backend) {
-	registry[name] = b
-}
-
-func GetList() []string {
-	keys := make([]string, 0, len(registry))
-	for k := range registry {
-		keys = append(keys, k)
-	}
-	return keys
-}
-
-func HaveBackend(name string) bool {
-	_, prs := registry[name]
-	return prs
-}
-
-func GetBackend(name string) Backend {
-	return registry[name]
-}
diff --git a/sinker/backend/pktvisor/pktvisor.go b/sinker/backend/pktvisor/pktvisor.go
deleted file mode 100644
index cb31bcefb..000000000
--- a/sinker/backend/pktvisor/pktvisor.go
+++ /dev/null
@@ -1,474 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package pktvisor
-
-import (
-	"encoding/json"
-	"fmt"
-	"regexp"
-	"strings"
-
-	"github.com/fatih/structs"
-	"github.com/mitchellh/mapstructure"
-	"github.com/orb-community/orb/fleet"
-	"github.com/orb-community/orb/fleet/pb"
-	"github.com/orb-community/orb/pkg/errors"
-	"github.com/orb-community/orb/sinker/backend"
-	"github.com/orb-community/orb/sinker/prometheus"
-	"go.uber.org/zap"
-	"golang.org/x/exp/slices"
-)
-
-var _ backend.Backend = (*pktvisorBackend)(nil)
-
-type pktvisorBackend struct {
-	logger *zap.Logger
-}
-
-type metricAppendix struct {
-	agent        *pb.AgentInfoRes
-	agentID      string
-	policyID     string
-	policyName   string
-	deviceList   []string
-	deviceID     string
-	ifList       []string
-	deviceIF     string
-	handlerLabel string
-	format       string
-	tags         map[string]string
-	logger       *zap.Logger
-	warning      string
-}
-
-func (p pktvisorBackend) ProcessMetrics(agent *pb.AgentInfoRes, agentID string, data fleet.AgentMetricsRPCPayload) ([]prometheus.TimeSeries, error) {
-	// TODO check pktvisor version in data.BEVersion against PktvisorVersion
-	if data.Format != "json" {
-		p.logger.Warn("ignoring non-json pktvisor payload", zap.String("format", data.Format))
-		return nil, nil
-	}
-	// unmarshal pktvisor metrics
-	var metrics map[string]map[string]interface{}
-	err := json.Unmarshal(data.Data, &metrics)
-	if err != nil {
-		p.logger.Warn("unable to unmarshal pktvisor metric payload", zap.Any("payload", data.Data))
-		return nil, err
-	}
-
-	tags := make(map[string]string)
-	for k, v := range agent.AgentTags {
-		tags[k] = v
-	}
-	for k, v := range agent.OrbTags {
-		tags[k] = v
-	}
-
-	appendix := metricAppendix{
-		agent:        agent,
-		agentID:      agentID,
-		policyID:     data.PolicyID,
-		policyName:   data.PolicyName,
-		deviceList:   []string{},
-		deviceID:     "",
-		ifList:       []string{},
-		deviceIF:     "",
-		handlerLabel: "",
-		format:       "prom_sinker",
-		warning:      "Deprecated, soon we will substitute for openTelemetry, check https://orb.community/documentation to how enable openTelemetry in your agent",
-		tags:         tags,
-		logger:       p.logger,
-	}
-	stats := make(map[string]StatSnapshot)
-	for handlerLabel, handlerData := range metrics {
-		if data, ok := handlerData["pcap"]; ok {
-			sTmp := StatSnapshot{}
-			err := mapstructure.Decode(data, &sTmp.Pcap)
-			if err != nil {
-				p.logger.Error("error decoding pcap handler", zap.Error(err))
-				continue
-			}
-			stats[handlerLabel] = sTmp
-		} else if data, ok := handlerData["dns"]; ok {
-			sTmp := StatSnapshot{}
-			err := mapstructure.Decode(data, &sTmp.DNS)
-			if err != nil {
-				p.logger.Error("error decoding dns handler", zap.Error(err))
-				continue
-			}
-			stats[handlerLabel] = sTmp
-		} else if data, ok := handlerData["packets"]; ok {
-			sTmp := StatSnapshot{}
-			err := mapstructure.Decode(data, &sTmp.Packets)
-			if err != nil {
-				p.logger.Error("error decoding packets handler", zap.Error(err))
-				continue
-			}
-			stats[handlerLabel] = sTmp
-		} else if data, ok := handlerData["dhcp"]; ok {
-			sTmp := StatSnapshot{}
-			err := mapstructure.Decode(data, &sTmp.DHCP)
-			if err != nil {
-				p.logger.Error("error decoding dhcp handler", zap.Error(err))
-				continue
-			}
-			stats[handlerLabel] = sTmp
-		} else if data, ok := handlerData["flow"]; ok {
-			sTmp := StatSnapshot{}
-			err := mapstructure.Decode(data, &sTmp.Flow)
-			if err != nil {
-				p.logger.Error("error decoding dhcp handler", zap.Error(err))
-				continue
-			}
-			stats[handlerLabel] = sTmp
-		}
-	}
-	return parseToProm(&appendix, stats), nil
-}
-
-func parseToProm(ctxt *metricAppendix, statsMap map[string]StatSnapshot) prometheus.TSList {
-	var finalTs = prometheus.TSList{}
-	for handlerLabel, stats := range statsMap {
-		var tsList = prometheus.TSList{}
-		statsMap := structs.Map(stats)
-		ctxt.handlerLabel = handlerLabel
-		if stats.Flow != nil {
-			convertFlowToPromParticle(ctxt, statsMap, "", &tsList)
-		} else {
-			convertToPromParticle(ctxt, statsMap, "", &tsList)
-		}
-		finalTs = append(finalTs, tsList...)
-	}
-	return finalTs
-}
-
-func convertToPromParticle(ctxt *metricAppendix, statsMap map[string]interface{}, label string, tsList *prometheus.TSList) {
-	for key, value := range statsMap {
-		switch statistic := value.(type) {
-		case map[string]interface{}:
-			// Call convertToPromParticle recursively until the last interface of the StatSnapshot struct
-			// The prom particle label it's been formed during the recursive call (concatenation)
-			convertToPromParticle(ctxt, statistic, label+key, tsList)
-		// The StatSnapshot has two ways to record metrics (i.e. Live int64 `mapstructure:"live"`)
-		// It's why we check if the type is int64
-		case int64:
-			{
-				// Use this regex to identify if the value it's a quantile
-				var matchFirstQuantile = regexp.MustCompile("^([Pp])+[0-9]")
-				if ok := matchFirstQuantile.MatchString(key); ok {
-					// If it's quantile, needs to be parsed to prom quantile format
-					tsList = makePromParticle(ctxt, label, key, value, tsList, ok, "")
-				} else {
-					tsList = makePromParticle(ctxt, label+key, "", value, tsList, false, "")
-				}
-			}
-		// The StatSnapshot has two ways to record metrics (i.e. P50 float64 `mapstructure:"p50"`)
-		// It's why we check if the type is float64
-		case float64:
-			{
-				// Use this regex to identify if the value it's a quantile
-				var matchFirstQuantile = regexp.MustCompile("^[Pp]+[0-9]")
-				if ok := matchFirstQuantile.MatchString(key); ok {
-					// If it's quantile, needs to be parsed to prom quantile format
-					tsList = makePromParticle(ctxt, label, key, value, tsList, ok, "")
-				} else {
-					tsList = makePromParticle(ctxt, label+key, "", value, tsList, false, "")
-				}
-			}
-		// The StatSnapshot has two ways to record metrics (i.e. TopIpv4   []NameCount   `mapstructure:"top_ipv4"`)
-		// It's why we check if the type is []interface
-		// Here we extract the value for Name and Estimate
-		case []interface{}:
-			{
-				for _, value := range statistic {
-					m, ok := value.(map[string]interface{})
-					if !ok {
-						return
-					}
-					var promLabel string
-					var promDataPoint interface{}
-					for k, v := range m {
-						switch k {
-						case "Name":
-							{
-								promLabel = fmt.Sprintf("%v", v)
-							}
-						case "Estimate":
-							{
-								promDataPoint = v
-							}
-						}
-					}
-					tsList = makePromParticle(ctxt, label+key, promLabel, promDataPoint, tsList, false, key)
-				}
-			}
-		}
-	}
-}
-
-func convertFlowToPromParticle(ctxt *metricAppendix, statsMap map[string]interface{}, label string, tsList *prometheus.TSList) {
-	for key, value := range statsMap {
-		switch statistic := value.(type) {
-		case map[string]interface{}:
-			// Call convertToPromParticle recursively until the last interface of the StatSnapshot struct
-			// The prom particle label it's been formed during the recursive call (concatenation)
-
-			if label == "FlowDevices" {
-				label = strings.ReplaceAll(label, "Devices", "")
-				for mkey := range statsMap {
-					ctxt.deviceList = append(ctxt.deviceList, mkey)
-				}
-				ctxt.deviceID = key
-				ctxt.deviceIF = ""
-				convertFlowToPromParticle(ctxt, statistic, label, tsList)
-			} else if label == "FlowInterfaces" {
-				label = strings.ReplaceAll(label, "Interfaces", "")
-				for mkey := range statsMap {
-					ctxt.ifList = append(ctxt.ifList, mkey)
-				}
-				ctxt.deviceIF = ctxt.deviceID + "|" + key
-				convertFlowToPromParticle(ctxt, statistic, label, tsList)
-			} else if slices.Contains(ctxt.deviceList, key) {
-				ctxt.deviceID = key
-				convertFlowToPromParticle(ctxt, statistic, label, tsList)
-			} else if slices.Contains(ctxt.ifList, key) {
-				ctxt.deviceIF = ctxt.deviceID + "|" + key
-				convertFlowToPromParticle(ctxt, statistic, label, tsList)
-			} else {
-				convertFlowToPromParticle(ctxt, statistic, label+key, tsList)
-			}
-
-		// The StatSnapshot has two ways to record metrics (i.e. Live int64 `mapstructure:"live"`)
-		// It's why we check if the type is int64
-		case int64:
-			{
-				// Use this regex to identify if the value it's a quantile
-				var matchFirstQuantile = regexp.MustCompile("^([Pp])+[0-9]")
-				if ok := matchFirstQuantile.MatchString(key); ok {
-					// If it's quantile, needs to be parsed to prom quantile format
-					tsList = makePromParticle(ctxt, label, key, value, tsList, ok, "")
-				} else {
-					tsList = makePromParticle(ctxt, label+key, "", value, tsList, false, "")
-				}
-			}
-		// The StatSnapshot has two ways to record metrics (i.e. TopIpv4   []NameCount   `mapstructure:"top_ipv4"`)
-		// It's why we check if the type is []interface
-		// Here we extract the value for Name and Estimate
-		case []interface{}:
-			{
-				for _, value := range statistic {
-					m, ok := value.(map[string]interface{})
-					if !ok {
-						return
-					}
-					var promLabel string
-					var promDataPoint interface{}
-					for k, v := range m {
-						switch k {
-						case "Name":
-							{
-								promLabel = fmt.Sprintf("%v", v)
-							}
-						case "Estimate":
-							{
-								promDataPoint = v
-							}
-						}
-					}
-					tsList = makePromParticle(ctxt, label+key, promLabel, promDataPoint, tsList, false, key)
-				}
-			}
-		}
-	}
-}
-
-func makePromParticle(ctxt *metricAppendix, label string, k string, v interface{}, tsList *prometheus.TSList, quantile bool, name string) *prometheus.TSList {
-	mapQuantiles := make(map[string]string)
-	mapQuantiles["P50"] = "0.5"
-	mapQuantiles["P90"] = "0.9"
-	mapQuantiles["P95"] = "0.95"
-	mapQuantiles["P99"] = "0.99"
-
-	var dpFlag dp
-	var labelsListFlag labelList
-	if err := labelsListFlag.Set(fmt.Sprintf("__name__;%s", camelToSnake(label))); err != nil {
-		handleParticleError(ctxt, err)
-		return tsList
-	}
-	if err := labelsListFlag.Set("instance;" + ctxt.agent.AgentName); err != nil {
-		handleParticleError(ctxt, err)
-		return tsList
-	}
-	if err := labelsListFlag.Set("job;" + ctxt.policyID); err != nil {
-		handleParticleError(ctxt, err)
-		return tsList
-	}
-	if err := labelsListFlag.Set("agent_id;" + ctxt.agentID); err != nil {
-		handleParticleError(ctxt, err)
-		return tsList
-	}
-	if err := labelsListFlag.Set("agent;" + ctxt.agent.AgentName); err != nil {
-		handleParticleError(ctxt, err)
-		return tsList
-	}
-	if err := labelsListFlag.Set("policy_id;" + ctxt.policyID); err != nil {
-		handleParticleError(ctxt, err)
-		return tsList
-	}
-	if err := labelsListFlag.Set("policy;" + ctxt.policyName); err != nil {
-		handleParticleError(ctxt, err)
-		return tsList
-	}
-	if err := labelsListFlag.Set("handler;" + ctxt.handlerLabel); err != nil {
-		handleParticleError(ctxt, err)
-		return tsList
-	}
-	if ctxt.deviceID != "" {
-		if err := labelsListFlag.Set("device;" + ctxt.deviceID); err != nil {
-			handleParticleError(ctxt, err)
-			ctxt.deviceID = ""
-			return tsList
-		}
-	}
-	if ctxt.deviceIF != "" {
-		if err := labelsListFlag.Set("device_interface;" + ctxt.deviceIF); err != nil {
-			handleParticleError(ctxt, err)
-			ctxt.deviceIF = ""
-			return tsList
-		}
-	}
-
-	for k, v := range ctxt.tags {
-		if err := labelsListFlag.Set(k + ";" + v); err != nil {
-			handleParticleError(ctxt, err)
-			return tsList
-		}
-	}
-
-	if k != "" {
-		if quantile {
-			if value, ok := mapQuantiles[k]; ok {
-				if err := labelsListFlag.Set(fmt.Sprintf("quantile;%s", value)); err != nil {
-					handleParticleError(ctxt, err)
-					return tsList
-				}
-			}
-		} else {
-			parsedName, err := topNMetricsParser(name)
-			if err != nil {
-				ctxt.logger.Error("failed to parse Top N metric, default value it'll be used", zap.Error(err))
-				parsedName = "name"
-			}
-			if err := labelsListFlag.Set(fmt.Sprintf("%s;%s", parsedName, k)); err != nil {
-				handleParticleError(ctxt, err)
-				return tsList
-			}
-		}
-	}
-	if err := dpFlag.Set(fmt.Sprintf("now,%d", v)); err != nil {
-		if err := dpFlag.Set(fmt.Sprintf("now,%v", v)); err != nil {
-			handleParticleError(ctxt, err)
-			return tsList
-		}
-	}
-	timeSeries := prometheus.TimeSeries{
-		Labels:    labelsListFlag,
-		Datapoint: prometheus.Datapoint(dpFlag),
-	}
-	*tsList = append(*tsList, timeSeries)
-	return tsList
-}
-
-func handleParticleError(ctxt *metricAppendix, err error) {
-	ctxt.logger.Error("failed to set prometheus element", zap.Error(err))
-}
-
-func camelToSnake(s string) string {
-	var matchFirstCap = regexp.MustCompile("(.)([A-Z][a-z]+)")
-	var matchAllCap = regexp.MustCompile("([a-z0-9])([A-Z])")
-
-	// Approach to avoid change the values to TopGeoLoc and TopASN
-	// Should continue camel case or upper case
-	var matchExcept = regexp.MustCompile(`(oLoc$|pASN$)`)
-	sub := matchExcept.Split(s, 2)
-	var strExcept = ""
-	if len(sub) > 1 {
-		strExcept = matchExcept.FindAllString(s, 1)[0]
-		if strExcept == "pASN" {
-			strExcept = "p_ASN"
-		}
-		s = sub[0]
-	}
-
-	snake := matchFirstCap.ReplaceAllString(s, "${1}_${2}")
-	snake = matchAllCap.ReplaceAllString(snake, "${1}_${2}")
-	lower := strings.ToLower(snake)
-	return lower + strExcept
-}
-
-func topNMetricsParser(label string) (string, error) {
-	mapNMetrics := make(map[string]string)
-	mapNMetrics["TopGeoLocECS"] = "geo_loc"
-	mapNMetrics["TopGeoLoc"] = "geo_loc"
-	mapNMetrics["TopAsnECS"] = "asn"
-	mapNMetrics["TopASN"] = "asn"
-	mapNMetrics["TopQueryECS"] = "ecs"
-	mapNMetrics["TopIpv6"] = "ipv6"
-	mapNMetrics["TopIpv4"] = "ipv4"
-	mapNMetrics["TopQname2"] = "qname"
-	mapNMetrics["TopQname3"] = "qname"
-	mapNMetrics["TopQnameByRespBytes"] = "qname"
-	mapNMetrics["TopNxdomain"] = "qname"
-	mapNMetrics["TopQtype"] = "qtype"
-	mapNMetrics["TopRcode"] = "rcode"
-	mapNMetrics["TopREFUSED"] = "qname"
-	mapNMetrics["TopNODATA"] = "qname"
-	mapNMetrics["TopSRVFAIL"] = "qname"
-	mapNMetrics["TopUDPPorts"] = "port"
-	mapNMetrics["TopSlow"] = "qname"
-	mapNMetrics["TopGeoLocBytes"] = "geo_loc"
-	mapNMetrics["TopGeoLocPackes"] = "geo_loc"
-	mapNMetrics["TopAsnBytes"] = "asn"
-	mapNMetrics["TopAsnPackets"] = "asn"
-	mapNMetrics["TopInDstIpsBytes"] = "ip"
-	mapNMetrics["TopInDstIpsPackets"] = "ip"
-	mapNMetrics["TopInSrcIpsBytes"] = "ip"
-	mapNMetrics["TopInSrcIpsPackets"] = "ip"
-	mapNMetrics["TopInDstPortsBytes"] = "port"
-	mapNMetrics["TopInDstPortsPackets"] = "port"
-	mapNMetrics["TopInSrcPortsBytes"] = "port"
-	mapNMetrics["TopInSrcPortsPackets"] = "port"
-	mapNMetrics["TopInDstIpsAndPortBytes"] = "ip_port"
-	mapNMetrics["TopInDstIpsAndPortPackets"] = "ip_port"
-	mapNMetrics["TopInSrcIpsAndPortBytes"] = "ip_port"
-	mapNMetrics["TopInSrcIpsAndPortPackets"] = "ip_port"
-	mapNMetrics["TopOutDstIpsBytes"] = "ip"
-	mapNMetrics["TopOutDstIpsPackets"] = "ip"
-	mapNMetrics["TopOutSrcIpsBytes"] = "ip"
-	mapNMetrics["TopOutSrcIpsPackets"] = "ip"
-	mapNMetrics["TopOutDstPortsBytes"] = "port"
-	mapNMetrics["TopOutDstPortsPackets"] = "port"
-	mapNMetrics["TopOutSrcPortsBytes"] = "port"
-	mapNMetrics["TopOutSrcPortsPackets"] = "port"
-	mapNMetrics["TopOutDstIpsAndPortBytes"] = "ip_port"
-	mapNMetrics["TopOutDstIpsAndPortPackets"] = "ip_port"
-	mapNMetrics["TopOutSrcIpsAndPortBytes"] = "ip_port"
-	mapNMetrics["TopOutSrcIpsAndPortPackets"] = "ip_port"
-	mapNMetrics["TopConversationsBytes"] = "conversations"
-	mapNMetrics["TopConversationsPackets"] = "conversations"
-	mapNMetrics["TopInInterfacesBytes"] = "interface"
-	mapNMetrics["TopInInterfacesPackets"] = "interface"
-	mapNMetrics["TopOutInterfacesBytes"] = "interface"
-	mapNMetrics["TopOutInterfacesPackets"] = "interface"
-	if value, ok := mapNMetrics[label]; ok {
-		return value, nil
-	} else {
-		return "", errors.New(fmt.Sprintf("top N metric not mapped for parse:  %s", label))
-	}
-}
-
-func Register(logger *zap.Logger) bool {
-	backend.Register("pktvisor", &pktvisorBackend{logger: logger})
-	return true
-}
diff --git a/sinker/backend/pktvisor/pktvisor_test.go b/sinker/backend/pktvisor/pktvisor_test.go
deleted file mode 100644
index 494569df3..000000000
--- a/sinker/backend/pktvisor/pktvisor_test.go
+++ /dev/null
@@ -1,5302 +0,0 @@
-package pktvisor_test
-
-import (
-	"fmt"
-	"reflect"
-	"testing"
-
-	"github.com/gofrs/uuid"
-	"github.com/orb-community/orb/fleet"
-	"github.com/orb-community/orb/fleet/pb"
-	"github.com/orb-community/orb/pkg/types"
-	"github.com/orb-community/orb/sinker/backend"
-	"github.com/orb-community/orb/sinker/backend/pktvisor"
-	"github.com/orb-community/orb/sinker/prometheus"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"go.uber.org/zap"
-)
-
-func TestDHCPConversion(t *testing.T) {
-	var logger = zap.NewNop()
-	pktvisor.Register(logger)
-
-	ownerID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	policyID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	agentID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	var agent = &pb.AgentInfoRes{
-		OwnerID:   ownerID.String(),
-		AgentName: "agent-test",
-	}
-
-	data := fleet.AgentMetricsRPCPayload{
-		PolicyID:   policyID.String(),
-		PolicyName: "policy-test",
-		Datasets:   nil,
-		Format:     "json",
-		BEVersion:  "1.0",
-	}
-
-	be := backend.GetBackend("pktvisor")
-
-	commonLabels := []prometheus.Label{
-		{
-			Name:  "instance",
-			Value: "agent-test",
-		},
-		{
-			Name:  "job",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "agent_id",
-			Value: agentID.String(),
-		},
-		{
-			Name:  "agent",
-			Value: "agent-test",
-		},
-		{
-			Name:  "policy_id",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "policy",
-			Value: "policy-test",
-		},
-		{
-			Name:  "handler",
-			Value: "policy_dhcp",
-		},
-	}
-
-	cases := map[string]struct {
-		data     []byte
-		expected prometheus.TimeSeries
-	}{
-		"DHCPPayloadWirePacketsFiltered": {
-			data: []byte(`
-{
-	"policy_dhcp": {
-        "dhcp": {
-            "wire_packets": {
-                "filtered": 10
-            }
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dhcp_wire_packets_filtered"})),
-				Datapoint: prometheus.Datapoint{
-					Value: 10,
-				},
-			},
-		},
-		"DHCPPayloadWirePacketsTotal": {
-			data: []byte(`
-{
-	"policy_dhcp": {
-        "dhcp": {
-            "wire_packets": {
-                "total": 10
-            }
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dhcp_wire_packets_total"})),
-				Datapoint: prometheus.Datapoint{
-					Value: 10,
-				},
-			},
-		},
-		"DHCPPayloadWirePacketsDeepSamples": {
-			data: []byte(`
-{
-	"policy_dhcp": {
-        "dhcp": {
-            "wire_packets": {
-                "deep_samples": 10
-            }
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dhcp_wire_packets_deep_samples"})),
-				Datapoint: prometheus.Datapoint{
-					Value: 10,
-				},
-			},
-		},
-		"DHCPPayloadWirePacketsDiscover": {
-			data: []byte(`
-{
-	"policy_dhcp": {
-        "dhcp": {
-            "wire_packets": {
-                "discover": 10
-            }
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dhcp_wire_packets_discover"})),
-				Datapoint: prometheus.Datapoint{
-					Value: 10,
-				},
-			},
-		},
-		"DHCPPayloadWirePacketsOffer": {
-			data: []byte(`
-{
-	"policy_dhcp": {
-        "dhcp": {
-            "wire_packets": {
-                "offer": 10
-            }
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dhcp_wire_packets_offer"})),
-				Datapoint: prometheus.Datapoint{
-					Value: 10,
-				},
-			},
-		},
-		"DHCPPayloadWirePacketsRequest": {
-			data: []byte(`
-{
-	"policy_dhcp": {
-        "dhcp": {
-            "wire_packets": {
-                "request": 10
-            }
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dhcp_wire_packets_request"})),
-				Datapoint: prometheus.Datapoint{
-					Value: 10,
-				},
-			},
-		},
-		"DHCPPayloadWirePacketsAck": {
-			data: []byte(`
-{
-	"policy_dhcp": {
-        "dhcp": {
-            "wire_packets": {
-                "ack": 10
-            }
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dhcp_wire_packets_ack"})),
-				Datapoint: prometheus.Datapoint{
-					Value: 10,
-				},
-			},
-		},
-	}
-
-	for desc, c := range cases {
-		t.Run(desc, func(t *testing.T) {
-			data.Data = c.data
-			res, err := be.ProcessMetrics(agent, agentID.String(), data)
-			require.Nil(t, err, fmt.Sprintf("%s: unexpected error: %s", desc, err))
-			var receivedLabel []prometheus.Label
-			var receivedDatapoint prometheus.Datapoint
-			for _, value := range res {
-				if c.expected.Labels[0] == value.Labels[0] {
-					receivedLabel = value.Labels
-					receivedDatapoint = value.Datapoint
-				}
-			}
-			assert.True(t, reflect.DeepEqual(c.expected.Labels, receivedLabel), fmt.Sprintf("%s: expected %v got %v", desc, c.expected.Labels, receivedLabel))
-			assert.Equal(t, c.expected.Datapoint.Value, receivedDatapoint.Value, fmt.Sprintf("%s: expected value %f got %f", desc, c.expected.Datapoint.Value, receivedDatapoint.Value))
-		})
-	}
-
-}
-
-func TestASNConversion(t *testing.T) {
-	var logger = zap.NewNop()
-	pktvisor.Register(logger)
-
-	ownerID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	policyID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	agentID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	var agent = &pb.AgentInfoRes{
-		OwnerID:   ownerID.String(),
-		AgentName: "agent-test",
-	}
-
-	data := fleet.AgentMetricsRPCPayload{
-		PolicyID:   policyID.String(),
-		PolicyName: "policy-test",
-		Datasets:   nil,
-		Format:     "json",
-		BEVersion:  "1.0",
-	}
-
-	be := backend.GetBackend("pktvisor")
-
-	cases := map[string]struct {
-		data     []byte
-		expected prometheus.TimeSeries
-	}{
-		"PacketPayloadTopASN": {
-			data: []byte(`
-{
-    "policy_packets": {
-        "packets": {
-            "top_ASN": [
-                {
-                    "estimate": 996,
-                    "name": "36236/NETACTUATE"
-                }
-            ]
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "packets_top_ASN",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_packets",
-					},
-					{
-						Name:  "asn",
-						Value: "36236/NETACTUATE",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 996,
-				},
-			},
-		},
-	}
-
-	for desc, c := range cases {
-		t.Run(desc, func(t *testing.T) {
-			data.Data = c.data
-			res, err := be.ProcessMetrics(agent, agentID.String(), data)
-			require.Nil(t, err, fmt.Sprintf("%s: unexpected error: %s", desc, err))
-			var receivedLabel []prometheus.Label
-			var receivedDatapoint prometheus.Datapoint
-			for _, value := range res {
-				if c.expected.Labels[0] == value.Labels[0] {
-					receivedLabel = value.Labels
-					receivedDatapoint = value.Datapoint
-				}
-			}
-			assert.True(t, reflect.DeepEqual(c.expected.Labels, receivedLabel), fmt.Sprintf("%s: expected %v got %v", desc, c.expected.Labels, receivedLabel))
-			assert.Equal(t, c.expected.Datapoint.Value, receivedDatapoint.Value, fmt.Sprintf("%s: expected value %f got %f", desc, c.expected.Datapoint.Value, receivedDatapoint.Value))
-		})
-	}
-
-}
-
-func TestGeoLocConversion(t *testing.T) {
-	var logger = zap.NewNop()
-	pktvisor.Register(logger)
-
-	ownerID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	policyID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	agentID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	var agent = &pb.AgentInfoRes{
-		OwnerID:   ownerID.String(),
-		AgentName: "agent-test",
-	}
-
-	data := fleet.AgentMetricsRPCPayload{
-		PolicyID:   policyID.String(),
-		PolicyName: "policy-test",
-		Datasets:   nil,
-		Format:     "json",
-		BEVersion:  "1.0",
-	}
-
-	be := backend.GetBackend("pktvisor")
-
-	cases := map[string]struct {
-		data     []byte
-		expected prometheus.TimeSeries
-	}{
-		"PacketPayloadTopGeoLoc": {
-			data: []byte(`
-{
-    "policy_packets": {
-        "packets": {
-            "top_geoLoc": [
-                {
-                    "estimate": 996,
-                    "name": "AS/Hong Kong/HCW/Central"
-                }
-            ]
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "packets_top_geoLoc",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_packets",
-					},
-					{
-						Name:  "geo_loc",
-						Value: "AS/Hong Kong/HCW/Central",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 996,
-				},
-			},
-		},
-	}
-
-	for desc, c := range cases {
-		t.Run(desc, func(t *testing.T) {
-			data.Data = c.data
-			res, err := be.ProcessMetrics(agent, agentID.String(), data)
-			require.Nil(t, err, fmt.Sprintf("%s: unexpected error: %s", desc, err))
-			var receivedLabel []prometheus.Label
-			var receivedDatapoint prometheus.Datapoint
-			for _, value := range res {
-				if c.expected.Labels[0] == value.Labels[0] {
-					receivedLabel = value.Labels
-					receivedDatapoint = value.Datapoint
-				}
-			}
-			assert.True(t, reflect.DeepEqual(c.expected.Labels, receivedLabel), fmt.Sprintf("%s: expected %v got %v", desc, c.expected.Labels, receivedLabel))
-			assert.Equal(t, c.expected.Datapoint.Value, receivedDatapoint.Value, fmt.Sprintf("%s: expected value %f got %f", desc, c.expected.Datapoint.Value, receivedDatapoint.Value))
-		})
-	}
-
-}
-
-func TestPCAPConversion(t *testing.T) {
-	var logger = zap.NewNop()
-	pktvisor.Register(logger)
-
-	ownerID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	policyID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	agentID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	var agent = &pb.AgentInfoRes{
-		OwnerID:   ownerID.String(),
-		AgentName: "agent-test",
-	}
-
-	data := fleet.AgentMetricsRPCPayload{
-		PolicyID:   policyID.String(),
-		PolicyName: "policy-test",
-		Datasets:   nil,
-		Format:     "json",
-		BEVersion:  "1.0",
-	}
-
-	be := backend.GetBackend("pktvisor")
-
-	commonLabels := []prometheus.Label{
-		{
-			Name:  "instance",
-			Value: "agent-test",
-		},
-		{
-			Name:  "job",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "agent_id",
-			Value: agentID.String(),
-		},
-		{
-			Name:  "agent",
-			Value: "agent-test",
-		},
-		{
-			Name:  "policy_id",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "policy",
-			Value: "policy-test",
-		},
-		{
-			Name:  "handler",
-			Value: "policy_pcap",
-		},
-	}
-
-	cases := map[string]struct {
-		data     []byte
-		expected prometheus.TimeSeries
-	}{
-		"PCAPPayload_Tcp_Reassembly_Errors": {
-			data: []byte(`
-{
-	"policy_pcap": {
-        "pcap": {
-            "tcp_reassembly_errors": 2
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "pcap_tcp_reassembly_errors",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 2,
-				},
-			},
-		},
-		"PCAPPayload_if_drops": {
-			data: []byte(`
-{
-	"policy_pcap": {
-		"pcap": {
-			"if_drops": 2
-    	}
-	}
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "pcap_if_drops",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 2,
-				},
-			},
-		},
-		"PCAPPayload_os_drops": {
-			data: []byte(`
-{
-	"policy_pcap": {
-		"pcap": {
-			"os_drops": 2
-    	}
-	}
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "pcap_os_drops",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 2,
-				},
-			},
-		},
-	}
-
-	for desc, c := range cases {
-		t.Run(desc, func(t *testing.T) {
-			data.Data = c.data
-			res, err := be.ProcessMetrics(agent, agentID.String(), data)
-			require.Nil(t, err, fmt.Sprintf("%s: unexpected error: %s", desc, err))
-			var receivedLabel []prometheus.Label
-			var receivedDatapoint prometheus.Datapoint
-			for _, value := range res {
-				if c.expected.Labels[0] == value.Labels[0] {
-					receivedLabel = value.Labels
-					receivedDatapoint = value.Datapoint
-				}
-			}
-			assert.True(t, reflect.DeepEqual(c.expected.Labels, receivedLabel), fmt.Sprintf("%s: expected %v got %v", desc, c.expected.Labels, receivedLabel))
-			assert.Equal(t, c.expected.Datapoint.Value, receivedDatapoint.Value, fmt.Sprintf("%s: expected value %f got %f", desc, c.expected.Datapoint.Value, receivedDatapoint.Value))
-		})
-	}
-
-}
-
-func TestDNSConversion(t *testing.T) {
-	var logger = zap.NewNop()
-	pktvisor.Register(logger)
-
-	ownerID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	policyID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	agentID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	var agent = &pb.AgentInfoRes{
-		OwnerID:   ownerID.String(),
-		AgentName: "agent-test",
-	}
-
-	data := fleet.AgentMetricsRPCPayload{
-		PolicyID:   policyID.String(),
-		PolicyName: "policy-test",
-		Datasets:   nil,
-		Format:     "json",
-		BEVersion:  "1.0",
-	}
-
-	be := backend.GetBackend("pktvisor")
-
-	commonLabels := []prometheus.Label{
-		{
-			Name:  "instance",
-			Value: "agent-test",
-		},
-		{
-			Name:  "job",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "agent_id",
-			Value: agentID.String(),
-		},
-		{
-			Name:  "agent",
-			Value: "agent-test",
-		},
-		{
-			Name:  "policy_id",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "policy",
-			Value: "policy-test",
-		},
-		{
-			Name:  "handler",
-			Value: "policy_dns",
-		},
-	}
-
-	cases := map[string]struct {
-		data     []byte
-		expected prometheus.TimeSeries
-	}{
-		"DNSPayloadCardinalityTotal": {
-			data: []byte(`
-{
-	"policy_dns": {
-		"dns": {
-        	"cardinality": {
-				"qname": 4
-        	}
-    	}
-	}
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_cardinality_qname",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 4,
-				},
-			},
-		},
-		"DNSPayloadTopNxdomain": {
-			data: []byte(`
-{
-	"policy_dns": {
-		"dns": {
-        	"top_nxdomain": [
-				{
-	          		"estimate": 186,
-         			"name": "89.187.189.231"				
-        		}
-			]
-    	}
-	}
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_top_nxdomain",
-				}), prometheus.Label{
-					Name:  "qname",
-					Value: "89.187.189.231",
-				}),
-				Datapoint: prometheus.Datapoint{
-					Value: 186,
-				},
-			},
-		},
-		"DNSPayloadTopRefused": {
-			data: []byte(`
-{
-	"policy_dns": {
-		"dns": {
-        	"top_refused": [
-				{
-	          		"estimate": 186,
-         			"name": "89.187.189.231"				
-        		}
-			]
-    	}
-	}
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_top_refused",
-				}), prometheus.Label{
-					Name:  "qname",
-					Value: "89.187.189.231",
-				}),
-				Datapoint: prometheus.Datapoint{
-					Value: 186,
-				},
-			},
-		},
-		"DNSPayloadTopSrvfail": {
-			data: []byte(`
-{
-	"policy_dns": {
-		"dns": {
-        	"top_srvfail": [
-				{
-	          		"estimate": 186,
-         			"name": "89.187.189.231"				
-        		}
-			]
-    	}
-	}
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_top_srvfail",
-				}), prometheus.Label{
-					Name:  "qname",
-					Value: "89.187.189.231",
-				}),
-				Datapoint: prometheus.Datapoint{
-					Value: 186,
-				},
-			},
-		},
-		"DNSPayloadTopNodata": {
-			data: []byte(`
-{
-	"policy_dns": {
-		"dns": {
-        	"top_nodata": [
-				{
-	          		"estimate": 186,
-         			"name": "89.187.189.231"				
-        		}
-			]
-    	}
-	}
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_top_nodata",
-				}), prometheus.Label{
-					Name:  "qname",
-					Value: "89.187.189.231",
-				}),
-				Datapoint: prometheus.Datapoint{
-					Value: 186,
-				},
-			},
-		},
-	}
-
-	for desc, c := range cases {
-		t.Run(desc, func(t *testing.T) {
-			data.Data = c.data
-			res, err := be.ProcessMetrics(agent, agentID.String(), data)
-			require.Nil(t, err, fmt.Sprintf("%s: unexpected error: %s", desc, err))
-			var receivedLabel []prometheus.Label
-			var receivedDatapoint prometheus.Datapoint
-			for _, value := range res {
-				if c.expected.Labels[0] == value.Labels[0] {
-					if len(c.expected.Labels) < 7 {
-						receivedLabel = value.Labels
-						receivedDatapoint = value.Datapoint
-					} else {
-						if c.expected.Labels[6].Value == value.Labels[6].Value {
-							receivedLabel = value.Labels
-							receivedDatapoint = value.Datapoint
-						}
-					}
-				}
-			}
-			assert.True(t, reflect.DeepEqual(c.expected.Labels, receivedLabel), fmt.Sprintf("%s: expected %v got %v", desc, c.expected.Labels, receivedLabel))
-			assert.Equal(t, c.expected.Datapoint.Value, receivedDatapoint.Value, fmt.Sprintf("%s: expected value %f got %f", desc, c.expected.Datapoint.Value, receivedDatapoint.Value))
-		})
-	}
-
-}
-
-func TestDNSRatesConversion(t *testing.T) {
-	var logger = zap.NewNop()
-	pktvisor.Register(logger)
-
-	ownerID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	policyID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	agentID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	var agent = &pb.AgentInfoRes{
-		OwnerID:   ownerID.String(),
-		AgentName: "agent-test",
-	}
-
-	data := fleet.AgentMetricsRPCPayload{
-		PolicyID:   policyID.String(),
-		PolicyName: "policy-test",
-		Datasets:   nil,
-		Format:     "json",
-		BEVersion:  "1.0",
-	}
-
-	be := backend.GetBackend("pktvisor")
-
-	commonLabels := []prometheus.Label{
-		{
-			Name:  "instance",
-			Value: "agent-test",
-		},
-		{
-			Name:  "job",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "agent_id",
-			Value: agentID.String(),
-		},
-		{
-			Name:  "agent",
-			Value: "agent-test",
-		},
-		{
-			Name:  "policy_id",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "policy",
-			Value: "policy-test",
-		},
-		{
-			Name:  "handler",
-			Value: "policy_dns",
-		},
-		{
-			Name:  "quantile",
-			Value: "0.5",
-		},
-		{
-			Name:  "instance",
-			Value: "agent-test",
-		},
-		{
-			Name:  "job",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "agent_id",
-			Value: agentID.String(),
-		},
-		{
-			Name:  "agent",
-			Value: "agent-test",
-		},
-		{
-			Name:  "policy_id",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "policy",
-			Value: "policy-test",
-		},
-		{
-			Name:  "handler",
-			Value: "policy_dns",
-		},
-		{
-			Name:  "quantile",
-			Value: "0.9",
-		},
-		{
-			Name:  "instance",
-			Value: "agent-test",
-		},
-		{
-			Name:  "job",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "agent_id",
-			Value: agentID.String(),
-		},
-		{
-			Name:  "agent",
-			Value: "agent-test",
-		},
-		{
-			Name:  "policy_id",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "policy",
-			Value: "policy-test",
-		},
-		{
-			Name:  "handler",
-			Value: "policy_dns",
-		},
-		{
-			Name:  "quantile",
-			Value: "0.95",
-		},
-		{
-			Name:  "instance",
-			Value: "agent-test",
-		},
-		{
-			Name:  "job",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "agent_id",
-			Value: agentID.String(),
-		},
-		{
-			Name:  "agent",
-			Value: "agent-test",
-		},
-		{
-			Name:  "policy_id",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "policy",
-			Value: "policy-test",
-		},
-		{
-			Name:  "handler",
-			Value: "policy_dns",
-		},
-		{
-			Name:  "quantile",
-			Value: "0.99",
-		},
-	}
-
-	cases := map[string]struct {
-		data               []byte
-		expectedLabels     []prometheus.Label
-		expectedDatapoints []float64
-	}{
-		"DNSPayloadRatesTotal": {
-			data: []byte(`
-{
-	"policy_dns": {
-		"dns": {
-        	"rates": {
-				"total": {
-					"p50": 0,
-          			"p90": 1,
-          			"p95": 2,
-          			"p99": 6
-				}
-        	}
-    	}
-	}
-}`),
-			expectedLabels: labelQuantiles(commonLabels, prometheus.Label{
-				Name:  "__name__",
-				Value: "dns_rates_total",
-			}),
-			expectedDatapoints: []float64{0, 1, 2, 6},
-		},
-	}
-
-	for desc, c := range cases {
-		t.Run(desc, func(t *testing.T) {
-			data.Data = c.data
-			res, err := be.ProcessMetrics(agent, agentID.String(), data)
-			require.Nil(t, err, fmt.Sprintf("%s: unexpected error: %s", desc, err))
-			var receivedLabel []prometheus.Label
-			var receivedDatapoint []float64
-
-			for _, value := range res {
-				if c.expectedLabels[0] == value.Labels[0] {
-					for _, labels := range value.Labels {
-						receivedLabel = append(receivedLabel, labels)
-					}
-					receivedDatapoint = append(receivedDatapoint, value.Datapoint.Value)
-				}
-			}
-
-			assert.ElementsMatch(t, c.expectedLabels, receivedLabel, fmt.Sprintf("%s: expected %v got %v", desc, c.expectedLabels, receivedLabel))
-			assert.ElementsMatch(t, c.expectedDatapoints, receivedDatapoint, fmt.Sprintf("%s: expected %v got %v", desc, c.expectedDatapoints, receivedDatapoint))
-		})
-	}
-
-}
-
-func TestDHCPRatesConversion(t *testing.T) {
-	var logger = zap.NewNop()
-	pktvisor.Register(logger)
-
-	ownerID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	policyID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	agentID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	var agent = &pb.AgentInfoRes{
-		OwnerID:   ownerID.String(),
-		AgentName: "agent-test",
-	}
-
-	data := fleet.AgentMetricsRPCPayload{
-		PolicyID:   policyID.String(),
-		PolicyName: "policy-test",
-		Datasets:   nil,
-		Format:     "json",
-		BEVersion:  "1.0",
-	}
-
-	be := backend.GetBackend("pktvisor")
-
-	commonLabels := []prometheus.Label{
-		{
-			Name:  "instance",
-			Value: "agent-test",
-		},
-		{
-			Name:  "job",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "agent_id",
-			Value: agentID.String(),
-		},
-		{
-			Name:  "agent",
-			Value: "agent-test",
-		},
-		{
-			Name:  "policy_id",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "policy",
-			Value: "policy-test",
-		},
-		{
-			Name:  "handler",
-			Value: "policy_dhcp",
-		},
-		{
-			Name:  "quantile",
-			Value: "0.5",
-		},
-		{
-			Name:  "instance",
-			Value: "agent-test",
-		},
-		{
-			Name:  "job",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "agent_id",
-			Value: agentID.String(),
-		},
-		{
-			Name:  "agent",
-			Value: "agent-test",
-		},
-		{
-			Name:  "policy_id",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "policy",
-			Value: "policy-test",
-		},
-		{
-			Name:  "handler",
-			Value: "policy_dhcp",
-		},
-		{
-			Name:  "quantile",
-			Value: "0.9",
-		},
-		{
-			Name:  "instance",
-			Value: "agent-test",
-		},
-		{
-			Name:  "job",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "agent_id",
-			Value: agentID.String(),
-		},
-		{
-			Name:  "agent",
-			Value: "agent-test",
-		},
-		{
-			Name:  "policy_id",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "policy",
-			Value: "policy-test",
-		},
-		{
-			Name:  "handler",
-			Value: "policy_dhcp",
-		},
-		{
-			Name:  "quantile",
-			Value: "0.95",
-		},
-		{
-			Name:  "instance",
-			Value: "agent-test",
-		},
-		{
-			Name:  "job",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "agent_id",
-			Value: agentID.String(),
-		},
-		{
-			Name:  "agent",
-			Value: "agent-test",
-		},
-		{
-			Name:  "policy_id",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "policy",
-			Value: "policy-test",
-		},
-		{
-			Name:  "handler",
-			Value: "policy_dhcp",
-		},
-		{
-			Name:  "quantile",
-			Value: "0.99",
-		},
-	}
-
-	cases := map[string]struct {
-		data               []byte
-		expectedLabels     []prometheus.Label
-		expectedDatapoints []float64
-	}{
-		"DHCPPayloadRates": {
-			data: []byte(`
-{
-	"policy_dhcp": {
-		"dhcp": {
-        	"rates": {
-				"total": {
-					"p50": 0,
-    	      		"p90": 1,
-        			"p95": 2,
-        			"p99": 6
-        		}
-			}
-    	}
-	}
-}`),
-			expectedLabels: labelQuantiles(commonLabels, prometheus.Label{
-				Name:  "__name__",
-				Value: "dhcp_rates_total",
-			}),
-			expectedDatapoints: []float64{0, 1, 2, 6},
-		},
-	}
-
-	for desc, c := range cases {
-		t.Run(desc, func(t *testing.T) {
-			data.Data = c.data
-			res, err := be.ProcessMetrics(agent, agentID.String(), data)
-			require.Nil(t, err, fmt.Sprintf("%s: unexpected error: %s", desc, err))
-			var receivedLabel []prometheus.Label
-			var receivedDatapoint []float64
-
-			for _, value := range res {
-				if c.expectedLabels[0] == value.Labels[0] {
-					for _, labels := range value.Labels {
-						receivedLabel = append(receivedLabel, labels)
-					}
-					receivedDatapoint = append(receivedDatapoint, value.Datapoint.Value)
-				}
-			}
-
-			assert.ElementsMatch(t, c.expectedLabels, receivedLabel, fmt.Sprintf("%s: expected %v got %v", desc, c.expectedLabels, receivedLabel))
-			assert.ElementsMatch(t, c.expectedDatapoints, receivedDatapoint, fmt.Sprintf("%s: expected %v got %v", desc, c.expectedDatapoints, receivedDatapoint))
-		})
-	}
-
-}
-
-func TestPacketsRatesConversion(t *testing.T) {
-	var logger = zap.NewNop()
-	pktvisor.Register(logger)
-
-	ownerID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	policyID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	agentID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	var agent = &pb.AgentInfoRes{
-		OwnerID:   ownerID.String(),
-		AgentName: "agent-test",
-	}
-
-	data := fleet.AgentMetricsRPCPayload{
-		PolicyID:   policyID.String(),
-		PolicyName: "policy-test",
-		Datasets:   nil,
-		Format:     "json",
-		BEVersion:  "1.0",
-	}
-
-	be := backend.GetBackend("pktvisor")
-
-	commonLabels := []prometheus.Label{
-		{
-			Name:  "instance",
-			Value: "agent-test",
-		},
-		{
-			Name:  "job",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "agent_id",
-			Value: agentID.String(),
-		},
-		{
-			Name:  "agent",
-			Value: "agent-test",
-		},
-		{
-			Name:  "policy_id",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "policy",
-			Value: "policy-test",
-		},
-		{
-			Name:  "handler",
-			Value: "policy_dns",
-		},
-		{
-			Name:  "quantile",
-			Value: "0.5",
-		},
-		{
-			Name:  "instance",
-			Value: "agent-test",
-		},
-		{
-			Name:  "job",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "agent_id",
-			Value: agentID.String(),
-		},
-		{
-			Name:  "agent",
-			Value: "agent-test",
-		},
-		{
-			Name:  "policy_id",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "policy",
-			Value: "policy-test",
-		},
-		{
-			Name:  "handler",
-			Value: "policy_dns",
-		},
-		{
-			Name:  "quantile",
-			Value: "0.9",
-		},
-		{
-			Name:  "instance",
-			Value: "agent-test",
-		},
-		{
-			Name:  "job",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "agent_id",
-			Value: agentID.String(),
-		},
-		{
-			Name:  "agent",
-			Value: "agent-test",
-		},
-		{
-			Name:  "policy_id",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "policy",
-			Value: "policy-test",
-		},
-		{
-			Name:  "handler",
-			Value: "policy_dns",
-		},
-		{
-			Name:  "quantile",
-			Value: "0.95",
-		},
-		{
-			Name:  "instance",
-			Value: "agent-test",
-		},
-		{
-			Name:  "job",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "agent_id",
-			Value: agentID.String(),
-		},
-		{
-			Name:  "agent",
-			Value: "agent-test",
-		},
-		{
-			Name:  "policy_id",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "policy",
-			Value: "policy-test",
-		},
-		{
-			Name:  "handler",
-			Value: "policy_dns",
-		},
-		{
-			Name:  "quantile",
-			Value: "0.99",
-		},
-	}
-
-	cases := map[string]struct {
-		data               []byte
-		expectedLabels     []prometheus.Label
-		expectedDatapoints []float64
-	}{
-		"PacketsPayloadRatesPpsIn": {
-			data: []byte(`
-{
-	"policy_dns": {
-		"packets": {
-        	"rates": {
-				"pps_in": {
-					"p50": 0,
-          			"p90": 1,
-        			"p95": 2,
-        			"p99": 6
-				}
-        	}
-    	}
-	}
-}`),
-			expectedLabels: labelQuantiles(commonLabels, prometheus.Label{
-				Name:  "__name__",
-				Value: "packets_rates_pps_in",
-			}),
-			expectedDatapoints: []float64{0, 1, 2, 6},
-		},
-		"PacketsPayloadRatesPpsTotal": {
-			data: []byte(`
-{
-	"policy_dns": {
-		"packets": {
-        	"rates": {
-				"pps_total": {
-					"p50": 0,
-          			"p90": 1,
-        			"p95": 2,
-        			"p99": 6
-				}
-        	}
-    	}
-	}
-}`),
-			expectedLabels: labelQuantiles(commonLabels, prometheus.Label{
-				Name:  "__name__",
-				Value: "packets_rates_pps_total",
-			}),
-			expectedDatapoints: []float64{0, 1, 2, 6},
-		},
-		"PacketsPayloadRatesPpsOut": {
-			data: []byte(`
-{
-	"policy_dns": {
-		"packets": {
-        	"rates": {
-				"pps_out": {
-					"p50": 0,
-          			"p90": 1,
-        			"p95": 2,
-        			"p99": 6
-				}
-        	}
-    	}
-	}
-}`),
-			expectedLabels: labelQuantiles(commonLabels, prometheus.Label{
-				Name:  "__name__",
-				Value: "packets_rates_pps_out",
-			}),
-			expectedDatapoints: []float64{0, 1, 2, 6},
-		},
-	}
-
-	for desc, c := range cases {
-		t.Run(desc, func(t *testing.T) {
-			data.Data = c.data
-			res, err := be.ProcessMetrics(agent, agentID.String(), data)
-			require.Nil(t, err, fmt.Sprintf("%s: unexpected error: %s", desc, err))
-			var receivedLabel []prometheus.Label
-			var receivedDatapoint []float64
-
-			for _, value := range res {
-				if c.expectedLabels[0] == value.Labels[0] {
-					for _, labels := range value.Labels {
-						receivedLabel = append(receivedLabel, labels)
-					}
-					receivedDatapoint = append(receivedDatapoint, value.Datapoint.Value)
-				}
-			}
-
-			assert.ElementsMatch(t, c.expectedLabels, receivedLabel, fmt.Sprintf("%s: expected %v got %v", desc, c.expectedLabels, receivedLabel))
-			assert.ElementsMatch(t, c.expectedDatapoints, receivedDatapoint, fmt.Sprintf("%s: expected %v got %v", desc, c.expectedDatapoints, receivedDatapoint))
-		})
-	}
-
-}
-
-func TestDNSTopKMetricsConversion(t *testing.T) {
-	var logger = zap.NewNop()
-	pktvisor.Register(logger)
-
-	ownerID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	policyID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	agentID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	var agent = &pb.AgentInfoRes{
-		OwnerID:   ownerID.String(),
-		AgentName: "agent-test",
-	}
-
-	data := fleet.AgentMetricsRPCPayload{
-		PolicyID:   policyID.String(),
-		PolicyName: "policy-test",
-		Datasets:   nil,
-		Format:     "json",
-		BEVersion:  "1.0",
-	}
-
-	be := backend.GetBackend("pktvisor")
-
-	cases := map[string]struct {
-		data     []byte
-		expected prometheus.TimeSeries
-	}{
-		"PacketPayloadToqQName2": {
-			data: []byte(`
-{
-    "policy_dns": {
-		"dns": {
-        	"top_qname2": [
-				{
-          	  	  "estimate": 8,
-          	  	  "name": ".google.com"
-        		}
-			]
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "dns_top_qname2",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_dns",
-					},
-					{
-						Name:  "qname",
-						Value: ".google.com",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"PacketPayloadToqQName3": {
-			data: []byte(`
-{
-    "policy_dns": {
-		"dns": {
-        	"top_qname3": [
-				{
-          	  	  "estimate": 6,
-          	  	  "name": ".l.google.com"
-        		}
-			]
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "dns_top_qname3",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_dns",
-					},
-					{
-						Name:  "qname",
-						Value: ".l.google.com",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 6,
-				},
-			},
-		},
-		"PacketPayloadTopQueryECS": {
-			data: []byte(`
-{
-    "policy_dns": {
-		"dns": {
-        	"top_query_ecs": [
-				{
-          	  	  "estimate": 6,
-          	  	  "name": "2001:470:1f0b:1600::"
-        		}
-			]
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "dns_top_query_ecs",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_dns",
-					},
-					{
-						Name:  "ecs",
-						Value: "2001:470:1f0b:1600::",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 6,
-				},
-			},
-		},
-		"PacketPayloadToqQType": {
-			data: []byte(`
-{
-    "policy_dns": {
-		"dns": {
-        	"top_qtype": [
-				{
-          	  	  "estimate": 6,
-          	  	  "name": "HTTPS"
-        		}
-			]
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "dns_top_qtype",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_dns",
-					},
-					{
-						Name:  "qtype",
-						Value: "HTTPS",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 6,
-				},
-			},
-		},
-		"PacketPayloadTopUDPPorts": {
-			data: []byte(`
-{
-    "policy_dns": {
-		"dns": {
-      		"top_udp_ports": [
-			  {
-				"estimate": 2,
-          		"name": "39783"
-			  }
-			]
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "dns_top_udp_ports",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_dns",
-					},
-					{
-						Name:  "port",
-						Value: "39783",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 2,
-				},
-			},
-		},
-		"PacketPayloadTopRCode": {
-			data: []byte(`
-{
-    "policy_dns": {
-		"dns": {
-        	"top_rcode": [
-				{
-          	  	  "estimate": 8,
-          	  	  "name": "NOERROR"
-        		}
-			]
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "dns_top_rcode",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_dns",
-					},
-					{
-						Name:  "rcode",
-						Value: "NOERROR",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-	}
-
-	for desc, c := range cases {
-		t.Run(desc, func(t *testing.T) {
-			data.Data = c.data
-			res, err := be.ProcessMetrics(agent, agentID.String(), data)
-			require.Nil(t, err, fmt.Sprintf("%s: unexpected error: %s", desc, err))
-			var receivedLabel []prometheus.Label
-			var receivedDatapoint prometheus.Datapoint
-			for _, value := range res {
-				if c.expected.Labels[0] == value.Labels[0] {
-					receivedLabel = value.Labels
-					receivedDatapoint = value.Datapoint
-				}
-			}
-			assert.True(t, reflect.DeepEqual(c.expected.Labels, receivedLabel), fmt.Sprintf("%s: expected %v got %v", desc, c.expected.Labels, receivedLabel))
-			assert.Equal(t, c.expected.Datapoint.Value, receivedDatapoint.Value, fmt.Sprintf("%s: expected value %f got %f", desc, c.expected.Datapoint.Value, receivedDatapoint.Value))
-		})
-	}
-
-}
-
-func TestDNSWirePacketsConversion(t *testing.T) {
-	var logger = zap.NewNop()
-	pktvisor.Register(logger)
-
-	ownerID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	policyID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	agentID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	var agent = &pb.AgentInfoRes{
-		OwnerID:   ownerID.String(),
-		AgentName: "agent-test",
-	}
-
-	data := fleet.AgentMetricsRPCPayload{
-		PolicyID:   policyID.String(),
-		PolicyName: "policy-test",
-		Datasets:   nil,
-		Format:     "json",
-		BEVersion:  "1.0",
-	}
-
-	be := backend.GetBackend("pktvisor")
-
-	commonLabels := []prometheus.Label{
-		{
-			Name:  "instance",
-			Value: "agent-test",
-		},
-		{
-			Name:  "job",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "agent_id",
-			Value: agentID.String(),
-		},
-		{
-			Name:  "agent",
-			Value: "agent-test",
-		},
-		{
-			Name:  "policy_id",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "policy",
-			Value: "policy-test",
-		},
-		{
-			Name:  "handler",
-			Value: "policy_dns",
-		},
-	}
-
-	cases := map[string]struct {
-		data     []byte
-		expected prometheus.TimeSeries
-	}{
-		"DNSPayloadWirePacketsIpv4": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "dns": {
-            "wire_packets": {
-				"ipv4": 1
-			}
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_wire_packets_ipv4",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 1,
-				},
-			},
-		},
-		"DNSPayloadWirePacketsIpv6": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "dns": {
-            "wire_packets": {
-				"ipv6": 14
-			}
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_wire_packets_ipv6",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 14,
-				},
-			},
-		},
-		"DNSPayloadWirePacketsNodata": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "dns": {
-            "wire_packets": {
-				"nodata": 8
-			}
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_wire_packets_nodata",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"DNSPayloadWirePacketsNoerror": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "dns": {
-            "wire_packets": {
-				"noerror": 8
-			}
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_wire_packets_noerror",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"DNSPayloadWirePacketsNxdomain": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "dns": {
-            "wire_packets": {
-				"nxdomain": 6
-			}
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_wire_packets_nxdomain",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 6,
-				},
-			},
-		},
-		"DNSPayloadWirePacketsQueries": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "dns": {
-            "wire_packets": {
-				"queries": 7
-			}
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_wire_packets_queries",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 7,
-				},
-			},
-		},
-		"DNSPayloadWirePacketsRefused": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "dns": {
-            "wire_packets": {
-				"refused": 8
-			}
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_wire_packets_refused",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"DNSPayloadWirePacketsFiltered": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "dns": {
-            "wire_packets": {
-				"filtered": 8
-			}
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_wire_packets_filtered",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"DNSPayloadWirePacketsReplies": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "dns": {
-            "wire_packets": {
-				"replies": 8
-			}
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_wire_packets_replies",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"DNSPayloadWirePacketsSrvfail": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "dns": {
-            "wire_packets": {
-				"srvfail": 9
-			}
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_wire_packets_srvfail",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 9,
-				},
-			},
-		},
-		"DNSPayloadWirePacketsTcp": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "dns": {
-            "wire_packets": {
-				"tcp": 9
-			}
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_wire_packets_tcp",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 9,
-				},
-			},
-		},
-		"DNSPayloadWirePacketsTotal": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "dns": {
-            "wire_packets": {
-				"total": 9
-			}
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_wire_packets_total",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 9,
-				},
-			},
-		},
-		"DNSPayloadWirePacketsUdp": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "dns": {
-            "wire_packets": {
-				"udp": 9
-			}
-        }
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_wire_packets_udp",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 9,
-				},
-			},
-		},
-	}
-
-	for desc, c := range cases {
-		t.Run(desc, func(t *testing.T) {
-			data.Data = c.data
-			res, err := be.ProcessMetrics(agent, agentID.String(), data)
-			require.Nil(t, err, fmt.Sprintf("%s: unexpected error: %s", desc, err))
-			var receivedLabel []prometheus.Label
-			var receivedDatapoint prometheus.Datapoint
-			for _, value := range res {
-				if c.expected.Labels[0] == value.Labels[0] {
-					receivedLabel = value.Labels
-					receivedDatapoint = value.Datapoint
-				}
-			}
-			assert.True(t, reflect.DeepEqual(c.expected.Labels, receivedLabel), fmt.Sprintf("%s: expected %v got %v", desc, c.expected.Labels, receivedLabel))
-			assert.Equal(t, c.expected.Datapoint.Value, receivedDatapoint.Value, fmt.Sprintf("%s: expected value %f got %f", desc, c.expected.Datapoint.Value, receivedDatapoint.Value))
-		})
-	}
-
-}
-
-func TestDNSXactConversion(t *testing.T) {
-	var logger = zap.NewNop()
-	pktvisor.Register(logger)
-
-	ownerID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	policyID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	agentID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	var agent = &pb.AgentInfoRes{
-		OwnerID:   ownerID.String(),
-		AgentName: "agent-test",
-	}
-
-	data := fleet.AgentMetricsRPCPayload{
-		PolicyID:   policyID.String(),
-		PolicyName: "policy-test",
-		Datasets:   nil,
-		Format:     "json",
-		BEVersion:  "1.0",
-	}
-
-	be := backend.GetBackend("pktvisor")
-
-	commonLabels := []prometheus.Label{
-		{
-			Name:  "instance",
-			Value: "agent-test",
-		},
-		{
-			Name:  "job",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "agent_id",
-			Value: agentID.String(),
-		},
-		{
-			Name:  "agent",
-			Value: "agent-test",
-		},
-		{
-			Name:  "policy_id",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "policy",
-			Value: "policy-test",
-		},
-		{
-			Name:  "handler",
-			Value: "policy_dns",
-		},
-	}
-
-	cases := map[string]struct {
-		data     []byte
-		expected prometheus.TimeSeries
-	}{
-		"DNSPayloadXactCountsTimedOut": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "dns": {
-			"xact": {
-	            "counts": {
-					"timed_out": 1
-				}
-        	}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_xact_counts_timed_out",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 1,
-				},
-			},
-		},
-		"DNSPayloadXactCountsTotal": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "dns": {
-			"xact": {
-	            "counts": {
-					"total": 8
-				}
-        	}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_xact_counts_total",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"DNSPayloadXactInTotal": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "dns": {
-			"xact": {
-	            "in": {
-					"total": 8
-				}
-        	}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_xact_in_total",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"DNSPayloadXactInTopSlow": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "dns": {
-			"xact": {
-	            "in": {
-					"top_slow": [
-						{
-							"estimate": 111,
-							"name": "23.43.252.68"						
-						}
-					]
-				}
-        	}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_xact_in_top_slow",
-				}), prometheus.Label{
-					Name:  "qname",
-					Value: "23.43.252.68",
-				}),
-				Datapoint: prometheus.Datapoint{
-					Value: 111,
-				},
-			},
-		},
-		"DNSPayloadXactOutTopSlow": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "dns": {
-			"xact": {
-	            "out": {
-					"top_slow": [
-						{
-							"estimate": 111,
-							"name": "23.43.252.68"						
-						}
-					]
-				}
-        	}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_xact_out_top_slow",
-				}), prometheus.Label{
-					Name:  "qname",
-					Value: "23.43.252.68",
-				}),
-				Datapoint: prometheus.Datapoint{
-					Value: 111,
-				},
-			},
-		},
-		"DNSPayloadXactOutTotal": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "dns": {
-			"xact": {
-	            "out": {
-					"total": 8
-				}
-        	}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "dns_xact_out_total",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-	}
-
-	for desc, c := range cases {
-		t.Run(desc, func(t *testing.T) {
-			data.Data = c.data
-			res, err := be.ProcessMetrics(agent, agentID.String(), data)
-			require.Nil(t, err, fmt.Sprintf("%s: unexpected error: %s", desc, err))
-			var receivedLabel []prometheus.Label
-			var receivedDatapoint prometheus.Datapoint
-			for _, value := range res {
-				if c.expected.Labels[0] == value.Labels[0] {
-					receivedLabel = value.Labels
-					receivedDatapoint = value.Datapoint
-				}
-			}
-			assert.True(t, reflect.DeepEqual(c.expected.Labels, receivedLabel), fmt.Sprintf("%s: expected %v got %v", desc, c.expected.Labels, receivedLabel))
-			assert.Equal(t, c.expected.Datapoint.Value, receivedDatapoint.Value, fmt.Sprintf("%s: expected value %f got %f", desc, c.expected.Datapoint.Value, receivedDatapoint.Value))
-		})
-	}
-}
-
-func TestPacketsConversion(t *testing.T) {
-	var logger = zap.NewNop()
-	pktvisor.Register(logger)
-
-	ownerID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	policyID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	agentID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	var agent = &pb.AgentInfoRes{
-		OwnerID:   ownerID.String(),
-		AgentName: "agent-test",
-	}
-
-	data := fleet.AgentMetricsRPCPayload{
-		PolicyID:   policyID.String(),
-		PolicyName: "policy-test",
-		Datasets:   nil,
-		Format:     "json",
-		BEVersion:  "1.0",
-	}
-
-	be := backend.GetBackend("pktvisor")
-
-	commonLabels := []prometheus.Label{
-		{
-			Name:  "instance",
-			Value: "agent-test",
-		},
-		{
-			Name:  "job",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "agent_id",
-			Value: agentID.String(),
-		},
-		{
-			Name:  "agent",
-			Value: "agent-test",
-		},
-		{
-			Name:  "policy_id",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "policy",
-			Value: "policy-test",
-		},
-		{
-			Name:  "handler",
-			Value: "policy_dns",
-		},
-	}
-
-	cases := map[string]struct {
-		data     []byte
-		expected prometheus.TimeSeries
-	}{
-		"DNSPayloadPacketsCardinalityDst": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "packets": {
-			"cardinality": {
-	            "dst_ips_out": 41
-        	}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "packets_cardinality_dst_ips_out",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 41,
-				},
-			},
-		},
-		"DNSPayloadPacketsCardinalitySrc": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "packets": {
-			"cardinality": {
-	            "src_ips_in": 43
-        	}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "packets_cardinality_src_ips_in",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 43,
-				},
-			},
-		},
-		"DNSPayloadPacketsDeepSamples": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "packets": {
-			"deep_samples": 3139
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "packets_deep_samples",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 3139,
-				},
-			},
-		},
-		"DNSPayloadPacketsIn": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "packets": {
-			"in": 1422
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "packets_in",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 1422,
-				},
-			},
-		},
-		"DNSPayloadPacketsIpv4": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "packets": {
-			"ipv4": 2506
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "packets_ipv4",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 2506,
-				},
-			},
-		},
-		"DNSPayloadPacketsIpv6": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "packets": {
-			"ipv6": 2506
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "packets_ipv6",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 2506,
-				},
-			},
-		},
-		"DNSPayloadPacketsOtherL4": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "packets": {
-			"other_l4": 637
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "packets_other_l4",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 637,
-				},
-			},
-		},
-		"DNSPayloadPacketsFiltered": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "packets": {
-			"filtered": 637
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "packets_filtered",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 637,
-				},
-			},
-		},
-		"DNSPayloadPacketsOut": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "packets": {
-			"out": 1083
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "packets_out",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 1083,
-				},
-			},
-		},
-		"DNSPayloadPacketsTcp": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "packets": {
-			"tcp": 549
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "packets_tcp",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 549,
-				},
-			},
-		},
-		"DNSPayloadPacketsTotal": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "packets": {
-			"total": 3139
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "packets_total",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 3139,
-				},
-			},
-		},
-		"DNSPayloadPacketsUdp": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "packets": {
-			"udp": 1953
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "packets_udp",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 1953,
-				},
-			},
-		},
-		"DNSPayloadPacketsTopIpv4": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "packets": {
-			"top_ipv4": [
-				{
-					"estimate": 996,
-					"name": "103.6.85.201"					
-				}
-			]
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "packets_top_ipv4",
-				}), prometheus.Label{
-					Name:  "ipv4",
-					Value: "103.6.85.201",
-				}),
-				Datapoint: prometheus.Datapoint{
-					Value: 996,
-				},
-			},
-		},
-		"DNSPayloadPacketsTopIpv6": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "packets": {
-			"top_ipv6": [
-				{
-					"estimate": 996,
-					"name": "103.6.85.201"					
-				}
-			]
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "packets_top_ipv6",
-				}), prometheus.Label{
-					Name:  "ipv6",
-					Value: "103.6.85.201",
-				}),
-				Datapoint: prometheus.Datapoint{
-					Value: 996,
-				},
-			},
-		},
-	}
-
-	for desc, c := range cases {
-		t.Run(desc, func(t *testing.T) {
-			data.Data = c.data
-			res, err := be.ProcessMetrics(agent, agentID.String(), data)
-			require.Nil(t, err, fmt.Sprintf("%s: unexpected error: %s", desc, err))
-			var receivedLabel []prometheus.Label
-			var receivedDatapoint prometheus.Datapoint
-			for _, value := range res {
-				if c.expected.Labels[0] == value.Labels[0] {
-					receivedLabel = value.Labels
-					receivedDatapoint = value.Datapoint
-				}
-			}
-			assert.True(t, reflect.DeepEqual(c.expected.Labels, receivedLabel), fmt.Sprintf("%s: expected %v got %v", desc, c.expected.Labels, receivedLabel))
-			assert.Equal(t, c.expected.Datapoint.Value, receivedDatapoint.Value, fmt.Sprintf("%s: expected value %f got %f", desc, c.expected.Datapoint.Value, receivedDatapoint.Value))
-		})
-	}
-}
-
-func TestPeriodConversion(t *testing.T) {
-	var logger = zap.NewNop()
-	pktvisor.Register(logger)
-
-	ownerID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	policyID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	agentID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	var agent = &pb.AgentInfoRes{
-		OwnerID:   ownerID.String(),
-		AgentName: "agent-test",
-	}
-
-	data := fleet.AgentMetricsRPCPayload{
-		PolicyID:   policyID.String(),
-		PolicyName: "policy-test",
-		Datasets:   nil,
-		Format:     "json",
-		BEVersion:  "1.0",
-	}
-
-	be := backend.GetBackend("pktvisor")
-
-	cases := map[string]struct {
-		data            []byte
-		expectedLength  prometheus.TimeSeries
-		expectedStartTs prometheus.TimeSeries
-	}{
-		"DNSPayloadPeriod": {
-			data: []byte(`
-{
-	"policy_dns": {
-        "dns": {
-			"period": {
-		        "length": 60,
-        		"start_ts": 1624888107
-        	}
-		}
-    }
-}`),
-			expectedLength: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "dns_period_length",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_dns",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 60,
-				},
-			},
-			expectedStartTs: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "dns_period_start_ts",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_dns",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 1624888107,
-				},
-			},
-		},
-		"PacketsPayloadPeriod": {
-			data: []byte(`
-{
-	"policy_packets": {
-        "packets": {
-			"period": {
-		        "length": 60,
-        		"start_ts": 1624888107
-        	}
-		}
-    }
-}`),
-			expectedLength: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "packets_period_length",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_packets",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 60,
-				},
-			},
-			expectedStartTs: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "packets_period_start_ts",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_packets",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 1624888107,
-				},
-			},
-		},
-		"DHCPPayloadPeriod": {
-			data: []byte(`
-{
-	"policy_dhcp": {
-        "dhcp": {
-			"period": {
-		        "length": 60,
-        		"start_ts": 1624888107
-        	}
-		}
-    }
-}`),
-			expectedLength: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "dhcp_period_length",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_dhcp",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 60,
-				},
-			},
-			expectedStartTs: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "dhcp_period_start_ts",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_dhcp",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 1624888107,
-				},
-			},
-		},
-		"FlowPayloadPeriod": {
-			data: []byte(`
-{
-	"policy_flow": {
-        "flow": {
-			"period": {
-		        "length": 60,
-        		"start_ts": 1624888107
-        	}
-		}
-    }
-}`),
-			expectedLength: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "flow_period_length",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_flow",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 60,
-				},
-			},
-			expectedStartTs: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "flow_period_start_ts",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_flow",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 1624888107,
-				},
-			},
-		},
-	}
-
-	for desc, c := range cases {
-		t.Run(desc, func(t *testing.T) {
-			data.Data = c.data
-			res, err := be.ProcessMetrics(agent, agentID.String(), data)
-			require.Nil(t, err, fmt.Sprintf("%s: unexpected error: %s", desc, err))
-			var receivedLabelStartTs []prometheus.Label
-			var receivedDatapointStartTs prometheus.Datapoint
-			var receivedLabelLength []prometheus.Label
-			var receivedDatapointLength prometheus.Datapoint
-			for _, value := range res {
-				if c.expectedLength.Labels[0] == value.Labels[0] {
-					receivedLabelLength = value.Labels
-					receivedDatapointLength = value.Datapoint
-				} else if c.expectedStartTs.Labels[0] == value.Labels[0] {
-					receivedLabelStartTs = value.Labels
-					receivedDatapointStartTs = value.Datapoint
-				}
-			}
-			assert.True(t, reflect.DeepEqual(c.expectedLength.Labels, receivedLabelLength), fmt.Sprintf("%s: expected %v got %v", desc, c.expectedLength.Labels, receivedLabelLength))
-			assert.Equal(t, c.expectedLength.Datapoint.Value, receivedDatapointLength.Value, fmt.Sprintf("%s: expected value %f got %f", desc, c.expectedLength.Datapoint.Value, receivedDatapointLength.Value))
-			assert.True(t, reflect.DeepEqual(c.expectedStartTs.Labels, receivedLabelStartTs), fmt.Sprintf("%s: expected %v got %v", desc, c.expectedStartTs.Labels, receivedLabelStartTs))
-			assert.Equal(t, c.expectedStartTs.Datapoint.Value, receivedDatapointStartTs.Value, fmt.Sprintf("%s: expected value %f got %f", desc, c.expectedStartTs.Datapoint.Value, receivedDatapointStartTs.Value))
-
-		})
-	}
-}
-
-func TestFlowCardinalityConversion(t *testing.T) {
-	var logger = zap.NewNop()
-	pktvisor.Register(logger)
-
-	ownerID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	policyID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	agentID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	var agent = &pb.AgentInfoRes{
-		OwnerID:   ownerID.String(),
-		AgentName: "agent-test",
-	}
-
-	data := fleet.AgentMetricsRPCPayload{
-		PolicyID:   policyID.String(),
-		PolicyName: "policy-test",
-		Datasets:   nil,
-		Format:     "json",
-		BEVersion:  "1.0",
-	}
-
-	be := backend.GetBackend("pktvisor")
-
-	commonLabels := []prometheus.Label{
-		{
-			Name:  "instance",
-			Value: "agent-test",
-		},
-		{
-			Name:  "job",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "agent_id",
-			Value: agentID.String(),
-		},
-		{
-			Name:  "agent",
-			Value: "agent-test",
-		},
-		{
-			Name:  "policy_id",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "policy",
-			Value: "policy-test",
-		},
-		{
-			Name:  "handler",
-			Value: "policy_flow",
-		},
-		{
-			Name:  "device",
-			Value: "192.168.4.7",
-		},
-	}
-
-	cases := map[string]struct {
-		data     []byte
-		expected prometheus.TimeSeries
-	}{
-		"FlowPayloadCardinalityDstIpsOut": {
-			data: []byte(`
-				{
-					"policy_flow": {
-					  "flow": {
-						"devices":{
-							"192.168.4.7": {
-								"interfaces": {
-									"eth0": {
-										"cardinality": {
-						  					"dst_ips_out": 4
-										}
-									}
-								}
-							}
-						}
-					  }
-					}
-				}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(append(commonLabels, prometheus.Label{
-					Name:  "device_interface",
-					Value: "192.168.4.7|eth0",
-				}), prometheus.Label{
-					Name:  "__name__",
-					Value: "flow_cardinality_dst_ips_out",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 4,
-				},
-			},
-		},
-		"FlowPayloadCardinalityDstPortsOut": {
-			data: []byte(`
-				{
-					"policy_flow": {
-					  "flow": {
-						"devices":{
-							"192.168.4.7": {
-								"interfaces": {
-									"37": {
-										"cardinality": {
-						  					"dst_ports_out": 31,
-						  					"src_ips_in": 4,
-						  					"src_ports_in": 31
-										}
-									}
-								}
-							}
-						}
-					  }
-					}
-				}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(append(commonLabels, prometheus.Label{
-					Name:  "device_interface",
-					Value: "192.168.4.7|37",
-				}), prometheus.Label{
-					Name:  "__name__",
-					Value: "flow_cardinality_dst_ports_out",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 31,
-				},
-			},
-		},
-		"FlowPayloadCardinalitySrcIpsIn": {
-			data: []byte(`
-				{
-					"policy_flow": {
-					  "flow": {
-						"devices":{
-							"192.168.4.7": {
-								"interfaces": {
-									"37": {
-										"cardinality": {
-											"src_ips_in": 4,
-											"src_ports_in": 31
-									  }
-									}
-								}
-							}
-						}
-					  }
-					}
-				}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(append(commonLabels,
-					prometheus.Label{
-						Name:  "device_interface",
-						Value: "192.168.4.7|37",
-					}), prometheus.Label{
-					Name:  "__name__",
-					Value: "flow_cardinality_src_ips_in",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 4,
-				},
-			},
-		},
-		"FlowPayloadCardinalitySrcPortsIn": {
-			data: []byte(`
-				{
-					"policy_flow": {
-					  "flow": {
-						"devices":{
-							"192.168.4.7": {
-								"interfaces": {
-									"eth0": {
-										"cardinality": {
-						  					"src_ports_in": 31
-										}
-									}
-								}
-							}	
-						}
-					  }
-					}
-				}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(append(commonLabels, prometheus.Label{
-					Name:  "device_interface",
-					Value: "192.168.4.7|eth0",
-				}), prometheus.Label{
-					Name:  "__name__",
-					Value: "flow_cardinality_src_ports_in",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 31,
-				},
-			},
-		},
-	}
-
-	for desc, c := range cases {
-		t.Run(desc, func(t *testing.T) {
-			data.Data = c.data
-			res, err := be.ProcessMetrics(agent, agentID.String(), data)
-			require.Nil(t, err, fmt.Sprintf("%s: unexpected error: %s", desc, err))
-			var receivedLabel []prometheus.Label
-			var receivedDatapoint prometheus.Datapoint
-			for _, value := range res {
-				if c.expected.Labels[0] == value.Labels[0] {
-					if len(c.expected.Labels) < 7 {
-						receivedLabel = value.Labels
-						receivedDatapoint = value.Datapoint
-					} else {
-						if c.expected.Labels[6].Value == value.Labels[6].Value {
-							receivedLabel = value.Labels
-							receivedDatapoint = value.Datapoint
-						}
-					}
-				}
-			}
-			assert.True(t, reflect.DeepEqual(c.expected.Labels, receivedLabel), fmt.Sprintf("%s: expected %v got %v", desc, c.expected.Labels, receivedLabel))
-			assert.Equal(t, c.expected.Datapoint.Value, receivedDatapoint.Value, fmt.Sprintf("%s: expected value %f got %f", desc, c.expected.Datapoint.Value, receivedDatapoint.Value))
-		})
-	}
-
-}
-
-func TestFlowConversion(t *testing.T) {
-	var logger = zap.NewNop()
-	pktvisor.Register(logger)
-
-	ownerID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	policyID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	agentID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	var agent = &pb.AgentInfoRes{
-		OwnerID:   ownerID.String(),
-		AgentName: "agent-test",
-	}
-
-	data := fleet.AgentMetricsRPCPayload{
-		PolicyID:   policyID.String(),
-		PolicyName: "policy-test",
-		Datasets:   nil,
-		Format:     "json",
-		BEVersion:  "1.0",
-	}
-
-	be := backend.GetBackend("pktvisor")
-
-	commonLabels := []prometheus.Label{
-		{
-			Name:  "instance",
-			Value: "agent-test",
-		},
-		{
-			Name:  "job",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "agent_id",
-			Value: agentID.String(),
-		},
-		{
-			Name:  "agent",
-			Value: "agent-test",
-		},
-		{
-			Name:  "policy_id",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "policy",
-			Value: "policy-test",
-		},
-		{
-			Name:  "handler",
-			Value: "policy_flow",
-		},
-		{
-			Name:  "device",
-			Value: "192.168.4.7",
-		},
-	}
-
-	cases := map[string]struct {
-		data     []byte
-		expected prometheus.TimeSeries
-	}{
-		"FlowPayloadRecordsFiltered": {
-			data: []byte(`
-				{
-					"policy_flow": {
-						"flow": {
-							"devices":{
-								"192.168.4.7": {
-									"records_filtered": 8
-								}
-							}
-						}
-					}
-				}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "flow_records_filtered",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"FlowPayloadRecordsFlows": {
-			data: []byte(`
-				{
-					"policy_flow": {
-						"flow": {
-							"devices":{
-								"192.168.4.7": {
-									"records_flows": 8
-								}
-							}
-						}
-					}
-				}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(commonLabels, prometheus.Label{
-					Name:  "__name__",
-					Value: "flow_records_flows",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"FlowPayloadInIpv4Bytes": {
-			data: []byte(`
-				{
-					"policy_flow": {
-						"flow": {
-							"devices":{
-								"192.168.4.7": {
-									"interfaces": {
-										"37": {
-											"in_ipv4_bytes": 52785
-										}
-									}
-								}
-							}
-						}
-					}
-				}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(append(commonLabels, prometheus.Label{
-					Name:  "device_interface",
-					Value: "192.168.4.7|37",
-				}), prometheus.Label{
-					Name:  "__name__",
-					Value: "flow_in_ipv4_bytes",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 52785,
-				},
-			},
-		},
-		"FlowPayloadOutIpv6Packets": {
-			data: []byte(`
-				{
-					"policy_flow": {
-						"flow": {
-							"devices":{
-								"192.168.4.7": {
-									"interfaces": {
-										"37": {
-											"out_ipv6_packets": 52785
-										}
-									}
-								}
-							}
-						}
-					}
-				}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(append(commonLabels, prometheus.Label{
-					Name:  "device_interface",
-					Value: "192.168.4.7|37",
-				}), prometheus.Label{
-					Name:  "__name__",
-					Value: "flow_out_ipv6_packets",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 52785,
-				},
-			},
-		},
-		"FlowPayloadInOtherL4Bytes": {
-			data: []byte(`
-				{
-					"policy_flow": {
-						"flow": {
-							"devices":{
-								"192.168.4.7": {
-									"interfaces": {
-										"37": {
-											"in_other_l4_bytes": 52785
-										}
-									}
-								}
-							}
-						}
-					}
-				}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(append(commonLabels, prometheus.Label{
-					Name:  "device_interface",
-					Value: "192.168.4.7|37",
-				}), prometheus.Label{
-					Name:  "__name__",
-					Value: "flow_in_other_l4_bytes",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 52785,
-				},
-			},
-		},
-		"FlowPayloadOutTCPPackets": {
-			data: []byte(`
-				{
-					"policy_flow": {
-						"flow": {
-							"devices":{
-								"192.168.4.7": {
-									"interfaces": {
-										"37": {
-											"out_tcp_packets": 52785
-										}
-									}
-								}
-							}
-						}
-					}
-				}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(append(commonLabels, prometheus.Label{
-					Name:  "device_interface",
-					Value: "192.168.4.7|37",
-				}), prometheus.Label{
-					Name:  "__name__",
-					Value: "flow_out_tcp_packets",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 52785,
-				},
-			},
-		},
-		"FlowPayloadInUdpPackets": {
-			data: []byte(`
-				{
-					"policy_flow": {
-						"flow": {
-							"devices":{
-								"192.168.4.7": {
-									"interfaces": {
-										"7": {
-											"in_udp_bytes": 52785,
-											"out_udp_bytes": 52786
-										},
-										"8": {
-											"in_udp_bytes": 52787,
-											"out_udp_bytes": 52788
-										}
-									}
-								}
-							}
-						}
-					}
-				}`),
-			expected: prometheus.TimeSeries{
-				Labels: append(prependLabel(append(commonLabels, prometheus.Label{
-					Name:  "device_interface",
-					Value: "192.168.4.7|8",
-				}), prometheus.Label{
-					Name:  "__name__",
-					Value: "flow_in_udp_bytes",
-				})),
-				Datapoint: prometheus.Datapoint{
-					Value: 52780,
-				},
-			},
-		},
-	}
-
-	for desc, c := range cases {
-		t.Run(desc, func(t *testing.T) {
-			data.Data = c.data
-			res, err := be.ProcessMetrics(agent, agentID.String(), data)
-			require.Nil(t, err, fmt.Sprintf("%s: unexpected error: %s", desc, err))
-			var receivedLabel []prometheus.Label
-			var receivedDatapoint prometheus.Datapoint
-			for _, value := range res {
-				if c.expected.Labels[0] == value.Labels[0] {
-					receivedLabel = value.Labels
-					receivedDatapoint = value.Datapoint
-				}
-			}
-			assert.NotNil(t, receivedLabel)
-			assert.GreaterOrEqual(t, receivedDatapoint.Value, c.expected.Datapoint.Value)
-		})
-	}
-
-}
-
-func TestFlowTopKMetricsConversion(t *testing.T) {
-	var logger = zap.NewNop()
-	pktvisor.Register(logger)
-
-	ownerID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	policyID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	agentID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	var agent = &pb.AgentInfoRes{
-		OwnerID:   ownerID.String(),
-		AgentName: "agent-test",
-	}
-
-	data := fleet.AgentMetricsRPCPayload{
-		PolicyID:   policyID.String(),
-		PolicyName: "policy-test",
-		Datasets:   nil,
-		Format:     "json",
-		BEVersion:  "1.0",
-	}
-
-	be := backend.GetBackend("pktvisor")
-
-	cases := map[string]struct {
-		data     []byte
-		expected prometheus.TimeSeries
-	}{
-		"FlowTopInDstIpsAndPortBytes": {
-			data: []byte(`
-{
-    "policy_flow": {
-		"flow": {
-			"devices":{
-				"192.168.4.7": {
-					"interfaces": {
-						"38": {
-        					"top_in_dst_ips_and_port_bytes": [
-								{
-          	  	  					"estimate": 8,
-          	  	  					"name": "10.4.2.2:5000"
-        						}
-							]
-						}
-					}
-				}
-			}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "flow_top_in_dst_ips_and_port_bytes",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_flow",
-					},
-					{
-						Name:  "device",
-						Value: "192.168.4.7",
-					},
-					{
-						Name:  "device_interface",
-						Value: "192.168.4.7|38",
-					},
-					{
-						Name:  "ip_port",
-						Value: "10.4.2.2:5000",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"FlowTopOutDstIpsAndPortPackets": {
-			data: []byte(`
-{
-    "policy_flow": {
-		"flow": {
-			"devices":{
-				"192.168.4.7": {
-					"interfaces": {
-						"38": {
-        					"top_out_dst_ips_and_port_packets": [
-								{
-          	  	  					"estimate": 8,
-          	  	  					"name": "10.4.2.2:5000"
-        						}
-							]
-						}
-					}
-				}
-			}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "flow_top_out_dst_ips_and_port_packets",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_flow",
-					},
-					{
-						Name:  "device",
-						Value: "192.168.4.7",
-					},
-					{
-						Name:  "device_interface",
-						Value: "192.168.4.7|38",
-					},
-					{
-						Name:  "ip_port",
-						Value: "10.4.2.2:5000",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"FlowTopInDstIpsBytes": {
-			data: []byte(`
-{
-    "policy_flow": {
-		"flow": {
-			"devices":{
-				"192.168.4.7": {
-					"interfaces": {
-						"37": {
-        					"top_in_dst_ips_bytes": [
-								{
-          	  	  					"estimate": 8,
-          	  	  					"name": "10.4.2.2"
-        						}
-							]
-						}
-					}
-				}
-			}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "flow_top_in_dst_ips_bytes",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_flow",
-					},
-					{
-						Name:  "device",
-						Value: "192.168.4.7",
-					},
-					{
-						Name:  "device_interface",
-						Value: "192.168.4.7|37",
-					},
-					{
-						Name:  "ip",
-						Value: "10.4.2.2",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"FlowTopInDstIpsPackets": {
-			data: []byte(`
-{
-    "policy_flow": {
-		"flow": {
-			"devices":{
-				"192.168.4.7": {
-					"interfaces": {
-						"4": {
-        					"top_in_dst_ips_packets": [
-								{
-          	  	  					"estimate": 8,
-          	  	  					"name": "10.4.2.2"
-        						}
-							]
-						}
-					}
-				}
-			}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "flow_top_in_dst_ips_packets",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_flow",
-					},
-					{
-						Name:  "device",
-						Value: "192.168.4.7",
-					},
-					{
-						Name:  "device_interface",
-						Value: "192.168.4.7|4",
-					},
-					{
-						Name:  "ip",
-						Value: "10.4.2.2",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"FlowTopOutDstPortsBytes": {
-			data: []byte(`
-{
-    "policy_flow": {
-		"flow": {
-			"devices":{
-				"192.168.4.7": {
-					"interfaces": {
-						"37": {
-        					"top_out_dst_ports_bytes": [
-								{
-          	  	  					"estimate": 8,
-          	  	  					"name": "5000"
-        						}
-							]
-						}
-					}
-				}
-			}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "flow_top_out_dst_ports_bytes",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_flow",
-					},
-					{
-						Name:  "device",
-						Value: "192.168.4.7",
-					},
-					{
-						Name:  "device_interface",
-						Value: "192.168.4.7|37",
-					},
-					{
-						Name:  "port",
-						Value: "5000",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"FlowTopDstInPortsPackets": {
-			data: []byte(`
-{
-    "policy_flow": {
-		"flow": {
-			"devices":{
-				"192.168.4.7": {
-					"interfaces": {
-						"37": {
-        					"top_in_dst_ports_packets": [
-								{
-          	  	  					"estimate": 8,
-          	  	  					"name": "5000"
-        						}
-							]
-						}	
-					}
-				}
-			}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "flow_top_in_dst_ports_packets",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_flow",
-					},
-					{
-						Name:  "device",
-						Value: "192.168.4.7",
-					},
-					{
-						Name:  "device_interface",
-						Value: "192.168.4.7|37",
-					},
-					{
-						Name:  "port",
-						Value: "5000",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"FlowTopInInterfacesBytes": {
-			data: []byte(`
-{
-    "policy_flow": {
-		"flow": {
-			"devices":{
-				"192.168.4.7": {
-        			"top_in_interfaces_bytes": [
-						{
-          	  	  			"estimate": 8,
-          	  	  			"name": "300"
-        				}
-					]
-				}
-			}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "flow_top_in_interfaces_bytes",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_flow",
-					},
-					{
-						Name:  "device",
-						Value: "192.168.4.7",
-					},
-					{
-						Name:  "interface",
-						Value: "300",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"FlowTopInInterfacesPackets": {
-			data: []byte(`
-{
-    "policy_flow": {
-		"flow": {
-			"devices":{
-				"192.168.4.7": {
-        			"top_in_interfaces_packets": [
-						{
-          	  	  			"estimate": 8,
-          	  	  			"name": "300"
-        				}
-					]
-				}
-			}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "flow_top_in_interfaces_packets",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_flow",
-					},
-					{
-						Name:  "device",
-						Value: "192.168.4.7",
-					},
-					{
-						Name:  "interface",
-						Value: "300",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"FlowTopOutSrcIpsBytes": {
-			data: []byte(`
-{
-    "policy_flow": {
-		"flow": {
-			"devices":{
-				"192.168.4.7": {
-					"interfaces": {
-						"37": {
-        					"top_out_src_ips_bytes": [
-								{
-          	  	  					"estimate": 15267,
-          	  	  					"name": "192.168.0.1"
-        						}
-							]
-						}
-					}
-				}
-			}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "flow_top_out_src_ips_bytes",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_flow",
-					},
-					{
-						Name:  "device",
-						Value: "192.168.4.7",
-					},
-					{
-						Name:  "device_interface",
-						Value: "192.168.4.7|37",
-					},
-					{
-						Name:  "ip",
-						Value: "192.168.0.1",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 15267,
-				},
-			},
-		},
-		"FlowTopOutInterfacesPackets": {
-			data: []byte(`
-{
-    "policy_flow": {
-		"flow": {
-			"devices":{
-				"192.168.4.7": {
-        			"top_out_interfaces_packets": [
-						{
-          	  	  			"estimate": 8,
-          	  	  			"name": "200"
-        				}
-					]
-				}
-			}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "flow_top_out_interfaces_packets",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_flow",
-					},
-					{
-						Name:  "device",
-						Value: "192.168.4.7",
-					},
-					{
-						Name:  "interface",
-						Value: "200",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		}, "FlowTopInSrcIpsAndPortBytes": {
-			data: []byte(`
-{
-    "policy_flow": {
-		"flow": {
-			"devices":{
-				"192.168.4.7": {
-					"interfaces": {
-						"37": {
-        					"top_in_src_ips_and_port_bytes": [
-								{
-          	  	  					"estimate": 8,
-          	  	  					"name": "10.4.2.2:5000"
-        						}
-							]
-						}
-					}
-				}
-			}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "flow_top_in_src_ips_and_port_bytes",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_flow",
-					},
-					{
-						Name:  "device",
-						Value: "192.168.4.7",
-					},
-					{
-						Name:  "device_interface",
-						Value: "192.168.4.7|37",
-					},
-					{
-						Name:  "ip_port",
-						Value: "10.4.2.2:5000",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"FlowTopOutSrcIpsAndPortPackets": {
-			data: []byte(`
-{
-    "policy_flow": {
-		"flow": {
-			"devices":{
-				"192.168.4.7": {
-					"interfaces": {
-						"eth0": {
-        					"top_out_src_ips_and_port_packets": [
-								{
-          	  	  					"estimate": 8,
-          	  	  					"name": "10.4.2.2:5000"
-        						}
-							]
-						}
-					}
-				}
-			}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "flow_top_out_src_ips_and_port_packets",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_flow",
-					},
-					{
-						Name:  "device",
-						Value: "192.168.4.7",
-					},
-					{
-						Name:  "device_interface",
-						Value: "192.168.4.7|eth0",
-					},
-					{
-						Name:  "ip_port",
-						Value: "10.4.2.2:5000",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"FlowTopInSrcIpsBytes": {
-			data: []byte(`
-{
-    "policy_flow": {
-		"flow": {
-			"devices":{
-				"192.168.4.7": {
-					"interfaces": {
-						"eth1": {
-        					"top_in_src_ips_bytes": [
-								{
-          	  	  					"estimate": 8,
-          	  	  					"name": "10.4.2.2"
-        						}
-							]
-						}
-					}
-				}
-			}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "flow_top_in_src_ips_bytes",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_flow",
-					},
-					{
-						Name:  "device",
-						Value: "192.168.4.7",
-					},
-					{
-						Name:  "device_interface",
-						Value: "192.168.4.7|eth1",
-					},
-					{
-						Name:  "ip",
-						Value: "10.4.2.2",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"FlowTopOutSrcIpsPackets": {
-			data: []byte(`
-{
-    "policy_flow": {
-		"flow": {
-			"devices":{
-				"192.168.4.7": {
-					"interfaces": {
-						"36": {
-        					"top_out_src_ips_packets": [
-								{
-          	  	  					"estimate": 8,
-          	  	  					"name": "10.4.2.2"
-        						}
-							]
-						}
-					}
-				}
-			}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "flow_top_out_src_ips_packets",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_flow",
-					},
-					{
-						Name:  "device",
-						Value: "192.168.4.7",
-					},
-					{
-						Name:  "device_interface",
-						Value: "192.168.4.7|36",
-					},
-					{
-						Name:  "ip",
-						Value: "10.4.2.2",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"FlowTopInSrcPortsBytes": {
-			data: []byte(`
-{
-    "policy_flow": {
-		"flow": {
-			"devices":{
-				"192.168.4.7": {
-					"interfaces": {
-						"38": {
-        					"top_in_src_ports_bytes": [
-								{
-          	  	  					"estimate": 8,
-          	  	  					"name": "4500"
-        						}
-							]
-						}
-					}
-				}
-			}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "flow_top_in_src_ports_bytes",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_flow",
-					},
-					{
-						Name:  "device",
-						Value: "192.168.4.7",
-					},
-					{
-						Name:  "device_interface",
-						Value: "192.168.4.7|38",
-					},
-					{
-						Name:  "port",
-						Value: "4500",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-		"FlowTopOutSrcPortsPackets": {
-			data: []byte(`
-{
-    "policy_flow": {
-		"flow": {
-			"devices":{
-				"192.168.4.7": {
-					"interfaces": {
-						"eth0": {
-        					"top_out_src_ports_packets": [
-								{
-          	  	  					"estimate": 8,
-          	  	  					"name": "4500"
-        						}
-							]
-						}
-					}
-				}
-			}
-		}
-    }
-}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "flow_top_out_src_ports_packets",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_flow",
-					},
-					{
-						Name:  "device",
-						Value: "192.168.4.7",
-					},
-					{
-						Name:  "device_interface",
-						Value: "192.168.4.7|eth0",
-					},
-					{
-						Name:  "port",
-						Value: "4500",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 8,
-				},
-			},
-		},
-	}
-
-	for desc, c := range cases {
-		t.Run(desc, func(t *testing.T) {
-			data.Data = c.data
-			res, err := be.ProcessMetrics(agent, agentID.String(), data)
-			require.Nil(t, err, fmt.Sprintf("%s: unexpected error: %s", desc, err))
-			var receivedLabel []prometheus.Label
-			var receivedDatapoint prometheus.Datapoint
-			for _, value := range res {
-				if c.expected.Labels[0] == value.Labels[0] {
-					receivedLabel = value.Labels
-					receivedDatapoint = value.Datapoint
-				}
-			}
-			assert.True(t, reflect.DeepEqual(c.expected.Labels, receivedLabel), fmt.Sprintf("%s: expected %v got %v", desc, c.expected.Labels, receivedLabel))
-			assert.Equal(t, c.expected.Datapoint.Value, receivedDatapoint.Value, fmt.Sprintf("%s: expected value %f got %f", desc, c.expected.Datapoint.Value, receivedDatapoint.Value))
-		})
-	}
-
-}
-
-func TestAgentTagsConversion(t *testing.T) {
-	var logger = zap.NewNop()
-	pktvisor.Register(logger)
-
-	ownerID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	policyID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	agentID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	var agent = &pb.AgentInfoRes{
-		OwnerID:   ownerID.String(),
-		AgentName: "agent-test",
-		AgentTags: types.Tags{"testkey": "testvalue", "testkey2": "testvalue2"},
-	}
-
-	data := fleet.AgentMetricsRPCPayload{
-		PolicyID:   policyID.String(),
-		PolicyName: "policy-test",
-		Datasets:   nil,
-		Format:     "json",
-		BEVersion:  "1.0",
-	}
-
-	be := backend.GetBackend("pktvisor")
-
-	cases := map[string]struct {
-		data     []byte
-		expected prometheus.TimeSeries
-	}{
-		"Example metrics": {
-			data: []byte(`
-				{
-					"policy_packets": {
-						"packets": {
-							"top_ASN": [
-								{
-									"estimate": 996,
-									"name": "36236/NETACTUATE"
-								}
-							]
-						}
-					}
-				}`),
-			expected: prometheus.TimeSeries{
-				Labels: []prometheus.Label{
-					{
-						Name:  "__name__",
-						Value: "packets_top_ASN",
-					},
-					{
-						Name:  "instance",
-						Value: "agent-test",
-					},
-					{
-						Name:  "job",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "agent_id",
-						Value: agentID.String(),
-					},
-					{
-						Name:  "agent",
-						Value: "agent-test",
-					},
-					{
-						Name:  "policy_id",
-						Value: policyID.String(),
-					},
-					{
-						Name:  "policy",
-						Value: "policy-test",
-					},
-					{
-						Name:  "handler",
-						Value: "policy_packets",
-					},
-					{
-						Name:  "testkey",
-						Value: "testvalue",
-					},
-					{
-						Name:  "testkey2",
-						Value: "testvalue2",
-					},
-					{
-						Name:  "asn",
-						Value: "36236/NETACTUATE",
-					},
-				},
-				Datapoint: prometheus.Datapoint{
-					Value: 996,
-				},
-			},
-		},
-	}
-
-	for desc, c := range cases {
-		t.Run(desc, func(t *testing.T) {
-			data.Data = c.data
-			res, err := be.ProcessMetrics(agent, agentID.String(), data)
-			require.Nil(t, err, fmt.Sprintf("%s: unexpected error: %s", desc, err))
-			var receivedLabel []prometheus.Label
-			var receivedDatapoint prometheus.Datapoint
-			for _, value := range res {
-				if c.expected.Labels[0] == value.Labels[0] {
-					receivedLabel = value.Labels
-					receivedDatapoint = value.Datapoint
-				}
-			}
-			assert.ElementsMatch(t, c.expected.Labels, receivedLabel, fmt.Sprintf("%s: expected %v got %v", desc, c.expected.Labels, receivedLabel))
-			assert.Equal(t, c.expected.Datapoint.Value, receivedDatapoint.Value, fmt.Sprintf("%s: expected value %f got %f", desc, c.expected.Datapoint.Value, receivedDatapoint.Value))
-		})
-	}
-}
-
-func TestTagsConversion(t *testing.T) {
-	var logger = zap.NewNop()
-	pktvisor.Register(logger)
-
-	ownerID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	policyID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	agentID, err := uuid.NewV4()
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-
-	var agent = &pb.AgentInfoRes{
-		OwnerID:   ownerID.String(),
-		AgentName: "agent-test",
-		AgentTags: types.Tags{"test": "true"},
-		OrbTags:   types.Tags{"test2": "true2"},
-	}
-
-	var sameTagKeyAgent = &pb.AgentInfoRes{
-		OwnerID:   ownerID.String(),
-		AgentName: "agent-test",
-		AgentTags: types.Tags{"test": "true"},
-		OrbTags:   types.Tags{"test": "true2"},
-	}
-
-	data := fleet.AgentMetricsRPCPayload{
-		PolicyID:   policyID.String(),
-		PolicyName: "policy-test",
-		Datasets:   nil,
-		Format:     "json",
-		BEVersion:  "1.0",
-		Data: []byte(`
-				{
-					"policy_packets": {
-						"packets": {
-							"top_ASN": [
-								{
-									"estimate": 996,
-									"name": "36236/NETACTUATE"
-								}
-							]
-						}
-					}
-				}`),
-	}
-
-	be := backend.GetBackend("pktvisor")
-
-	commonLabels := []prometheus.Label{
-		{
-			Name:  "__name__",
-			Value: "packets_top_ASN",
-		},
-		{
-			Name:  "instance",
-			Value: "agent-test",
-		},
-		{
-			Name:  "job",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "agent_id",
-			Value: agentID.String(),
-		},
-		{
-			Name:  "agent",
-			Value: "agent-test",
-		},
-		{
-			Name:  "policy_id",
-			Value: policyID.String(),
-		},
-		{
-			Name:  "policy",
-			Value: "policy-test",
-		},
-		{
-			Name:  "handler",
-			Value: "policy_packets",
-		},
-		{
-			Name:  "asn",
-			Value: "36236/NETACTUATE",
-		},
-	}
-
-	cases := map[string]struct {
-		agent    *pb.AgentInfoRes
-		expected prometheus.TimeSeries
-	}{
-		"Different agent tags and orb tag": {
-			agent: agent,
-			expected: prometheus.TimeSeries{
-				Labels: append(commonLabels, prometheus.Label{
-					Name:  "test",
-					Value: "true",
-				}, prometheus.Label{
-					Name:  "test2",
-					Value: "true2",
-				}),
-			},
-		},
-		"Same key agent tags and orb tag": {
-			agent: sameTagKeyAgent,
-			expected: prometheus.TimeSeries{
-				Labels: append(commonLabels, prometheus.Label{
-					Name:  "test",
-					Value: "true2",
-				}),
-			},
-		},
-	}
-
-	for desc, c := range cases {
-		t.Run(desc, func(t *testing.T) {
-			res, err := be.ProcessMetrics(c.agent, agentID.String(), data)
-			require.Nil(t, err, fmt.Sprintf("%s: unexpected error: %s", desc, err))
-			var receivedLabel []prometheus.Label
-			for _, value := range res {
-				if commonLabels[0].Value == value.Labels[0].Value {
-					receivedLabel = value.Labels
-				}
-			}
-			assert.ElementsMatch(t, c.expected.Labels, receivedLabel, fmt.Sprintf("%s: expected %v got %v", desc, c.expected.Labels, receivedLabel))
-		})
-	}
-
-}
-
-func prependLabel(labelList []prometheus.Label, label prometheus.Label) []prometheus.Label {
-	labelList = append(labelList, prometheus.Label{})
-	copy(labelList[1:], labelList)
-	labelList[0] = label
-	return labelList
-}
-
-func labelQuantiles(labelList []prometheus.Label, label prometheus.Label) []prometheus.Label {
-	for i := 0; i < 32; i += 8 {
-		labelList = append(labelList[:i+1], labelList[i:]...)
-		labelList[i] = label
-	}
-	return labelList
-}
diff --git a/sinker/backend/pktvisor/promwrapper.go b/sinker/backend/pktvisor/promwrapper.go
deleted file mode 100644
index 8d936b5f2..000000000
--- a/sinker/backend/pktvisor/promwrapper.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package pktvisor
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/orb-community/orb/sinker/prometheus"
-)
-
-type labelList []prometheus.Label
-type headerList []header
-type dp prometheus.Datapoint
-
-type header struct {
-	name  string
-	value string
-}
-
-func (t *labelList) String() string {
-	var labels [][]string
-	for _, v := range []prometheus.Label(*t) {
-		labels = append(labels, []string{v.Name, v.Value})
-	}
-	return fmt.Sprintf("%v", labels)
-}
-
-func (t *labelList) Set(value string) error {
-	labelPair := strings.Split(value, ";")
-
-	if len(labelPair) != 2 {
-		return fmt.Errorf("incorrect number of arguments to '-t': %d", len(labelPair))
-	}
-
-	label := prometheus.Label{
-		Name:  labelPair[0],
-		Value: labelPair[1],
-	}
-
-	*t = append(*t, label)
-
-	return nil
-}
-
-func (h *headerList) String() string {
-	var headers [][]string
-	for _, v := range []header(*h) {
-		headers = append(headers, []string{v.name, v.value})
-	}
-	return fmt.Sprintf("%v", headers)
-}
-
-func (h *headerList) Set(value string) error {
-	firstSplit := strings.Index(value, ":")
-	if firstSplit == -1 {
-		return fmt.Errorf("header missing separating colon: '%v'", value)
-	}
-
-	*h = append(*h, header{
-		name:  strings.TrimSpace(value[:firstSplit]),
-		value: strings.TrimSpace(value[firstSplit+1:]),
-	})
-
-	return nil
-}
-
-func (d *dp) String() string {
-	return fmt.Sprintf("%v", []string{d.Timestamp.String(), fmt.Sprintf("%v", d.Value)})
-}
-
-func (d *dp) Set(value string) error {
-	dp := strings.Split(value, ",")
-	if len(dp) != 2 {
-		return fmt.Errorf("incorrect number of arguments to '-d': %d", len(dp))
-	}
-
-	var ts time.Time
-	if strings.ToLower(dp[0]) == "now" {
-		ts = time.Now()
-	} else {
-		i, err := strconv.Atoi(dp[0])
-		if err != nil {
-			return fmt.Errorf("unable to parse timestamp: %s", dp[1])
-		}
-		ts = time.Unix(int64(i), 0)
-	}
-
-	val, err := strconv.ParseFloat(dp[1], 64)
-	if err != nil {
-		return fmt.Errorf("unable to parse value as float64: %s", dp[0])
-	}
-
-	d.Timestamp = ts
-	d.Value = val
-
-	return nil
-}
diff --git a/sinker/backend/pktvisor/types.go b/sinker/backend/pktvisor/types.go
deleted file mode 100644
index a00f074ce..000000000
--- a/sinker/backend/pktvisor/types.go
+++ /dev/null
@@ -1,253 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package pktvisor
-
-const PktvisorVersion = "4.2.0"
-
-// NameCount represents the count of a unique domain name
-type NameCount struct {
-	Name     string `mapstructure:"name"`
-	Estimate int64  `mapstructure:"estimate"`
-}
-
-// Rates represents a histogram of rates at various percentiles
-type Rates struct {
-	P50 int64 `mapstructure:"p50"`
-	P90 int64 `mapstructure:"p90"`
-	P95 int64 `mapstructure:"p95"`
-	P99 int64 `mapstructure:"p99"`
-}
-
-// Quantiles represents a histogram of various percentiles
-type Quantiles struct {
-	P50 int64 `mapstructure:"p50"`
-	P90 int64 `mapstructure:"p90"`
-	P95 int64 `mapstructure:"p95"`
-	P99 int64 `mapstructure:"p99"`
-}
-
-// DHCPPayload contains the information specifically for the DNS protocol
-type DHCPPayload struct {
-	WirePackets struct {
-		Filtered    int64 `mapstructure:"filtered"`
-		Total       int64 `mapstructure:"total"`
-		DeepSamples int64 `mapstructure:"deep_samples"`
-		Discover    int64 `mapstructure:"discover"`
-		Offer       int64 `mapstructure:"offer"`
-		Request     int64 `mapstructure:"request"`
-		Ack         int64 `mapstructure:"ack"`
-		Events      int64 `mapstructure:"events"`
-	} `mapstructure:"wire_packets"`
-	Rates struct {
-		Total  Rates `mapstructure:"total"`
-		Events Rates `mapstructure:"events"`
-	} `mapstructure:"rates"`
-	Period PeriodPayload `mapstructure:"period"`
-}
-
-// DNSPayload contains the information specifically for the DNS protocol
-type DNSPayload struct {
-	WirePackets struct {
-		Ipv4        int64 `mapstructure:"ipv4"`
-		Ipv6        int64 `mapstructure:"ipv6"`
-		Queries     int64 `mapstructure:"queries"`
-		Replies     int64 `mapstructure:"replies"`
-		TCP         int64 `mapstructure:"tcp"`
-		Total       int64 `mapstructure:"total"`
-		UDP         int64 `mapstructure:"udp"`
-		Nodata      int64 `mapstructure:"nodata"`
-		Noerror     int64 `mapstructure:"noerror"`
-		Nxdomain    int64 `mapstructure:"nxdomain"`
-		Srvfail     int64 `mapstructure:"srvfail"`
-		Refused     int64 `mapstructure:"refused"`
-		Filtered    int64 `mapstructure:"filtered"`
-		DeepSamples int64 `mapstructure:"deep_samples"`
-		QueryECS    int64 `mapstructure:"query_ecs"`
-		Events      int64 `mapstructure:"events"`
-	} `mapstructure:"wire_packets"`
-	Rates struct {
-		Total  Rates `mapstructure:"total"`
-		Events Rates `mapstructure:"events"`
-	} `mapstructure:"rates"`
-	Cardinality struct {
-		Qname int64 `mapstructure:"qname"`
-	} `mapstructure:"cardinality"`
-	Xact struct {
-		Counts struct {
-			Total    int64 `mapstructure:"total"`
-			TimedOut int64 `mapstructure:"timed_out"`
-		} `mapstructure:"counts"`
-		In struct {
-			QuantilesUS Quantiles   `mapstructure:"quantiles_us"`
-			TopSlow     []NameCount `mapstructure:"top_slow"`
-			Total       int64       `mapstructure:"total"`
-		} `mapstructure:"in"`
-		Out struct {
-			QuantilesUS Quantiles   `mapstructure:"quantiles_us"`
-			TopSlow     []NameCount `mapstructure:"top_slow"`
-			Total       int64       `mapstructure:"total"`
-		} `mapstructure:"out"`
-		Ratio struct {
-			Quantiles struct {
-				P50 float64 `mapstructure:"p50"`
-				P90 float64 `mapstructure:"p90"`
-				P95 float64 `mapstructure:"p95"`
-				P99 float64 `mapstructure:"p99"`
-			} `mapstructure:"quantiles"`
-		} `mapstructure:"ratio"`
-	} `mapstructure:"xact"`
-	TopGeoLocECS        []NameCount   `mapstructure:"top_geoLoc_ecs"`
-	TopAsnECS           []NameCount   `mapstructure:"top_asn_ecs"`
-	TopQueryECS         []NameCount   `mapstructure:"top_query_ecs"`
-	TopQname2           []NameCount   `mapstructure:"top_qname2"`
-	TopQname3           []NameCount   `mapstructure:"top_qname3"`
-	TopNxdomain         []NameCount   `mapstructure:"top_nxdomain"`
-	TopQtype            []NameCount   `mapstructure:"top_qtype"`
-	TopRcode            []NameCount   `mapstructure:"top_rcode"`
-	TopREFUSED          []NameCount   `mapstructure:"top_refused"`
-	TopQnameByRespBytes []NameCount   `mapstructure:"top_qname_by_resp_bytes"`
-	TopSRVFAIL          []NameCount   `mapstructure:"top_srvfail"`
-	TopNODATA           []NameCount   `mapstructure:"top_nodata"`
-	TopUDPPorts         []NameCount   `mapstructure:"top_udp_ports"`
-	Period              PeriodPayload `mapstructure:"period"`
-}
-
-// PacketPayload contains information about raw packets regardless of protocol
-type PacketPayload struct {
-	Cardinality struct {
-		DstIpsOut int64 `mapstructure:"dst_ips_out"`
-		SrcIpsIn  int64 `mapstructure:"src_ips_in"`
-	} `mapstructure:"cardinality"`
-	Ipv4        int64 `mapstructure:"ipv4"`
-	Ipv6        int64 `mapstructure:"ipv6"`
-	TCP         int64 `mapstructure:"tcp"`
-	Total       int64 `mapstructure:"total"`
-	UDP         int64 `mapstructure:"udp"`
-	In          int64 `mapstructure:"in"`
-	Out         int64 `mapstructure:"out"`
-	UnknownDir  int64 `mapstructure:"unknown_dir"`
-	OtherL4     int64 `mapstructure:"other_l4"`
-	DeepSamples int64 `mapstructure:"deep_samples"`
-	Filtered    int64 `mapstructure:"filtered"`
-	Events      int64 `mapstructure:"events"`
-	Protocol    struct {
-		Tcp struct {
-			SYN int64 `mapstructure:"syn"`
-		} `mapstructure:"tcp"`
-	} `mapstructure:"protocol"`
-	PayloadSize Quantiles `mapstructure:"payload_size"`
-	Rates       struct {
-		BytesIn    Rates `mapstructure:"bytes_in"`
-		BytesOut   Rates `mapstructure:"bytes_out"`
-		BytesTotal Rates `mapstructure:"bytes_total"`
-		PpsIn      Rates `mapstructure:"pps_in"`
-		PpsOut     Rates `mapstructure:"pps_out"`
-		PpsTotal   Rates `mapstructure:"pps_total"`
-		PpsEvents  Rates `mapstructure:"pps_events"`
-	} `mapstructure:"rates"`
-	TopIpv4   []NameCount   `mapstructure:"top_ipv4"`
-	TopIpv6   []NameCount   `mapstructure:"top_ipv6"`
-	TopGeoLoc []NameCount   `mapstructure:"top_geoLoc"`
-	TopASN    []NameCount   `mapstructure:"top_asn"`
-	Period    PeriodPayload `mapstructure:"period"`
-}
-
-// PcapPayload contains information about pcap input stream
-type PcapPayload struct {
-	TcpReassemblyErrors int64 `mapstructure:"tcp_reassembly_errors"`
-	IfDrops             int64 `mapstructure:"if_drops"`
-	OsDrops             int64 `mapstructure:"os_drops"`
-}
-
-// PeriodPayload indicates the period of time for which a snapshot refers to
-type PeriodPayload struct {
-	StartTS int64 `mapstructure:"start_ts"`
-	Length  int64 `mapstructure:"length"`
-}
-
-// FlowPayload contains the information specifically for the Flow protocol
-type FlowPayload struct {
-	Devices map[string]struct {
-		RecordsFiltered         int64       `mapstructure:"records_filtered"`
-		RecordsFlows            int64       `mapstructure:"records_flows"`
-		TopInInterfacesBytes    []NameCount `mapstructure:"top_in_interfaces_bytes"`
-		TopInInterfacesPackets  []NameCount `mapstructure:"top_in_interfaces_packets"`
-		TopOutInterfacesBytes   []NameCount `mapstructure:"top_out_interfaces_bytes"`
-		TopOutInterfacesPackets []NameCount `mapstructure:"top_out_interfaces_packets"`
-		Interfaces              map[string]struct {
-			Cardinality struct {
-				Conversations int64 `mapstructure:"conversations"`
-				DstIpsOut     int64 `mapstructure:"dst_ips_out"`
-				DstPortsOut   int64 `mapstructure:"dst_ports_out"`
-				SrcIpsIn      int64 `mapstructure:"src_ips_in"`
-				SrcPortsIn    int64 `mapstructure:"src_ports_in"`
-			} `mapstructure:"cardinality"`
-			InIpv4Bytes                int64       `mapstructure:"in_ipv4_bytes"`
-			InIpv4Packets              int64       `mapstructure:"in_ipv4_packets"`
-			InIpv6Bytes                int64       `mapstructure:"in_ipv6_bytes"`
-			InIpv6Packets              int64       `mapstructure:"in_ipv6_packets"`
-			InOtherL4Bytes             int64       `mapstructure:"in_other_l4_bytes"`
-			InOtherL4Packets           int64       `mapstructure:"in_other_l4_packets"`
-			InTcpBytes                 int64       `mapstructure:"in_tcp_bytes"`
-			InTcpPackets               int64       `mapstructure:"in_tcp_packets"`
-			InUdpBytes                 int64       `mapstructure:"in_udp_bytes"`
-			InUdpPackets               int64       `mapstructure:"in_udp_packets"`
-			InBytes                    int64       `mapstructure:"in_bytes"`
-			InPackets                  int64       `mapstructure:"in_packets"`
-			OutIpv4Bytes               int64       `mapstructure:"out_ipv4_bytes"`
-			OutIpv4Packets             int64       `mapstructure:"out_ipv4_packets"`
-			OutIpv6Bytes               int64       `mapstructure:"out_ipv6_bytes"`
-			OutIpv6Packets             int64       `mapstructure:"out_ipv6_packets"`
-			OutOtherL4Bytes            int64       `mapstructure:"out_other_l4_bytes"`
-			OutOtherL4Packets          int64       `mapstructure:"out_other_l4_packets"`
-			OutTcpBytes                int64       `mapstructure:"out_tcp_bytes"`
-			OutTcpPackets              int64       `mapstructure:"out_tcp_packets"`
-			OutUdpBytes                int64       `mapstructure:"out_udp_bytes"`
-			OutUdpPackets              int64       `mapstructure:"out_udp_packets"`
-			OutBytes                   int64       `mapstructure:"out_bytes"`
-			OutPackets                 int64       `mapstructure:"out_packets"`
-			TopInSrcIpsBytes           []NameCount `mapstructure:"top_in_src_ips_bytes"`
-			TopInSrcIpsPackets         []NameCount `mapstructure:"top_in_src_ips_packets"`
-			TopInSrcPortsBytes         []NameCount `mapstructure:"top_in_src_ports_bytes"`
-			TopInSrcPortsPackets       []NameCount `mapstructure:"top_in_src_ports_packets"`
-			TopInSrcIpsAndPortBytes    []NameCount `mapstructure:"top_in_src_ips_and_port_bytes"`
-			TopInSrcIpsAndPortPackets  []NameCount `mapstructure:"top_in_src_ips_and_port_packets"`
-			TopInDstIpsBytes           []NameCount `mapstructure:"top_in_dst_ips_bytes"`
-			TopInDstIpsPackets         []NameCount `mapstructure:"top_in_dst_ips_packets"`
-			TopInDstPortsBytes         []NameCount `mapstructure:"top_in_dst_ports_bytes"`
-			TopInDstPortsPackets       []NameCount `mapstructure:"top_in_dst_ports_packets"`
-			TopInDstIpsAndPortBytes    []NameCount `mapstructure:"top_in_dst_ips_and_port_bytes"`
-			TopInDstIpsAndPortPackets  []NameCount `mapstructure:"top_in_dst_ips_and_port_packets"`
-			TopOutSrcIpsBytes          []NameCount `mapstructure:"top_out_src_ips_bytes"`
-			TopOutSrcIpsPackets        []NameCount `mapstructure:"top_out_src_ips_packets"`
-			TopOutSrcPortsBytes        []NameCount `mapstructure:"top_out_src_ports_bytes"`
-			TopOutSrcPortsPackets      []NameCount `mapstructure:"top_out_src_ports_packets"`
-			TopOutSrcIpsAndPortBytes   []NameCount `mapstructure:"top_out_src_ips_and_port_bytes"`
-			TopOutSrcIpsAndPortPackets []NameCount `mapstructure:"top_out_src_ips_and_port_packets"`
-			TopOutDstIpsBytes          []NameCount `mapstructure:"top_out_dst_ips_bytes"`
-			TopOutDstIpsPackets        []NameCount `mapstructure:"top_out_dst_ips_packets"`
-			TopOutDstPortsBytes        []NameCount `mapstructure:"top_out_dst_ports_bytes"`
-			TopOutDstPortsPackets      []NameCount `mapstructure:"top_out_dst_ports_packets"`
-			TopOutDstIpsAndPortBytes   []NameCount `mapstructure:"top_out_dst_ips_and_port_bytes"`
-			TopOutDstIpsAndPortPackets []NameCount `mapstructure:"top_out_dst_ips_and_port_packets"`
-			TopConversationsBytes      []NameCount `mapstructure:"top_conversations_bytes"`
-			TopConversationsPackets    []NameCount `mapstructure:"top_conversations_packets"`
-			TopGeoLocBytes             []NameCount `mapstructure:"top_geo_loc_bytes"`
-			TopGeoLocPackets           []NameCount `mapstructure:"top_geo_loc_packets"`
-			TopAsnBytes                []NameCount `mapstructure:"top_ASN_bytes"`
-			TopAsnPackets              []NameCount `mapstructure:"top_ASN_packets"`
-		} `mapstructure:"interfaces"`
-	} `mapstructure:"devices"`
-	Period PeriodPayload `mapstructure:"period"`
-}
-
-// StatSnapshot is a snapshot of a given period from pktvisord
-type StatSnapshot struct {
-	DNS     *DNSPayload    `mapstructure:"DNS,omitempty"`
-	DHCP    *DHCPPayload   `mapstructure:"DHCP,omitempty"`
-	Packets *PacketPayload `mapstructure:"Packets,omitempty"`
-	Pcap    *PcapPayload   `mapstructure:"Pcap,omitempty"`
-	Flow    *FlowPayload   `mapstructure:"Flow,omitempty"`
-}
diff --git a/sinker/config_state_check.go b/sinker/config_state_check.go
deleted file mode 100644
index 7a6301805..000000000
--- a/sinker/config_state_check.go
+++ /dev/null
@@ -1,63 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package sinker
-
-import (
-	"time"
-
-	"github.com/orb-community/orb/sinker/config"
-	"go.uber.org/zap"
-)
-
-const (
-	streamID       = "orb.sinker"
-	streamLen      = 1000
-	CheckerFreq    = 5 * time.Minute
-	DefaultTimeout = 5 * time.Minute
-)
-
-func (svc *SinkerService) checkState(_ time.Time) {
-	owners, err := svc.sinkerCache.GetAllOwners()
-	if err != nil {
-		svc.logger.Error("failed to retrieve the list of owners")
-		return
-	}
-
-	for _, ownerID := range owners {
-		configs, err := svc.sinkerCache.GetAll(ownerID)
-		if err != nil {
-			svc.logger.Error("unable to retrieve policy state", zap.Error(err))
-			return
-		}
-		for _, cfg := range configs {
-			// Set idle if the sinker is more than 30 minutes not sending metrics (Remove from Redis)
-			if cfg.LastRemoteWrite.Add(DefaultTimeout).Before(time.Now()) {
-				if cfg.State == config.Active {
-					if v, ok := cfg.Config["opentelemetry"]; !ok || v != "enabled" {
-						if err := svc.sinkerCache.Remove(cfg.OwnerID, cfg.SinkID); err != nil {
-							svc.logger.Error("error updating sink config cache", zap.Error(err))
-							return
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-func (svc *SinkerService) checkSinker() {
-	svc.checkState(time.Now())
-	for {
-		select {
-		case <-svc.hbDone:
-			svc.otelMetricsCancelFunct()
-			svc.otelLogsCancelFunct()
-			svc.cancelAsyncContext()
-			return
-		case t := <-svc.hbTicker.C:
-			svc.checkState(t)
-		}
-	}
-}
diff --git a/sinker/message_handler.go b/sinker/message_handler.go
deleted file mode 100644
index 7db500b25..000000000
--- a/sinker/message_handler.go
+++ /dev/null
@@ -1,306 +0,0 @@
-package sinker
-
-import (
-	"context"
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/google/uuid"
-	"github.com/mainflux/mainflux/pkg/messaging"
-	"github.com/orb-community/orb/fleet"
-	"github.com/orb-community/orb/fleet/pb"
-	"github.com/orb-community/orb/pkg/types"
-	pb2 "github.com/orb-community/orb/policies/pb"
-	"github.com/orb-community/orb/sinker/backend"
-	"github.com/orb-community/orb/sinker/config"
-	"github.com/orb-community/orb/sinker/prometheus"
-	pb3 "github.com/orb-community/orb/sinks/pb"
-	"go.uber.org/zap"
-)
-
-func (svc SinkerService) remoteWriteToPrometheus(tsList prometheus.TSList, ownerID string, sinkID string) error {
-	cfgRepo, err := svc.sinkerCache.Get(ownerID, sinkID)
-	if err != nil {
-		svc.logger.Error("unable to retrieve the sink config", zap.Error(err))
-		return err
-	}
-	ctx := context.Background()
-	otelMetadata, ok := cfgRepo.Config["opentelemetry"]
-	if ok && otelMetadata == "enabled" {
-		svc.logger.Info("deprecate warning opentelemetry sink scraping legacy agent", zap.String("sink-ID", cfgRepo.SinkID))
-		ctx = context.WithValue(ctx, "deprecation", "opentelemetry")
-	}
-	configMetadata := cfgRepo.Config.GetSubMetadata("exporter")
-	if configMetadata == nil {
-		svc.logger.Error("unable to find prometheus remote host", zap.Error(err))
-		return err
-	}
-	cfg := prometheus.NewConfig(
-		prometheus.WriteURLOption(configMetadata["remote_host"].(string)),
-	)
-
-	promClient, err := prometheus.NewClient(cfg)
-	if err != nil {
-		svc.logger.Error("unable to construct client", zap.Error(err))
-		return err
-	}
-	authMetadata := cfgRepo.Config.GetSubMetadata("authentication")
-	if authMetadata == nil {
-		svc.logger.Error("unable to find prometheus remote host", zap.Error(err))
-		return err
-	}
-	var headers = make(map[string]string)
-	headers["Authorization"] = svc.encodeBase64(authMetadata["username"].(string), authMetadata["password"].(string))
-	result, writeErr := promClient.WriteTimeSeries(ctx, tsList, prometheus.WriteOptions{Headers: headers})
-	if err := error(writeErr); err != nil {
-		if cfgRepo.Msg != fmt.Sprint(err) {
-			cfgRepo.State = config.Error
-			cfgRepo.Msg = fmt.Sprint(err)
-			cfgRepo.LastRemoteWrite = time.Now()
-			err := svc.sinkerCache.Edit(cfgRepo)
-			if err != nil {
-				svc.logger.Error("error during update sink cache", zap.Error(err))
-				return err
-			}
-		}
-
-		svc.logger.Error("remote write error", zap.String("sink_id", sinkID), zap.Error(err))
-		return err
-	}
-
-	svc.logger.Debug("successful sink", zap.Int("payload_size_b", result.PayloadSize),
-		zap.String("sink_id", sinkID))
-
-	if cfgRepo.State != config.Active {
-		cfgRepo.State = config.Active
-		cfgRepo.Msg = ""
-		cfgRepo.LastRemoteWrite = time.Now()
-		err := svc.sinkerCache.Edit(cfgRepo)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (svc SinkerService) encodeBase64(user string, password string) string {
-	defer func(t time.Time) {
-		svc.logger.Debug("encodeBase64 took", zap.String("execution", time.Since(t).String()))
-	}(time.Now())
-	sEnc := base64.URLEncoding.EncodeToString([]byte(user + ":" + password))
-	return fmt.Sprintf("Basic %s", sEnc)
-}
-
-func (svc SinkerService) handleMetrics(ctx context.Context, agentID string, channelID string, subtopic string, payload []byte) error {
-
-	// find backend to send it to
-	beName := strings.Split(subtopic, ".")
-	if len(beName) < 3 || beName[0] != "be" || beName[2] != "m" {
-		return errors.New(fmt.Sprintf("invalid subtopic, ignoring: %s", subtopic))
-	}
-	if !backend.HaveBackend(beName[1]) {
-		return errors.New(fmt.Sprintf("unknown agent backend, ignoring: %s", beName[1]))
-	}
-	be := backend.GetBackend(beName[1])
-
-	// unpack metrics RPC
-	var versionCheck fleet.SchemaVersionCheck
-	if err := json.Unmarshal(payload, &versionCheck); err != nil {
-		return fleet.ErrSchemaMalformed
-	}
-	if versionCheck.SchemaVersion != fleet.CurrentRPCSchemaVersion {
-		return fleet.ErrSchemaVersion
-	}
-	var rpc fleet.RPC
-	if err := json.Unmarshal(payload, &rpc); err != nil {
-		return fleet.ErrSchemaMalformed
-	}
-	if rpc.Func != fleet.AgentMetricsRPCFunc {
-		return errors.New(fmt.Sprintf("unexpected RPC function: %s", rpc.Func))
-	}
-	var metricsRPC fleet.AgentMetricsRPC
-	if err := json.Unmarshal(payload, &metricsRPC); err != nil {
-		return fleet.ErrSchemaMalformed
-	}
-
-	agentPb, err := svc.ExtractAgent(ctx, channelID)
-	if err != nil {
-		return err
-	}
-
-	agentName, err := types.NewIdentifier(agentPb.AgentName)
-	if err != nil {
-		return err
-	}
-	agent := fleet.Agent{
-		Name:        agentName,
-		MFOwnerID:   agentPb.OwnerID,
-		MFThingID:   agentID,
-		MFChannelID: channelID,
-		OrbTags:     (*types.Tags)(&agentPb.OrbTags),
-		AgentTags:   agentPb.AgentTags,
-	}
-
-	for _, metricsPayload := range metricsRPC.Payload {
-		// this payload loop is per policy. each policy has a list of datasets it is associated with, and each dataset may contain multiple sinks
-		// however, per policy, we want a unique set of sink IDs as we don't want to send the same metrics twice to the same sink for the same policy
-		datasetSinkIDs := make(map[string]bool)
-		// first go through the datasets and gather the unique set of sinks we need for this particular policy
-		err = svc.GetSinks(agent, metricsPayload, datasetSinkIDs)
-		if err != nil {
-			return err
-		}
-
-		// ensure there are sinks
-		if len(datasetSinkIDs) == 0 {
-			svc.logger.Error("unable to attach any sinks to policy", zap.String("policy_id", metricsPayload.PolicyID), zap.String("agent_id", agentID), zap.String("owner_id", agent.MFOwnerID))
-			continue
-		}
-
-		// now that we have the sinks, process the metrics for this policy
-		tsList, err := be.ProcessMetrics(agentPb, agentID, metricsPayload)
-		if err != nil {
-			svc.logger.Error("ProcessMetrics failed", zap.String("policy_id", metricsPayload.PolicyID), zap.String("agent_id", agentID), zap.String("owner_id", agent.MFOwnerID), zap.Error(err))
-			continue
-		}
-
-		// finally, sink this policy
-		svc.SinkPolicy(agent, metricsPayload, datasetSinkIDs, tsList)
-	}
-
-	return nil
-}
-
-func (svc SinkerService) ExtractAgent(ctx context.Context, channelID string) (*pb.AgentInfoRes, error) {
-	agentPb, err := svc.fleetClient.RetrieveAgentInfoByChannelID(ctx, &pb.AgentInfoByChannelIDReq{Channel: channelID})
-	if err != nil {
-		return nil, err
-	}
-	return agentPb, nil
-}
-
-func (svc SinkerService) SinkPolicy(agent fleet.Agent, metricsPayload fleet.AgentMetricsRPCPayload, datasetSinkIDs map[string]bool, tsList []prometheus.TimeSeries) {
-	sinkIDList := make([]string, len(datasetSinkIDs))
-	i := 0
-	for k := range datasetSinkIDs {
-		sinkIDList[i] = k
-		i++
-	}
-	svc.logger.Info("sinking agent metric RPC",
-		zap.String("owner_id", agent.MFOwnerID),
-		zap.String("agent", agent.Name.String()),
-		zap.String("policy", metricsPayload.PolicyName),
-		zap.String("policy_id", metricsPayload.PolicyID),
-		zap.Strings("sinks", sinkIDList))
-
-	for _, id := range sinkIDList {
-		err := svc.remoteWriteToPrometheus(tsList, agent.MFOwnerID, id)
-		if err != nil {
-			svc.logger.Warn(fmt.Sprintf("unable to remote write to sinkID: %s", id), zap.String("policy_id", metricsPayload.PolicyID), zap.String("agent_id", agent.MFThingID), zap.String("owner_id", agent.MFOwnerID), zap.Error(err))
-		}
-
-		// send operational metrics
-		labels := []string{
-			"method", "sinker_payload_size",
-			"agent_id", agent.MFThingID,
-			"agent", agent.Name.String(),
-			"policy_id", metricsPayload.PolicyID,
-			"policy", metricsPayload.PolicyName,
-			"sink_id", id,
-			"owner_id", agent.MFOwnerID,
-		}
-		svc.requestCounter.With(labels...).Add(1)
-		svc.requestGauge.With(labels...).Add(float64(len(metricsPayload.Data)))
-	}
-}
-
-func (svc SinkerService) GetSinks(agent fleet.Agent, agentMetricsRPCPayload fleet.AgentMetricsRPCPayload, datasetSinkIDs map[string]bool) error {
-	for _, ds := range agentMetricsRPCPayload.Datasets {
-		if ds == "" {
-			svc.logger.Error("malformed agent RPC: empty dataset", zap.String("agent_id", agent.MFThingID), zap.String("owner_id", agent.MFOwnerID))
-			continue
-		}
-		dataset, err := svc.policiesClient.RetrieveDataset(context.Background(), &pb2.DatasetByIDReq{
-			DatasetID: ds,
-			OwnerID:   agent.MFOwnerID,
-		})
-		if err != nil {
-			svc.logger.Error("unable to retrieve dataset", zap.String("dataset_id", ds), zap.String("owner_id", agent.MFOwnerID), zap.Error(err))
-			continue
-		}
-		for _, sid := range dataset.SinkIds {
-			if !svc.sinkerCache.Exists(agent.MFOwnerID, sid) {
-				// Use the retrieved sinkID to get the backend config
-				sink, err := svc.sinksClient.RetrieveSink(context.Background(), &pb3.SinkByIDReq{
-					SinkID:  sid,
-					OwnerID: agent.MFOwnerID,
-				})
-				if err != nil {
-					return err
-				}
-
-				var data config.SinkConfig
-				if err := json.Unmarshal(sink.Config, &data); err != nil {
-					return err
-				}
-
-				data.SinkID = sid
-				data.OwnerID = agent.MFOwnerID
-				err = svc.sinkerCache.Add(data)
-				if err != nil {
-					return err
-				}
-			}
-			datasetSinkIDs[sid] = true
-		}
-	}
-	return nil
-}
-
-func (svc SinkerService) handleMsgFromAgent(msg messaging.Message) error {
-	inputContext := context.WithValue(context.Background(), "trace-id", uuid.NewString())
-	go func(ctx context.Context) {
-		defer func(t time.Time) {
-			svc.logger.Info("message consumption time", zap.String("execution", time.Since(t).String()))
-		}(time.Now())
-		// NOTE: we need to consider ALL input from the agent as untrusted, the same as untrusted HTTP API would be
-		var payload map[string]interface{}
-		if err := json.Unmarshal(msg.Payload, &payload); err != nil {
-			svc.logger.Error("metrics processing failure", zap.Any("trace-id", ctx.Value("trace-id")), zap.Error(err))
-			return
-		}
-
-		svc.logger.Debug("received agent message",
-			zap.String("subtopic", msg.Subtopic),
-			zap.String("channel", msg.Channel),
-			zap.String("protocol", msg.Protocol),
-			zap.Int64("created", msg.Created),
-			zap.String("publisher", msg.Publisher))
-
-		labels := []string{
-			"method", "handleMsgFromAgent",
-			"agent_id", msg.Publisher,
-			"subtopic", msg.Subtopic,
-			"channel", msg.Channel,
-			"protocol", msg.Protocol,
-		}
-		svc.messageInputCounter.With(labels...).Add(1)
-
-		if len(msg.Payload) > MaxMsgPayloadSize {
-			svc.logger.Error("metrics processing failure", zap.Any("trace-id", ctx.Value("trace-id")), zap.Error(ErrPayloadTooBig))
-			return
-		}
-
-		if err := svc.handleMetrics(ctx, msg.Publisher, msg.Channel, msg.Subtopic, msg.Payload); err != nil {
-			svc.logger.Error("metrics processing failure", zap.Any("trace-id", ctx.Value("trace-id")), zap.Error(err))
-			return
-		}
-	}(inputContext)
-
-	return nil
-}
diff --git a/sinker/otel/bridgeservice/bridge.go b/sinker/otel/bridgeservice/bridge.go
index db8053531..bd348758e 100644
--- a/sinker/otel/bridgeservice/bridge.go
+++ b/sinker/otel/bridgeservice/bridge.go
@@ -2,9 +2,8 @@ package bridgeservice
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
-	"github.com/orb-community/orb/pkg/types"
+	"github.com/orb-community/orb/sinker/redis/producer"
 	sinkspb "github.com/orb-community/orb/sinks/pb"
 	"sort"
 	"time"
@@ -12,7 +11,6 @@ import (
 	"github.com/go-kit/kit/metrics"
 	fleetpb "github.com/orb-community/orb/fleet/pb"
 	policiespb "github.com/orb-community/orb/policies/pb"
-	"github.com/orb-community/orb/sinker/config"
 	"github.com/patrickmn/go-cache"
 	"go.uber.org/zap"
 )
@@ -28,7 +26,7 @@ type BridgeService interface {
 
 func NewBridgeService(logger *zap.Logger,
 	defaultCacheExpiration time.Duration,
-	sinkerCache config.ConfigRepo,
+	sinkActivity producer.SinkActivityProducer,
 	policiesClient policiespb.PolicyServiceClient,
 	sinksClient sinkspb.SinkServiceClient,
 	fleetClient fleetpb.FleetServiceClient, messageInputCounter metrics.Counter) SinkerOtelBridgeService {
@@ -36,7 +34,7 @@ func NewBridgeService(logger *zap.Logger,
 		defaultCacheExpiration: defaultCacheExpiration,
 		inMemoryCache:          *cache.New(defaultCacheExpiration, defaultCacheExpiration*2),
 		logger:                 logger,
-		sinkerCache:            sinkerCache,
+		sinkerActivitySvc:      sinkActivity,
 		policiesClient:         policiesClient,
 		fleetClient:            fleetClient,
 		sinksClient:            sinksClient,
@@ -48,14 +46,14 @@ type SinkerOtelBridgeService struct {
 	inMemoryCache          cache.Cache
 	defaultCacheExpiration time.Duration
 	logger                 *zap.Logger
-	sinkerCache            config.ConfigRepo
+	sinkerActivitySvc      producer.SinkActivityProducer
 	policiesClient         policiespb.PolicyServiceClient
 	fleetClient            fleetpb.FleetServiceClient
 	sinksClient            sinkspb.SinkServiceClient
 	messageInputCounter    metrics.Counter
 }
 
-// Implementar nova funcao
+// IncrementMessageCounter add to our metrics the number of messages received
 func (bs *SinkerOtelBridgeService) IncrementMessageCounter(publisher, subtopic, channel, protocol string) {
 	labels := []string{
 		"method", "handleMsgFromAgent",
@@ -67,71 +65,34 @@ func (bs *SinkerOtelBridgeService) IncrementMessageCounter(publisher, subtopic,
 	bs.messageInputCounter.With(labels...).Add(1)
 }
 
-func (bs *SinkerOtelBridgeService) NotifyActiveSink(ctx context.Context, mfOwnerId, sinkId, newState, message string) error {
-	cfgRepo, err := bs.sinkerCache.Get(mfOwnerId, sinkId)
-	if err != nil {
-		bs.logger.Error("unable to retrieve the sink config", zap.Error(err))
-		sinkData, _ := bs.sinksClient.RetrieveSink(ctx, &sinkspb.SinkByIDReq{
-			SinkID:  sinkId,
-			OwnerID: mfOwnerId,
-		})
-		var metadata types.Metadata
-		_ = json.Unmarshal(sinkData.Config, &metadata)
-		cfgRepo = config.SinkConfig{
-			SinkID:  sinkId,
-			OwnerID: mfOwnerId,
-			Config:  metadata,
-			State:   config.Active,
-			Msg:     "",
+// NotifyActiveSink notify the sinker that a sink is active
+func (bs *SinkerOtelBridgeService) NotifyActiveSink(ctx context.Context, mfOwnerId, sinkId, size string) error {
+	cacheKey := fmt.Sprintf("active_sink-%s-%s", mfOwnerId, sinkId)
+	_, found := bs.inMemoryCache.Get(cacheKey)
+	if !found {
+		bs.logger.Debug("notifying active sink", zap.String("sink_id", sinkId), zap.String("owner_id", mfOwnerId),
+			zap.String("payload_size", size))
+		event := producer.SinkActivityEvent{
+			OwnerID:   mfOwnerId,
+			SinkID:    sinkId,
+			State:     "active",
+			Size:      size,
+			Timestamp: time.Now(),
 		}
-		err = bs.sinkerCache.DeployCollector(ctx, cfgRepo)
+		err := bs.sinkerActivitySvc.PublishSinkActivity(ctx, event)
 		if err != nil {
-			bs.logger.Error("error during update sink cache", zap.String("sinkId", sinkId), zap.Error(err))
-			return err
-		}
-	}
-
-	// only updates sink state if status Idle or Unknown
-	if cfgRepo.State == config.Idle || cfgRepo.State == config.Unknown {
-		cfgRepo.LastRemoteWrite = time.Now()
-		// only deploy collector if new state is "active" and current state "not active"
-		if newState == "active" && cfgRepo.State != config.Active {
-			err = cfgRepo.State.SetFromString(newState)
-			if err != nil {
-				bs.logger.Error("unable to set state", zap.String("new_state", newState), zap.Error(err))
-				return err
-			}
-			err = bs.sinkerCache.AddActivity(mfOwnerId, sinkId)
-			if err != nil {
-				bs.logger.Error("error during update last remote write", zap.String("sinkId", sinkId), zap.Error(err))
-				return err
-			}
-			err = bs.sinkerCache.DeployCollector(ctx, cfgRepo)
-			if err != nil {
-				bs.logger.Error("error during update sink cache", zap.String("sinkId", sinkId), zap.Error(err))
-				return err
-			}
-			bs.logger.Info("waking up sink to active", zap.String("sinkID", sinkId), zap.String("newState", newState), zap.Any("currentState", cfgRepo.State))
-		} else {
-			err = bs.sinkerCache.AddActivity(mfOwnerId, sinkId)
-			if err != nil {
-				bs.logger.Error("error during update last remote write", zap.String("sinkId", sinkId), zap.Error(err))
-				return err
-			}
-			bs.logger.Info("registering sink activity", zap.String("sinkID", sinkId), zap.String("newState", newState), zap.Any("currentState", cfgRepo.State))
+			bs.logger.Error("error publishing sink activity", zap.Error(err))
 		}
+		bs.inMemoryCache.Set(cacheKey, true, cache.DefaultExpiration)
 	} else {
-		err = bs.sinkerCache.AddActivity(mfOwnerId, sinkId)
-		if err != nil {
-			bs.logger.Error("error during update last remote write", zap.String("sinkId", sinkId), zap.Error(err))
-			return err
-		}
-		bs.logger.Info("registering sink activity", zap.String("sinkID", sinkId), zap.String("newState", newState), zap.Any("currentState", cfgRepo.State))
+		bs.logger.Debug("active sink already notified", zap.String("sink_id", sinkId), zap.String("owner_id", mfOwnerId),
+			zap.String("payload_size", size))
 	}
 
 	return nil
 }
 
+// ExtractAgent retrieve agent info from fleet, or cache
 func (bs *SinkerOtelBridgeService) ExtractAgent(ctx context.Context, channelID string) (*fleetpb.AgentInfoRes, error) {
 	cacheKey := fmt.Sprintf("agent-%s", channelID)
 	value, found := bs.inMemoryCache.Get(cacheKey)
@@ -146,6 +107,7 @@ func (bs *SinkerOtelBridgeService) ExtractAgent(ctx context.Context, channelID s
 	return value.(*fleetpb.AgentInfoRes), nil
 }
 
+// GetPolicyName retrieve policy info from policies service, or cache.
 func (bs *SinkerOtelBridgeService) GetPolicyName(ctx context.Context, policyId, ownerID string) (*policiespb.PolicyRes, error) {
 	cacheKey := fmt.Sprintf("policy-%s", policyId)
 	value, found := bs.inMemoryCache.Get(cacheKey)
@@ -160,6 +122,7 @@ func (bs *SinkerOtelBridgeService) GetPolicyName(ctx context.Context, policyId,
 	return value.(*policiespb.PolicyRes), nil
 }
 
+// GetSinkIdsFromDatasetIDs retrieve sink_ids from datasets from policies service, or cache
 func (bs *SinkerOtelBridgeService) GetSinkIdsFromDatasetIDs(ctx context.Context, mfOwnerId string, datasetIDs []string) (map[string]string, error) {
 	// Here needs to retrieve datasets
 	mapSinkIdPolicy := make(map[string]string)
diff --git a/sinker/otel/kafkafanoutexporter/kafka_exporter.go b/sinker/otel/kafkafanoutexporter/kafka_exporter.go
index d07474126..cfb252d51 100644
--- a/sinker/otel/kafkafanoutexporter/kafka_exporter.go
+++ b/sinker/otel/kafkafanoutexporter/kafka_exporter.go
@@ -50,7 +50,7 @@ func (ke kafkaErrors) Error() string {
 func (e *kafkaTracesProducer) tracesPusher(ctx context.Context, td ptrace.Traces) error {
 	sinkId := ctx.Value("sink_id").(string)
 	topic := e.topic + "-" + sinkId
-	e.logger.Info("Pushing traces to kafka topic = " + topic)
+	e.logger.Debug("Pushing traces to kafka topic = " + topic)
 	messages, err := e.marshaler.Marshal(td, topic)
 	if err != nil {
 		return consumererror.NewPermanent(err)
@@ -83,7 +83,7 @@ type kafkaMetricsProducer struct {
 func (e *kafkaMetricsProducer) metricsDataPusher(ctx context.Context, md pmetric.Metrics) error {
 	sinkId := ctx.Value("sink_id").(string)
 	topic := e.topic + "-" + sinkId
-	e.logger.Info("Pushing metrics to kafka topic = " + topic)
+	e.logger.Debug("Pushing metrics to kafka topic = " + topic)
 	messages, err := e.marshaler.Marshal(md, topic)
 	if err != nil {
 		return consumererror.NewPermanent(err)
@@ -116,7 +116,7 @@ type kafkaLogsProducer struct {
 func (e *kafkaLogsProducer) logsDataPusher(ctx context.Context, ld plog.Logs) error {
 	sinkId := ctx.Value("sink_id").(string)
 	topic := e.topic + "-" + sinkId
-	e.logger.Info("Pushing logs to kafka topic = " + topic)
+	e.logger.Debug("Pushing logs to kafka topic = " + topic)
 	messages, err := e.marshaler.Marshal(ld, topic)
 	if err != nil {
 		return consumererror.NewPermanent(err)
diff --git a/sinker/otel/orbreceiver/logs.go b/sinker/otel/orbreceiver/logs.go
index 86f844499..d155f01e2 100644
--- a/sinker/otel/orbreceiver/logs.go
+++ b/sinker/otel/orbreceiver/logs.go
@@ -6,11 +6,12 @@ package orbreceiver
 
 import (
 	"context"
+	"go.opentelemetry.io/collector/receiver/receiverhelper"
+	"strconv"
 	"strings"
 
 	"github.com/mainflux/mainflux/pkg/messaging"
 	"go.opentelemetry.io/collector/consumer"
-	"go.opentelemetry.io/collector/obsreport"
 	"go.opentelemetry.io/collector/pdata/plog"
 	"go.opentelemetry.io/collector/pdata/plog/plogotlp"
 	"go.uber.org/zap"
@@ -19,7 +20,7 @@ import (
 type internalLogsReceiver struct {
 	plogotlp.UnimplementedGRPCServer
 	nextConsumer consumer.Logs
-	obsrecv      *obsreport.Receiver
+	obsrecv      *receiverhelper.ObsReport
 }
 
 func (r *OrbReceiver) MessageLogsInbound(msg messaging.Message) error {
@@ -31,6 +32,7 @@ func (r *OrbReceiver) MessageLogsInbound(msg messaging.Message) error {
 			zap.Int64("created", msg.Created),
 			zap.String("publisher", msg.Publisher))
 		r.cfg.Logger.Info("received log message, pushing to kafka exporter")
+		size := len(msg.Payload)
 		decompressedPayload := r.DecompressBrotli(msg.Payload)
 		lr, err := r.encoder.unmarshalLogsRequest(decompressedPayload)
 		if err != nil {
@@ -47,13 +49,13 @@ func (r *OrbReceiver) MessageLogsInbound(msg messaging.Message) error {
 
 		scopes := lr.Logs().ResourceLogs().At(0).ScopeLogs()
 		for i := 0; i < scopes.Len(); i++ {
-			r.ProccessLogsContext(scopes.At(i), msg.Channel)
+			r.ProccessLogsContext(scopes.At(i), msg.Channel, size)
 		}
 	}()
 	return nil
 }
 
-func (r *OrbReceiver) ProccessLogsContext(scope plog.ScopeLogs, channel string) {
+func (r *OrbReceiver) ProccessLogsContext(scope plog.ScopeLogs, channel string, size int) {
 	// Extract Datasets
 	attrDataset, ok := scope.Scope().Attributes().Get("dataset_ids")
 	if !ok {
@@ -107,7 +109,6 @@ func (r *OrbReceiver) ProccessLogsContext(scope plog.ScopeLogs, channel string)
 	attributeCtx = context.WithValue(attributeCtx, "agent_groups", agentPb.AgentGroupIDs)
 	attributeCtx = context.WithValue(attributeCtx, "agent_ownerID", agentPb.OwnerID)
 	for sinkId := range sinkIds {
-		err := r.cfg.SinkerService.NotifyActiveSink(r.ctx, agentPb.OwnerID, sinkId, "active", "")
 		if err != nil {
 			r.cfg.Logger.Error("error notifying logs sink active, changing state, skipping sink", zap.String("sink-id", sinkId), zap.Error(err))
 			continue
@@ -121,8 +122,10 @@ func (r *OrbReceiver) ProccessLogsContext(scope plog.ScopeLogs, channel string)
 		_, err = r.exportLogs(attributeCtx, request)
 		if err != nil {
 			r.cfg.Logger.Error("error during logs export, skipping sink", zap.Error(err))
-			_ = r.cfg.SinkerService.NotifyActiveSink(r.ctx, agentPb.OwnerID, sinkId, "error", err.Error())
+			_ = r.cfg.SinkerService.NotifyActiveSink(r.ctx, agentPb.OwnerID, sinkId, "0")
 			continue
+		} else {
+			_ = r.cfg.SinkerService.NotifyActiveSink(r.ctx, agentPb.OwnerID, sinkId, strconv.Itoa(size))
 		}
 	}
 }
diff --git a/sinker/otel/orbreceiver/metrics.go b/sinker/otel/orbreceiver/metrics.go
index 823c61741..aeca27062 100644
--- a/sinker/otel/orbreceiver/metrics.go
+++ b/sinker/otel/orbreceiver/metrics.go
@@ -6,12 +6,13 @@ package orbreceiver
 
 import (
 	"context"
+	"go.opentelemetry.io/collector/receiver/receiverhelper"
+	"strconv"
 	"strings"
 	"time"
 
 	"github.com/mainflux/mainflux/pkg/messaging"
 	"go.opentelemetry.io/collector/consumer"
-	"go.opentelemetry.io/collector/obsreport"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/pmetric"
 	"go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp"
@@ -21,7 +22,7 @@ import (
 type internalMetricsReceiver struct {
 	pmetricotlp.UnimplementedGRPCServer
 	nextConsumer consumer.Metrics
-	obsrecv      *obsreport.Receiver
+	obsrecv      *receiverhelper.ObsReport
 }
 
 func (r *OrbReceiver) MessageMetricsInbound(msg messaging.Message) error {
@@ -32,7 +33,8 @@ func (r *OrbReceiver) MessageMetricsInbound(msg messaging.Message) error {
 			zap.String("protocol", msg.Protocol),
 			zap.Int64("created", msg.Created),
 			zap.String("publisher", msg.Publisher))
-		r.cfg.Logger.Info("received metric message, pushing to kafka exporter")
+		r.cfg.Logger.Debug("received metric message, pushing to kafka exporter", zap.String("publisher", msg.Publisher))
+		size := len(msg.Payload)
 		decompressedPayload := r.DecompressBrotli(msg.Payload)
 		mr, err := r.encoder.unmarshalMetricsRequest(decompressedPayload)
 		if err != nil {
@@ -49,13 +51,13 @@ func (r *OrbReceiver) MessageMetricsInbound(msg messaging.Message) error {
 
 		scopes := mr.Metrics().ResourceMetrics().At(0).ScopeMetrics()
 		for i := 0; i < scopes.Len(); i++ {
-			r.ProccessMetricsContext(scopes.At(i), msg.Channel)
+			r.ProccessMetricsContext(scopes.At(i), msg.Channel, size)
 		}
 	}()
 	return nil
 }
 
-func (r *OrbReceiver) ProccessMetricsContext(scope pmetric.ScopeMetrics, channel string) {
+func (r *OrbReceiver) ProccessMetricsContext(scope pmetric.ScopeMetrics, channel string, size int) {
 	// Extract Datasets
 	attrDataset, ok := scope.Scope().Attributes().Get("dataset_ids")
 	if !ok {
@@ -110,8 +112,9 @@ func (r *OrbReceiver) ProccessMetricsContext(scope pmetric.ScopeMetrics, channel
 	attributeCtx = context.WithValue(attributeCtx, "orb_tags", agentPb.OrbTags)
 	attributeCtx = context.WithValue(attributeCtx, "agent_groups", agentPb.AgentGroupIDs)
 	attributeCtx = context.WithValue(attributeCtx, "agent_ownerID", agentPb.OwnerID)
+
 	for sinkId := range sinkIds {
-		err := r.cfg.SinkerService.NotifyActiveSink(r.ctx, agentPb.OwnerID, sinkId, "active", "")
+		err := r.cfg.SinkerService.NotifyActiveSink(r.ctx, agentPb.OwnerID, sinkId, strconv.Itoa(size))
 		if err != nil {
 			r.cfg.Logger.Error("error notifying metrics sink active, changing state, skipping sink", zap.String("sink-id", sinkId), zap.Error(err))
 		}
@@ -124,7 +127,6 @@ func (r *OrbReceiver) ProccessMetricsContext(scope pmetric.ScopeMetrics, channel
 		_, err = r.exportMetrics(attributeCtx, request)
 		if err != nil {
 			r.cfg.Logger.Error("error during metrics export, skipping sink", zap.Error(err))
-			_ = r.cfg.SinkerService.NotifyActiveSink(r.ctx, agentPb.OwnerID, sinkId, "error", err.Error())
 			continue
 		}
 	}
diff --git a/sinker/otel/orbreceiver/otlp.go b/sinker/otel/orbreceiver/otlp.go
index 5a23a70c3..230a010bc 100644
--- a/sinker/otel/orbreceiver/otlp.go
+++ b/sinker/otel/orbreceiver/otlp.go
@@ -18,6 +18,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"go.opentelemetry.io/collector/receiver/receiverhelper"
 	"io"
 	"sync"
 
@@ -25,7 +26,6 @@ import (
 	"github.com/orb-community/orb/sinker/otel/bridgeservice"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/consumer"
-	"go.opentelemetry.io/collector/obsreport"
 	"go.opentelemetry.io/collector/receiver"
 	"go.uber.org/zap"
 )
@@ -101,7 +101,7 @@ func (r *OrbReceiver) registerMetricsConsumer(mc consumer.Metrics) error {
 		r.ctx = context.Background()
 	}
 	var err error
-	obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{
+	obsrecv, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{
 		ReceiverID:             component.NewIDWithName("otlp", "metrics"),
 		Transport:              "grpc",
 		ReceiverCreateSettings: r.settings,
@@ -131,7 +131,7 @@ func (r *OrbReceiver) registerLogsConsumer(lc consumer.Logs) error {
 		r.ctx = context.Background()
 	}
 	var err error
-	obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{
+	obsrecv, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{
 		ReceiverID:             component.NewIDWithName("otlp", "logs"),
 		Transport:              "grpc",
 		ReceiverCreateSettings: r.settings,
@@ -161,7 +161,7 @@ func (r *OrbReceiver) registerTracesConsumer(tc consumer.Traces) error {
 		r.ctx = context.Background()
 	}
 	var err error
-	obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{
+	obsrecv, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{
 		ReceiverID:             component.NewIDWithName("otlp", "traces"),
 		Transport:              "grpc",
 		ReceiverCreateSettings: r.settings,
diff --git a/sinker/otel/orbreceiver/traces.go b/sinker/otel/orbreceiver/traces.go
index 13486c32d..a13d97285 100644
--- a/sinker/otel/orbreceiver/traces.go
+++ b/sinker/otel/orbreceiver/traces.go
@@ -6,11 +6,12 @@ package orbreceiver
 
 import (
 	"context"
+	"go.opentelemetry.io/collector/receiver/receiverhelper"
+	"strconv"
 	"strings"
 
 	"github.com/mainflux/mainflux/pkg/messaging"
 	"go.opentelemetry.io/collector/consumer"
-	"go.opentelemetry.io/collector/obsreport"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 	"go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp"
 	"go.uber.org/zap"
@@ -19,7 +20,7 @@ import (
 type internalTracesReceiver struct {
 	ptraceotlp.UnimplementedGRPCServer
 	nextConsumer consumer.Traces
-	obsrecv      *obsreport.Receiver
+	obsrecv      *receiverhelper.ObsReport
 }
 
 func (r *OrbReceiver) MessageTracesInbound(msg messaging.Message) error {
@@ -31,6 +32,7 @@ func (r *OrbReceiver) MessageTracesInbound(msg messaging.Message) error {
 			zap.Int64("created", msg.Created),
 			zap.String("publisher", msg.Publisher))
 		r.cfg.Logger.Info("received trace message, pushing to kafka exporter")
+		size := len(msg.Payload)
 		decompressedPayload := r.DecompressBrotli(msg.Payload)
 		tr, err := r.encoder.unmarshalTracesRequest(decompressedPayload)
 		if err != nil {
@@ -47,13 +49,13 @@ func (r *OrbReceiver) MessageTracesInbound(msg messaging.Message) error {
 
 		scopes := tr.Traces().ResourceSpans().At(0).ScopeSpans()
 		for i := 0; i < scopes.Len(); i++ {
-			r.ProccessTracesContext(scopes.At(i), msg.Channel)
+			r.ProccessTracesContext(scopes.At(i), msg.Channel, size)
 		}
 	}()
 	return nil
 }
 
-func (r *OrbReceiver) ProccessTracesContext(scope ptrace.ScopeSpans, channel string) {
+func (r *OrbReceiver) ProccessTracesContext(scope ptrace.ScopeSpans, channel string, size int) {
 	// Extract Datasets
 	attrDataset, ok := scope.Scope().Attributes().Get("dataset_ids")
 	if !ok {
@@ -106,8 +108,9 @@ func (r *OrbReceiver) ProccessTracesContext(scope ptrace.ScopeSpans, channel str
 	attributeCtx = context.WithValue(attributeCtx, "orb_tags", agentPb.OrbTags)
 	attributeCtx = context.WithValue(attributeCtx, "agent_groups", agentPb.AgentGroupIDs)
 	attributeCtx = context.WithValue(attributeCtx, "agent_ownerID", agentPb.OwnerID)
+
 	for sinkId := range sinkIds {
-		err := r.cfg.SinkerService.NotifyActiveSink(r.ctx, agentPb.OwnerID, sinkId, "active", "")
+		err := r.cfg.SinkerService.NotifyActiveSink(r.ctx, agentPb.OwnerID, sinkId, strconv.Itoa(size))
 		if err != nil {
 			r.cfg.Logger.Error("error notifying sink active, changing state, skipping sink", zap.String("sink-id", sinkId), zap.Error(err))
 			continue
@@ -121,7 +124,6 @@ func (r *OrbReceiver) ProccessTracesContext(scope ptrace.ScopeSpans, channel str
 		_, err = r.exportTraces(attributeCtx, request)
 		if err != nil {
 			r.cfg.Logger.Error("error during export, skipping sink", zap.Error(err))
-			_ = r.cfg.SinkerService.NotifyActiveSink(r.ctx, agentPb.OwnerID, sinkId, "error", err.Error())
 			continue
 		}
 	}
@@ -146,7 +148,7 @@ func (r *OrbReceiver) exportTraces(ctx context.Context, req ptraceotlp.ExportReq
 
 	ctx = r.tracesReceiver.obsrecv.StartTracesOp(ctx)
 	err := r.tracesReceiver.nextConsumer.ConsumeTraces(ctx, ts)
-	r.logsReceiver.obsrecv.EndTracesOp(ctx, dataFormatProtobuf, spanCount, err)
+	r.tracesReceiver.obsrecv.EndTracesOp(ctx, dataFormatProtobuf, spanCount, err)
 
 	return ptraceotlp.NewExportResponse(), err
 }
diff --git a/sinker/prometheus/client.go b/sinker/prometheus/client.go
deleted file mode 100644
index 211224770..000000000
--- a/sinker/prometheus/client.go
+++ /dev/null
@@ -1,301 +0,0 @@
-// Copyright (c) 2019 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package prometheus
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"time"
-
-	"github.com/golang/protobuf/proto"
-	"github.com/golang/snappy"
-	"github.com/prometheus/prometheus/prompb"
-)
-
-const (
-	defaulHTTPClientTimeout = 10 * time.Second
-	defaultUserAgent        = "orb-promremote-go/1.0.0"
-)
-
-// DefaultConfig represents the default configuration used to construct a client.
-var DefaultConfig = Config{
-	HTTPClientTimeout: defaulHTTPClientTimeout,
-	UserAgent:         defaultUserAgent,
-}
-
-// Label is a metric label.
-type Label struct {
-	Name  string
-	Value string
-}
-
-// TimeSeries are made of labels and a datapoint.
-type TimeSeries struct {
-	Labels    []Label
-	Datapoint Datapoint
-}
-
-// TSList is a slice of TimeSeries.
-type TSList []TimeSeries
-
-// A Datapoint is a single data value reported at a given time.
-type Datapoint struct {
-	Timestamp time.Time
-	Value     float64
-}
-
-// Client is used to write timeseries data to a Prom remote write endpoint
-type Client interface {
-	// WriteProto writes the Prom proto WriteRequest to the specified endpoint.
-	WriteProto(
-		ctx context.Context,
-		req *prompb.WriteRequest,
-		opts WriteOptions,
-	) (WriteResult, WriteError)
-
-	// WriteTimeSeries converts the []TimeSeries to Protobuf then writes it to the specified endpoint.
-	WriteTimeSeries(
-		ctx context.Context,
-		ts TSList,
-		opts WriteOptions,
-	) (WriteResult, WriteError)
-}
-
-// WriteOptions specifies additional write options.
-type WriteOptions struct {
-	// Headers to append or override the outgoing headers.
-	Headers map[string]string
-}
-
-// WriteResult returns the successful HTTP status code.
-type WriteResult struct {
-	StatusCode  int
-	PayloadSize int
-}
-
-// WriteError is an error that can also return the HTTP status code
-// if the response is what caused an error.
-type WriteError interface {
-	error
-	StatusCode() int
-}
-
-// Config defines the configuration used to construct a client.
-type Config struct {
-	// WriteURL is the URL which the client uses to write to prometheus.
-	WriteURL string `yaml:"writeURL"`
-
-	//HTTPClientTimeout is the timeout that is set for the client.
-	HTTPClientTimeout time.Duration `yaml:"httpClientTimeout"`
-
-	// If not nil, http client is used instead of constructing one.
-	HTTPClient *http.Client
-
-	// UserAgent is the `User-Agent` header in the request.
-	UserAgent string `yaml:"userAgent"`
-}
-
-// ConfigOption defines a config option that can be used when constructing a client.
-type ConfigOption func(*Config)
-
-// NewConfig creates a new Config struct based on options passed to the function.
-func NewConfig(opts ...ConfigOption) Config {
-	cfg := DefaultConfig
-	for _, opt := range opts {
-		opt(&cfg)
-	}
-
-	return cfg
-}
-
-func (c Config) validate() error {
-	if c.HTTPClientTimeout <= 0 {
-		return fmt.Errorf("http client timeout should be greater than 0: %d", c.HTTPClientTimeout)
-	}
-
-	if c.UserAgent == "" {
-		return errors.New("User-Agent should not be blank")
-	}
-
-	return nil
-}
-
-// WriteURLOption sets the URL which the client uses to write to prometheus.
-func WriteURLOption(writeURL string) ConfigOption {
-	return func(c *Config) {
-		c.WriteURL = writeURL
-	}
-}
-
-// HTTPClientTimeoutOption sets the timeout that is set for the client.
-func HTTPClientTimeoutOption(httpClientTimeout time.Duration) ConfigOption {
-	return func(c *Config) {
-		c.HTTPClientTimeout = httpClientTimeout
-	}
-}
-
-// HTTPClientOption sets the HTTP client that is set for the client.
-func HTTPClientOption(httpClient *http.Client) ConfigOption {
-	return func(c *Config) {
-		c.HTTPClient = httpClient
-	}
-}
-
-// UserAgent sets the `User-Agent` header in the request.
-func UserAgent(userAgent string) ConfigOption {
-	return func(c *Config) {
-		c.UserAgent = userAgent
-	}
-}
-
-type client struct {
-	writeURL   string
-	httpClient *http.Client
-	userAgent  string
-}
-
-// NewClient creates a new remote write coordinator client.
-func NewClient(c Config) (Client, error) {
-	if err := c.validate(); err != nil {
-		return nil, err
-	}
-
-	httpClient := &http.Client{
-		Timeout: c.HTTPClientTimeout,
-	}
-
-	if c.HTTPClient != nil {
-		httpClient = c.HTTPClient
-	}
-
-	return &client{
-		writeURL:   c.WriteURL,
-		httpClient: httpClient,
-	}, nil
-}
-
-func (c *client) WriteTimeSeries(
-	ctx context.Context,
-	seriesList TSList,
-	opts WriteOptions,
-) (WriteResult, WriteError) {
-	return c.WriteProto(ctx, seriesList.toPromWriteRequest(), opts)
-}
-
-func (c *client) WriteProto(
-	ctx context.Context,
-	promWR *prompb.WriteRequest,
-	opts WriteOptions,
-) (WriteResult, WriteError) {
-	var result WriteResult
-	data, err := proto.Marshal(promWR)
-	if err != nil {
-		return result, writeError{err: fmt.Errorf("unable to marshal protobuf: %v", err)}
-	}
-
-	encoded := snappy.Encode(nil, data)
-	result.PayloadSize = len(encoded)
-
-	body := bytes.NewReader(encoded)
-	req, err := http.NewRequest("POST", c.writeURL, body)
-	if err != nil {
-		return result, writeError{err: err}
-	}
-
-	req.Header.Set("Content-Type", "application/x-protobuf")
-	req.Header.Set("Content-Encoding", "snappy")
-	req.Header.Set("User-Agent", c.userAgent)
-	req.Header.Set("X-Prometheus-Remote-Write-Version", "0.1.0")
-	if opts.Headers != nil {
-		for k, v := range opts.Headers {
-			req.Header.Set(k, v)
-		}
-	}
-
-	resp, err := c.httpClient.Do(req.WithContext(ctx))
-	if err != nil {
-		return result, writeError{err: err}
-	}
-
-	result.StatusCode = resp.StatusCode
-
-	defer resp.Body.Close()
-
-	if result.StatusCode < 200 || result.StatusCode > 299 {
-		writeErr := writeError{
-			err:  fmt.Errorf("expected 2xx status code: actual=%d", resp.StatusCode),
-			code: result.StatusCode,
-		}
-
-		body, err := ioutil.ReadAll(resp.Body)
-		if err != nil {
-			writeErr.err = fmt.Errorf("%v, body_read_error=%s", writeErr.err, err)
-			return result, writeErr
-		}
-
-		writeErr.err = fmt.Errorf("%v, body=%s", writeErr.err, body)
-		return result, writeErr
-	}
-
-	return result, nil
-}
-
-// toPromWriteRequest converts a list of timeseries to a Prometheus proto write request.
-func (t TSList) toPromWriteRequest() *prompb.WriteRequest {
-	promTS := make([]prompb.TimeSeries, len(t))
-
-	for i, ts := range t {
-		labels := make([]prompb.Label, len(ts.Labels))
-		for j, label := range ts.Labels {
-			labels[j] = prompb.Label{Name: label.Name, Value: label.Value}
-		}
-
-		sample := []prompb.Sample{prompb.Sample{
-			// Timestamp is int milliseconds for remote write.
-			Timestamp: ts.Datapoint.Timestamp.UnixNano() / int64(time.Millisecond),
-			Value:     ts.Datapoint.Value,
-		}}
-		promTS[i] = prompb.TimeSeries{Labels: labels, Samples: sample}
-	}
-
-	return &prompb.WriteRequest{
-		Timeseries: promTS,
-	}
-}
-
-type writeError struct {
-	err  error
-	code int
-}
-
-func (e writeError) Error() string {
-	return e.err.Error()
-}
-
-// StatusCode returns the HTTP status code of the error if error
-// was caused by the response, otherwise it will be just zero.
-func (e writeError) StatusCode() int {
-	return e.code
-}
diff --git a/sinker/redis/consumer/docs.go b/sinker/redis/consumer/docs.go
deleted file mode 100644
index b78b46cb0..000000000
--- a/sinker/redis/consumer/docs.go
+++ /dev/null
@@ -1 +0,0 @@
-package consumer
diff --git a/sinker/redis/consumer/sink_key_expire.go b/sinker/redis/consumer/sink_key_expire.go
new file mode 100644
index 000000000..8e2318c27
--- /dev/null
+++ b/sinker/redis/consumer/sink_key_expire.go
@@ -0,0 +1,73 @@
+package consumer
+
+import (
+	"context"
+	"strconv"
+
+	"github.com/go-redis/redis/v8"
+	"github.com/orb-community/orb/sinker/redis/producer"
+	"go.uber.org/zap"
+)
+
+type SinkerKeyExpirationListener interface {
+	// SubscribeToKeyExpiration Listen to the sinker key expiration
+	SubscribeToKeyExpiration(ctx context.Context) error
+	// ReceiveMessage to be used to receive the message from the sinker key expiration, async
+	ReceiveMessage(ctx context.Context, message string) error
+}
+
+type sinkerKeyExpirationListener struct {
+	logger           *zap.Logger
+	cacheRedisClient *redis.Client
+	idleProducer     producer.SinkIdleProducer
+}
+
+func NewSinkerKeyExpirationListener(l *zap.Logger, cacheRedisClient *redis.Client, idleProducer producer.SinkIdleProducer) SinkerKeyExpirationListener {
+	logger := l.Named("sinker_key_expiration_listener")
+	return &sinkerKeyExpirationListener{logger: logger, cacheRedisClient: cacheRedisClient, idleProducer: idleProducer}
+}
+
+// SubscribeToKeyExpiration to be used to subscribe to the sinker key expiration
+func (s *sinkerKeyExpirationListener) SubscribeToKeyExpiration(ctx context.Context) error {
+	go func() {
+		redisDB := strconv.Itoa(s.cacheRedisClient.Options().DB)
+		pubsub := s.cacheRedisClient.PSubscribe(ctx, "__keyevent@"+redisDB+"__:expired")
+		defer func(pubsub *redis.PubSub) {
+			_ = pubsub.Close()
+		}(pubsub)		
+		for {
+			select {
+			case <-ctx.Done():
+				return
+			default:
+				msg, _ := pubsub.ReceiveMessage(ctx)
+				s.logger.Info("key expired", zap.String("key", msg.Payload))
+				subCtx := context.WithValue(ctx, "msg", msg.Payload)
+				err := s.ReceiveMessage(subCtx, msg.Payload)
+				if err != nil {
+					s.logger.Error("error receiving message", zap.Error(err))
+					return
+				}
+			}
+		}
+	}()
+	return nil
+}
+
+// ReceiveMessage to be used to receive the message from the sinker key expiration
+func (s *sinkerKeyExpirationListener) ReceiveMessage(ctx context.Context, message string) error {
+	// goroutine
+	go func(msg string) {		
+		ownerID := message[15:51]
+		sinkID := message[52:]
+		event := producer.SinkIdleEvent{
+			OwnerID: ownerID,
+			SinkID:  sinkID,
+			State:   "idle",
+			Size:    "0",
+		}
+		s.logger.Info("publishing sink idle event", zap.Any("event", event))
+		_ = s.idleProducer.PublishSinkIdle(ctx, event)
+	}(message)
+	return nil
+}
diff --git a/sinker/redis/consumer/streams.go b/sinker/redis/consumer/streams.go
deleted file mode 100644
index 2faae6d84..000000000
--- a/sinker/redis/consumer/streams.go
+++ /dev/null
@@ -1,222 +0,0 @@
-package consumer
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"github.com/orb-community/orb/pkg/errors"
-	"time"
-
-	"github.com/go-redis/redis/v8"
-	"github.com/orb-community/orb/pkg/types"
-	"github.com/orb-community/orb/sinker"
-	"github.com/orb-community/orb/sinker/config"
-	"go.uber.org/zap"
-)
-
-const (
-	stream = "orb.sinks"
-	group  = "orb.sinker"
-
-	sinksPrefix = "sinks."
-	sinksUpdate = sinksPrefix + "update"
-	sinksCreate = sinksPrefix + "create"
-	sinksDelete = sinksPrefix + "remove"
-	exists      = "BUSYGROUP Consumer Group name already exists"
-)
-
-type Subscriber interface {
-	Subscribe(context context.Context) error
-}
-
-type eventStore struct {
-	otelEnabled   bool
-	sinkerService sinker.Service
-	configRepo    config.ConfigRepo
-	client        *redis.Client
-	esconsumer    string
-	logger        *zap.Logger
-}
-
-func (es eventStore) Subscribe(context context.Context) error {
-	subGroup := group
-	if es.otelEnabled {
-		subGroup = group + ".otel"
-	}
-	err := es.client.XGroupCreateMkStream(context, stream, subGroup, "$").Err()
-	if err != nil && err.Error() != exists {
-		return err
-	}
-
-	for {
-		streams, err := es.client.XReadGroup(context, &redis.XReadGroupArgs{
-			Group:    subGroup,
-			Consumer: es.esconsumer,
-			Streams:  []string{stream, ">"},
-			Count:    100,
-		}).Result()
-		if err != nil || len(streams) == 0 {
-			continue
-		}
-
-		for _, msg := range streams[0].Messages {
-			event := msg.Values
-
-			var err error
-			switch event["operation"] {
-			case sinksCreate:
-				rte, derr := decodeSinksCreate(event)
-				if derr != nil {
-					err = derr
-					break
-				}
-				err = es.handleSinksCreate(context, rte)
-			case sinksUpdate:
-				rte, derr := decodeSinksUpdate(event)
-				if derr != nil {
-					err = derr
-					break
-				}
-				err = es.handleSinksUpdate(context, rte)
-			case sinksDelete:
-				rte, derr := decodeSinksRemove(event)
-				if derr != nil {
-					err = derr
-					break
-				}
-				err = es.handleSinksRemove(context, rte)
-			}
-			if err != nil {
-				es.logger.Error("Failed to handle event", zap.String("operation", event["operation"].(string)), zap.Error(err))
-				continue
-			}
-			es.client.XAck(context, stream, subGroup, msg.ID)
-		}
-	}
-}
-
-// NewEventStore returns new event store instance.
-func NewEventStore(sinkerService sinker.Service, configRepo config.ConfigRepo, client *redis.Client, esconsumer string, log *zap.Logger) Subscriber {
-	return eventStore{
-		sinkerService: sinkerService,
-		configRepo:    configRepo,
-		client:        client,
-		esconsumer:    esconsumer,
-		logger:        log,
-	}
-}
-
-func decodeSinksCreate(event map[string]interface{}) (UpdateSinkEvent, error) {
-	val := UpdateSinkEvent{
-		SinkID:    read(event, "sink_id", ""),
-		Owner:     read(event, "owner", ""),
-		Config:    readMetadata(event, "config"),
-		Timestamp: time.Now(),
-	}
-	var metadata types.Metadata
-	if err := json.Unmarshal([]byte(read(event, "config", "")), &metadata); err != nil {
-		return UpdateSinkEvent{}, err
-	}
-	val.Config = metadata
-	return val, nil
-}
-
-func decodeSinksUpdate(event map[string]interface{}) (UpdateSinkEvent, error) {
-	val := UpdateSinkEvent{
-		SinkID:    read(event, "sink_id", ""),
-		Owner:     read(event, "owner", ""),
-		Timestamp: time.Now(),
-	}
-	var metadata types.Metadata
-	if err := json.Unmarshal([]byte(read(event, "config", "")), &metadata); err != nil {
-		return UpdateSinkEvent{}, err
-	}
-	val.Config = metadata
-	return val, nil
-}
-
-func decodeSinksRemove(event map[string]interface{}) (UpdateSinkEvent, error) {
-	val := UpdateSinkEvent{
-		SinkID:    read(event, "sink_id", ""),
-		Owner:     read(event, "owner", ""),
-		Timestamp: time.Now(),
-	}
-	return val, nil
-}
-
-func (es eventStore) handleSinksRemove(_ context.Context, e UpdateSinkEvent) error {
-	if ok := es.configRepo.Exists(e.Owner, e.SinkID); ok {
-		err := es.configRepo.Remove(e.Owner, e.SinkID)
-		if err != nil {
-			es.logger.Error("error during remove sinker cache entry", zap.Error(err))
-			return err
-		}
-	} else {
-		es.logger.Error("did not find any sinker cache entry for removal",
-			zap.String("key", fmt.Sprintf("sinker_key-%s-%s", e.Owner, e.SinkID)))
-		return errors.New("did not find any sinker cache entry for removal")
-	}
-	return nil
-}
-
-func (es eventStore) handleSinksUpdate(_ context.Context, e UpdateSinkEvent) error {
-	var cfg config.SinkConfig
-	cfg.Config = types.FromMap(e.Config)
-	cfg.SinkID = e.SinkID
-	cfg.OwnerID = e.Owner
-	cfg.State = config.Unknown
-	if ok := es.configRepo.Exists(e.Owner, e.SinkID); ok {
-		sinkConfig, err := es.configRepo.Get(e.Owner, e.SinkID)
-		if err != nil {
-			return err
-		}
-		sinkConfig.Config = cfg.Config
-		if sinkConfig.OwnerID == "" {
-			sinkConfig.OwnerID = e.Owner
-		}
-		if sinkConfig.SinkID == "" {
-			sinkConfig.SinkID = e.SinkID
-		}
-		err = es.configRepo.Edit(sinkConfig)
-		if err != nil {
-			return err
-		}
-	} else {
-		err := es.configRepo.Add(cfg)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (es eventStore) handleSinksCreate(_ context.Context, e UpdateSinkEvent) error {
-	var cfg config.SinkConfig
-	cfg.Config = types.FromMap(e.Config)
-	cfg.SinkID = e.SinkID
-	cfg.OwnerID = e.Owner
-	cfg.State = config.Unknown
-	err := es.configRepo.Add(cfg)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func read(event map[string]interface{}, key, def string) string {
-	val, ok := event[key].(string)
-	if !ok {
-		return def
-	}
-	return val
-}
-
-func readMetadata(event map[string]interface{}, key string) types.Metadata {
-	val, ok := event[key].(types.Metadata)
-	if !ok {
-		return types.Metadata{}
-	}
-
-	return val
-}
diff --git a/sinker/redis/producer/docs.go b/sinker/redis/producer/docs.go
deleted file mode 100644
index 30f1d3d99..000000000
--- a/sinker/redis/producer/docs.go
+++ /dev/null
@@ -1 +0,0 @@
-package producer
diff --git a/sinker/redis/producer/events.go b/sinker/redis/producer/events.go
deleted file mode 100644
index 79ead9a3d..000000000
--- a/sinker/redis/producer/events.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package producer
-
-import (
-	"time"
-)
-
-const (
-	SinkerPrefix = "sinker."
-	SinkerUpdate = SinkerPrefix + "update"
-)
-
-type event interface {
-	Encode() map[string]interface{}
-}
-
-var (
-	_ event = (*SinkerUpdateEvent)(nil)
-)
-
-type SinkerUpdateEvent struct {
-	SinkID    string
-	Owner     string
-	State     string
-	Msg       string
-	Timestamp time.Time
-}
-
-func (cse SinkerUpdateEvent) Encode() map[string]interface{} {
-	return map[string]interface{}{
-		"sink_id":   cse.SinkID,
-		"owner":     cse.Owner,
-		"state":     cse.State,
-		"msg":       cse.Msg,
-		"timestamp": cse.Timestamp.Unix(),
-		"operation": SinkerUpdate,
-	}
-}
diff --git a/sinker/redis/producer/sink_ttl.go b/sinker/redis/producer/sink_ttl.go
new file mode 100644
index 000000000..959e247ff
--- /dev/null
+++ b/sinker/redis/producer/sink_ttl.go
@@ -0,0 +1,86 @@
+package producer
+
+import (
+	"context"
+	"fmt"
+	"github.com/go-redis/redis/v8"
+	"go.uber.org/zap"
+	"time"
+)
+
+type SinkerKey struct {
+	OwnerID      string
+	SinkID       string
+	Size         string
+	LastActivity time.Time
+}
+
+func (s *SinkerKey) Encode() map[string]interface{} {
+	return map[string]interface{}{
+		"owner_id":      s.OwnerID,
+		"sink_id":       s.SinkID,
+		"size":          s.Size,
+		"last_activity": s.LastActivity.Format(time.RFC3339),
+	}
+}
+
+const DefaultExpiration = 5 * time.Minute
+
+type SinkerKeyService interface {
+	// AddNewSinkerKey Add New Sinker Key with default Expiration of 5 minutes
+	AddNewSinkerKey(ctx context.Context, key SinkerKey) error
+	// RenewSinkerKey Increment Expiration of Sinker Key
+	RenewSinkerKey(ctx context.Context, key SinkerKey) error
+	// RenewSinkerKeyInternal Increment Expiration of Sinker Key
+	RenewSinkerKeyInternal(ctx context.Context, sink SinkerKey, expiration time.Duration) error
+}
+
+type sinkerKeyService struct {
+	logger          *zap.Logger
+	cacheRepository *redis.Client
+}
+
+func NewSinkerKeyService(l *zap.Logger, cacheRepository *redis.Client) SinkerKeyService {
+	logger := l.Named("sinker_key_service")
+	return &sinkerKeyService{logger: logger, cacheRepository: cacheRepository}
+}
+
+// RenewSinkerKey Increment Expiration of Sinker Key
+func (s *sinkerKeyService) RenewSinkerKey(ctx context.Context, sink SinkerKey) error {
+	// If key does not exist, create new entry
+	key := fmt.Sprintf("orb.sinker.key-%s:%s", sink.OwnerID, sink.SinkID)
+	cmd := s.cacheRepository.Expire(ctx, key, DefaultExpiration)
+	if cmd.Err() != nil {
+		s.logger.Error("error sending event to sinker event store", zap.Error(cmd.Err()))
+		return cmd.Err()
+	}
+	return nil
+}
+
+// RenewSinkerKeyInternal Increment Expiration of Sinker Key using custom expiration
+func (s *sinkerKeyService) RenewSinkerKeyInternal(ctx context.Context, sink SinkerKey, expiration time.Duration) error {
+	// If key does not exist, create new entry
+	key := fmt.Sprintf("orb.sinker.key-%s:%s", sink.OwnerID, sink.SinkID)
+	cmd := s.cacheRepository.Expire(ctx, key, expiration)
+	if cmd.Err() != nil {
+		s.logger.Error("error sending event to sinker event store", zap.Error(cmd.Err()))
+		return cmd.Err()
+	}
+	return nil
+}
+
+func (s *sinkerKeyService) AddNewSinkerKey(ctx context.Context, sink SinkerKey) error {
+	// Create sinker key in redis Hashset with default expiration of 5 minutes
+	key := fmt.Sprintf("orb.sinker.key-%s:%s", sink.OwnerID, sink.SinkID)
+	cmd := s.cacheRepository.HSet(ctx, key, sink.Encode())
+	if cmd.Err() != nil {
+		s.logger.Error("error sending event to sinker event store", zap.Error(cmd.Err()))
+		return cmd.Err()
+	}
+	err := s.RenewSinkerKey(ctx, sink)
+	if err != nil {
+		s.logger.Error("error setting expiration to sinker event store", zap.Error(cmd.Err()))
+		return cmd.Err()
+	}
+	return nil
+}
diff --git a/sinker/redis/producer/sinker_activity.go b/sinker/redis/producer/sinker_activity.go
new file mode 100644
index 000000000..545051674
--- /dev/null
+++ b/sinker/redis/producer/sinker_activity.go
@@ -0,0 +1,66 @@
+package producer
+
+import (
+	"context"
+	"github.com/go-redis/redis/v8"
+	"go.uber.org/zap"
+	"time"
+)
+
+type SinkActivityProducer interface {
+	// PublishSinkActivity to be used to publish the sink activity to the sinker, mainly used by Otel Bridge Service
+	PublishSinkActivity(ctx context.Context, event SinkActivityEvent) error
+}
+
+type SinkActivityEvent struct {
+	OwnerID   string
+	SinkID    string
+	State     string
+	Size      string
+	Timestamp time.Time
+}
+
+func (s *SinkActivityEvent) Encode() map[string]interface{} {
+	return map[string]interface{}{
+		"owner_id":  s.OwnerID,
+		"sink_id":   s.SinkID,
+		"state":     s.State,
+		"size":      s.Size,
+		"timestamp": s.Timestamp.Format(time.RFC3339),
+	}
+}
+
+var _ SinkActivityProducer = (*sinkActivityProducer)(nil)
+
+type sinkActivityProducer struct {
+	logger            *zap.Logger
+	redisStreamClient *redis.Client
+	sinkTTL           SinkerKeyService
+}
+
+func NewSinkActivityProducer(l *zap.Logger, redisStreamClient *redis.Client, sinkTTL SinkerKeyService) SinkActivityProducer {
+	logger := l.Named("sink_activity_producer")
+	return &sinkActivityProducer{logger: logger, redisStreamClient: redisStreamClient, sinkTTL: sinkTTL}
+}
+
+// PublishSinkActivity BridgeService will notify stream of sink activity
+func (sp *sinkActivityProducer) PublishSinkActivity(ctx context.Context, event SinkActivityEvent) error {
+	const maxLen = 1000
+	record := &redis.XAddArgs{
+		Stream: "orb.sink_activity",
+		Values: event.Encode(),
+		MaxLen: maxLen,
+		Approx: true,
+	}
+	err := sp.redisStreamClient.XAdd(ctx, record).Err()
+	if err != nil {
+		sp.logger.Error("error sending event to sinker event store", zap.Error(err))
+	}
+	err = sp.sinkTTL.AddNewSinkerKey(ctx, SinkerKey{
+		OwnerID:      event.OwnerID,
+		SinkID:       event.SinkID,
+		Size:         event.Size,
+		LastActivity: event.Timestamp,
+	})
+	return err
+}
diff --git a/sinker/redis/producer/sinker_idle.go b/sinker/redis/producer/sinker_idle.go
new file mode 100644
index 000000000..9ca951850
--- /dev/null
+++ b/sinker/redis/producer/sinker_idle.go
@@ -0,0 +1,58 @@
+package producer
+
+import (
+	"context"
+	"github.com/go-redis/redis/v8"
+	"go.uber.org/zap"
+	"time"
+)
+
+type SinkIdleEvent struct {
+	OwnerID   string
+	SinkID    string
+	State     string
+	Size      string
+	Timestamp time.Time
+}
+
+func (s *SinkIdleEvent) Encode() map[string]interface{} {
+	return map[string]interface{}{
+		"owner_id":  s.OwnerID,
+		"sink_id":   s.SinkID,
+		"state":     s.State,
+		"size":      s.Size,
+		"timestamp": s.Timestamp.Format(time.RFC3339),
+	}
+}
+
+type SinkIdleProducer interface {
+	// PublishSinkIdle to be used to publish the sink activity to the sinker, mainly used by Otel Bridge Service
+	PublishSinkIdle(ctx context.Context, event SinkIdleEvent) error
+}
+
+var _ SinkIdleProducer = (*sinkIdleProducer)(nil)
+
+type sinkIdleProducer struct {
+	logger            *zap.Logger
+	redisStreamClient *redis.Client
+}
+
+func NewSinkIdleProducer(l *zap.Logger, redisStreamClient *redis.Client) SinkIdleProducer {
+	logger := l.Named("sink_idle_producer")
+	return &sinkIdleProducer{logger: logger, redisStreamClient: redisStreamClient}
+}
+
+func (s *sinkIdleProducer) PublishSinkIdle(ctx context.Context, event SinkIdleEvent) error {
+	const maxLen = 1000
+	record := &redis.XAddArgs{
+		Stream: "orb.sink_idle",
+		Values: event.Encode(),
+		MaxLen: maxLen,
+		Approx: true,
+	}
+	err := s.redisStreamClient.XAdd(ctx, record).Err()
+	if err != nil {
+		s.logger.Error("error sending event to sinker event store", zap.Error(err))
+	}
+	return err
+}
diff --git a/sinker/redis/producer/streams.go b/sinker/redis/producer/streams.go
deleted file mode 100644
index 39c14fe1c..000000000
--- a/sinker/redis/producer/streams.go
+++ /dev/null
@@ -1,160 +0,0 @@
-package producer
-
-import (
-	"context"
-	"time"
-
-	"github.com/go-redis/redis/v8"
-	"github.com/orb-community/orb/sinker/config"
-	"go.uber.org/zap"
-)
-
-const (
-	streamID  = "orb.sinker"
-	streamLen = 1000
-)
-
-var _ config.ConfigRepo = (*eventStore)(nil)
-
-type eventStore struct {
-	sinkCache config.ConfigRepo
-	client    *redis.Client
-	logger    *zap.Logger
-}
-
-// DeployCollector only used in maestro
-func (e eventStore) DeployCollector(ctx context.Context, config config.SinkConfig) error {
-	err := e.sinkCache.Edit(config)
-	if err != nil {
-		return err
-	}
-
-	eventToSink := SinkerUpdateEvent{
-		SinkID:    config.SinkID,
-		Owner:     config.OwnerID,
-		State:     config.State.String(),
-		Msg:       config.Msg,
-		Timestamp: time.Now(),
-	}
-	recordToSink := &redis.XAddArgs{
-		Stream: streamID,
-		Values: eventToSink.Encode(),
-		MaxLen: streamLen,
-		Approx: true,
-	}
-	err = e.client.XAdd(ctx, recordToSink).Err()
-	if err != nil {
-		e.logger.Error("error sending event to sinker event store", zap.Error(err))
-	}
-
-	return nil
-}
-
-func (e eventStore) Exists(ownerID string, sinkID string) bool {
-	return e.sinkCache.Exists(ownerID, sinkID)
-}
-
-func (e eventStore) Add(config config.SinkConfig) error {
-	err := e.sinkCache.Add(config)
-	if err != nil {
-		return err
-	}
-
-	event := SinkerUpdateEvent{
-		SinkID:    config.SinkID,
-		Owner:     config.OwnerID,
-		State:     config.State.String(),
-		Msg:       config.Msg,
-		Timestamp: time.Now(),
-	}
-	record := &redis.XAddArgs{
-		Stream: streamID,
-		Values: event.Encode(),
-		MaxLen: streamLen,
-		Approx: true,
-	}
-	err = e.client.XAdd(context.Background(), record).Err()
-	if err != nil {
-		e.logger.Error("error sending event to event store", zap.Error(err))
-	}
-	return nil
-}
-
-func (e eventStore) Remove(ownerID string, sinkID string) error {
-	err := e.sinkCache.Remove(ownerID, sinkID)
-	if err != nil {
-		return err
-	}
-
-	event := SinkerUpdateEvent{
-		SinkID:    sinkID,
-		Owner:     ownerID,
-		State:     config.Idle.String(),
-		Timestamp: time.Now(),
-	}
-	record := &redis.XAddArgs{
-		Stream: streamID,
-		Values: event.Encode(),
-		MaxLen: streamLen,
-		Approx: true,
-	}
-	err = e.client.XAdd(context.Background(), record).Err()
-	if err != nil {
-		e.logger.Error("error sending event to event store", zap.Error(err))
-	}
-	return nil
-}
-
-func (e eventStore) Get(ownerID string, sinkID string) (config.SinkConfig, error) {
-	return e.sinkCache.Get(ownerID, sinkID)
-}
-
-func (e eventStore) Edit(config config.SinkConfig) error {
-	err := e.sinkCache.Edit(config)
-	if err != nil {
-		return err
-	}
-
-	event := SinkerUpdateEvent{
-		SinkID:    config.SinkID,
-		Owner:     config.OwnerID,
-		State:     config.State.String(),
-		Msg:       config.Msg,
-		Timestamp: time.Now(),
-	}
-	record := &redis.XAddArgs{
-		Stream: streamID,
-		Values: event.Encode(),
-		MaxLen: streamLen,
-		Approx: true,
-	}
-	err = e.client.XAdd(context.Background(), record).Err()
-	if err != nil {
-		e.logger.Error("error sending event to event store", zap.Error(err))
-	}
-	return nil
-}
-
-func (e eventStore) GetActivity(ownerID string, sinkID string) (int64, error) {
-	return e.sinkCache.GetActivity(ownerID, sinkID)
-}
-
-func (e eventStore) AddActivity(ownerID string, sinkID string) error {
-	return e.sinkCache.AddActivity(ownerID, sinkID)
-}
-
-func (e eventStore) GetAll(ownerID string) ([]config.SinkConfig, error) {
-	return e.sinkCache.GetAll(ownerID)
-}
-
-func (e eventStore) GetAllOwners() ([]string, error) {
-	return e.sinkCache.GetAllOwners()
-}
-
-func NewEventStoreMiddleware(repo config.ConfigRepo, client *redis.Client, logger *zap.Logger) config.ConfigRepo {
-	return eventStore{
-		sinkCache: repo,
-		client:    client,
-		logger:    logger,
-	}
-}
diff --git a/sinker/redis/setup_test.go b/sinker/redis/setup_test.go
index 292b51f89..197abab9a 100644
--- a/sinker/redis/setup_test.go
+++ b/sinker/redis/setup_test.go
@@ -34,7 +34,7 @@ func TestMain(m *testing.M) {
 		})
 		return redisClient.Ping(context.Background()).Err()
 	}); err != nil {
-		logger.Fatal("could not conncet to docker: %s", zap.Error(err))
+		logger.Fatal("could not connect to docker: %s", zap.Error(err))
 	}
 
 	code := m.Run()
@@ -45,3 +45,38 @@ func TestMain(m *testing.M) {
 
 	os.Exit(code)
 }
+
+func OnceReceiver(ctx context.Context, streamID string) error {
+	go func() {
+		count := 0
+		err := redisClient.XGroupCreateMkStream(ctx, streamID, "unit-test", "$").Err()
+		if err != nil {
+			logger.Warn("error during create group", zap.Error(err))
+		}
+		for {
+			// Redis Subscribe to stream
+			if redisClient != nil {
+				// create the group, or ignore if it already exists
+				streams, err := redisClient.XReadGroup(ctx, &redis.XReadGroupArgs{
+					Consumer: "test_consumer",
+					Group:    "unit-test",
+					Streams:  []string{streamID, ">"},
+					Count:    10,
+				}).Result()
+				if err != nil || len(streams) == 0 {
+					continue
+				}
+				for _, stream := range streams {
+					for _, msg := range stream.Messages {
+						logger.Info("received message", zap.Any("message", msg.Values))
+						count++
+					}
+				}
+				if count > 0 {
+					return
+				}
+			}
+		}
+	}()
+	return nil
+}
diff --git a/sinker/redis/sinker.go b/sinker/redis/sinker.go
deleted file mode 100644
index d180f61e4..000000000
--- a/sinker/redis/sinker.go
+++ /dev/null
@@ -1,185 +0,0 @@
-package redis
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/orb-community/orb/sinker/redis/producer"
-
-	"github.com/go-redis/redis/v8"
-	"github.com/orb-community/orb/sinker"
-	sinkerconfig "github.com/orb-community/orb/sinker/config"
-	"go.uber.org/zap"
-)
-
-const (
-	keyPrefix      = "sinker_key"
-	activityPrefix = "sinker_activity"
-	idPrefix       = "orb.maestro"
-	streamLen      = 1000
-)
-
-var _ sinkerconfig.ConfigRepo = (*sinkerCache)(nil)
-
-type sinkerCache struct {
-	client *redis.Client
-	logger *zap.Logger
-}
-
-func NewSinkerCache(client *redis.Client, logger *zap.Logger) sinkerconfig.ConfigRepo {
-	return &sinkerCache{client: client, logger: logger}
-}
-
-func (s *sinkerCache) Exists(ownerID string, sinkID string) bool {
-	sinkConfig, err := s.Get(ownerID, sinkID)
-	if err != nil {
-		return false
-	}
-	if sinkConfig.SinkID != "" {
-		return true
-	}
-	return false
-}
-
-func (s *sinkerCache) Add(config sinkerconfig.SinkConfig) error {
-	skey := fmt.Sprintf("%s-%s:%s", keyPrefix, config.OwnerID, config.SinkID)
-	bytes, err := json.Marshal(config)
-	if err != nil {
-		return err
-	}
-	if err = s.client.Set(context.Background(), skey, bytes, 0).Err(); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (s *sinkerCache) Remove(ownerID string, sinkID string) error {
-	skey := fmt.Sprintf("%s-%s:%s", keyPrefix, ownerID, sinkID)
-	if err := s.client.Del(context.Background(), skey).Err(); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (s *sinkerCache) Get(ownerID string, sinkID string) (sinkerconfig.SinkConfig, error) {
-	if ownerID == "" || sinkID == "" {
-		return sinkerconfig.SinkConfig{}, sinker.ErrNotFound
-	}
-	skey := fmt.Sprintf("%s-%s:%s", keyPrefix, ownerID, sinkID)
-	cachedConfig, err := s.client.Get(context.Background(), skey).Result()
-	if err != nil {
-		return sinkerconfig.SinkConfig{}, err
-	}
-	var cfgSinker sinkerconfig.SinkConfig
-	if err := json.Unmarshal([]byte(cachedConfig), &cfgSinker); err != nil {
-		return sinkerconfig.SinkConfig{}, err
-	}
-	return cfgSinker, nil
-}
-
-func (s *sinkerCache) Edit(config sinkerconfig.SinkConfig) error {
-	if err := s.Remove(config.OwnerID, config.SinkID); err != nil {
-		return err
-	}
-	if err := s.Add(config); err != nil {
-		return err
-	}
-	return nil
-}
-
-// check collector activity
-
-func (s *sinkerCache) GetActivity(ownerID string, sinkID string) (int64, error) {
-	if ownerID == "" || sinkID == "" {
-		return 0, errors.New("invalid parameters")
-	}
-	skey := fmt.Sprintf("%s:%s", activityPrefix, sinkID)
-	secs, err := s.client.Get(context.Background(), skey).Result()
-	if err != nil {
-		return 0, err
-	}
-	lastActivity, _ := strconv.ParseInt(secs, 10, 64)
-	return lastActivity, nil
-}
-
-func (s *sinkerCache) AddActivity(ownerID string, sinkID string) error {
-	if ownerID == "" || sinkID == "" {
-		return errors.New("invalid parameters")
-	}
-	defaultExpiration := time.Duration(10) * time.Minute
-	skey := fmt.Sprintf("%s:%s", activityPrefix, sinkID)
-	lastActivity := strconv.FormatInt(time.Now().Unix(), 10)
-	if err := s.client.Set(context.Background(), skey, lastActivity, defaultExpiration).Err(); err != nil {
-		return err
-	}
-	s.logger.Info("added activity for owner and sink ids", zap.String("owner", ownerID), zap.String("sinkID", sinkID))
-	return nil
-}
-
-//
-
-func (s *sinkerCache) DeployCollector(ctx context.Context, config sinkerconfig.SinkConfig) error {
-	event := producer.SinkerUpdateEvent{
-		SinkID:    config.SinkID,
-		Owner:     config.OwnerID,
-		State:     config.State.String(),
-		Msg:       config.Msg,
-		Timestamp: time.Now(),
-	}
-	encodeEvent := redis.XAddArgs{
-		ID:     config.SinkID,
-		Stream: idPrefix,
-		Values: event,
-		MaxLen: streamLen,
-		Approx: true,
-	}
-	if cmd := s.client.XAdd(ctx, &encodeEvent); cmd.Err() != nil {
-		return cmd.Err()
-	}
-	return nil
-}
-
-func (s *sinkerCache) GetAllOwners() ([]string, error) {
-	iter := s.client.Scan(context.Background(), 0, fmt.Sprintf("%s-*", keyPrefix), 0).Iterator()
-	var owners []string
-	for iter.Next(context.Background()) {
-		keys := strings.Split(strings.TrimPrefix(iter.Val(), fmt.Sprintf("%s-", keyPrefix)), ":")
-		if len(keys) > 1 {
-			owners = append(owners, keys[0])
-		}
-	}
-	if err := iter.Err(); err != nil {
-		s.logger.Error("failed to retrieve config", zap.Error(err))
-		return owners, err
-	}
-	return owners, nil
-}
-
-func (s *sinkerCache) GetAll(ownerID string) ([]sinkerconfig.SinkConfig, error) {
-	iter := s.client.Scan(context.Background(), 0, fmt.Sprintf("%s-%s:*", keyPrefix, ownerID), 0).Iterator()
-	var configs []sinkerconfig.SinkConfig
-	for iter.Next(context.Background()) {
-		keys := strings.Split(strings.TrimPrefix(iter.Val(), fmt.Sprintf("%s-", keyPrefix)), ":")
-		sinkID := ""
-		if len(keys) > 1 {
-			sinkID = keys[1]
-		}
-		cfg, err := s.Get(ownerID, sinkID)
-		if err != nil {
-			s.logger.Error("failed to retrieve config", zap.Error(err))
-			continue
-		}
-		configs = append(configs, cfg)
-	}
-	if err := iter.Err(); err != nil {
-		s.logger.Error("failed to retrieve config", zap.Error(err))
-		return configs, err
-	}
-
-	return configs, nil
-}
diff --git a/sinker/redis/sinker_test.go b/sinker/redis/sinker_test.go
index 2088cc9e7..09b39903b 100644
--- a/sinker/redis/sinker_test.go
+++ b/sinker/redis/sinker_test.go
@@ -1,208 +1,60 @@
 package redis_test
 
 import (
+	"context"
 	"fmt"
-	"github.com/orb-community/orb/pkg/types"
+
 	"testing"
 	"time"
 
-	"github.com/mainflux/mainflux/pkg/uuid"
-	"github.com/orb-community/orb/pkg/errors"
-	config2 "github.com/orb-community/orb/sinker/config"
-	"github.com/orb-community/orb/sinker/redis"
-	"github.com/stretchr/testify/assert"
+	"github.com/orb-community/orb/sinker/redis/producer"
+
 	"github.com/stretchr/testify/require"
 )
 
-var idProvider = uuid.New()
-
-func TestSinkerConfigSave(t *testing.T) {
-	sinkerCache := redis.NewSinkerCache(redisClient, logger)
-	var config config2.SinkConfig
-	config.SinkID = "123"
-	config.OwnerID = "test"
-	config.Config = types.Metadata{
-		"authentication": types.Metadata{
-			"password": "password",
-			"type":     "basicauth",
-			"username": "user",
-		},
-		"exporter": types.Metadata{
-			"headers": map[string]string{
-				"X-Tenant": "MY_TENANT_1",
-			},
-			"remote_host": "localhost",
-		},
-		"opentelemetry": "enabled",
-	}
-
-	config.State = 0
-	config.Msg = ""
-	config.LastRemoteWrite = time.Time{}
-
-	err := sinkerCache.Add(config)
-	require.Nil(t, err, fmt.Sprintf("save sinker config to cache: expected nil got %s", err))
-
-	cases := map[string]struct {
-		config config2.SinkConfig
-		err    error
-	}{
-		"Save sinker to cache": {
-			config: config2.SinkConfig{
-				SinkID:          "124",
-				OwnerID:         "test",
-				Config:          config.Config,
-				State:           0,
-				Msg:             "",
-				LastRemoteWrite: time.Time{},
-			},
-			err: nil,
-		},
-		"Save already cached sinker config to cache": {
-			config: config,
-			err:    nil,
-		},
-	}
-
-	for desc, tc := range cases {
-		t.Run(desc, func(t *testing.T) {
-			err := sinkerCache.Add(tc.config)
-			assert.Nil(t, err, fmt.Sprintf("%s: expected %s got %s", desc, tc.err, err))
-		})
-	}
-}
-
-func TestGetSinkerConfig(t *testing.T) {
-	sinkerCache := redis.NewSinkerCache(redisClient, logger)
-	var config config2.SinkConfig
-	config.SinkID = "123"
-	config.OwnerID = "test"
-	config.Config = types.Metadata{
-		"authentication": types.Metadata{
-			"password": "password",
-			"type":     "basicauth",
-			"username": "user",
-		},
-		"exporter": types.Metadata{
-			"headers": map[string]string{
-				"X-Tenant": "MY_TENANT_1",
-			},
-			"remote_host": "localhost",
-		},
-		"opentelemetry": "enabled",
-	}
-	config.State = 0
-	config.Msg = ""
-	config.LastRemoteWrite = time.Time{}
-
-	err := sinkerCache.Add(config)
-	require.Nil(t, err, fmt.Sprintf("save sinker config to cache: expected nil got %s", err))
-
-	cases := map[string]struct {
-		sinkID string
-		config config2.SinkConfig
-		err    error
+func TestSinkActivityStoreAndMessage(t *testing.T) {
+	// Create SinkActivityService
+	sinkTTLSvc := producer.NewSinkerKeyService(logger, redisClient)
+	sinkActivitySvc := producer.NewSinkActivityProducer(logger, redisClient, sinkTTLSvc)
+	args := []struct {
+		testCase string
+		event    producer.SinkActivityEvent
 	}{
-		"Get Config by existing sinker-key": {
-			sinkID: "123",
-			config: config,
-			err:    nil,
-		},
-		"Get Config by non-existing sinker-key": {
-			sinkID: "000",
-			config: config2.SinkConfig{},
-			err:    errors.ErrNotFound,
-		},
-	}
-
-	for desc, tc := range cases {
-		t.Run(desc, func(t *testing.T) {
-			sinkConfig, err := sinkerCache.Get(tc.config.OwnerID, tc.sinkID)
-			assert.Equal(t, tc.config.SinkID, sinkConfig.SinkID, fmt.Sprintf("%s: expected %s got %s", desc, tc.config.SinkID, sinkConfig.SinkID))
-			assert.Equal(t, tc.config.State, sinkConfig.State, fmt.Sprintf("%s: expected %s got %s", desc, tc.config.State, sinkConfig.State))
-			assert.Equal(t, tc.config.OwnerID, sinkConfig.OwnerID, fmt.Sprintf("%s: expected %s got %s", desc, tc.config.OwnerID, sinkConfig.OwnerID))
-			assert.Equal(t, tc.config.Msg, sinkConfig.Msg, fmt.Sprintf("%s: expected %s got %s", desc, tc.config.Msg, sinkConfig.Msg))
-			assert.Equal(t, tc.config.LastRemoteWrite, sinkConfig.LastRemoteWrite, fmt.Sprintf("%s: expected %s got %s", desc, tc.config.LastRemoteWrite, sinkConfig.LastRemoteWrite))
-			if tc.config.Config != nil {
-				_, ok := sinkConfig.Config["authentication"]
-				assert.True(t, ok, fmt.Sprintf("%s: should contain authentication metadata", desc))
-				_, ok = sinkConfig.Config["exporter"]
-				assert.True(t, ok, fmt.Sprintf("%s: should contain exporter metadata", desc))
-			}
-			assert.True(t, errors.Contains(err, tc.err), fmt.Sprintf("%s: expected %s got %s", desc, tc.err, err))
-		})
-	}
-}
-
-func TestGetAllSinkerConfig(t *testing.T) {
-	sinkerCache := redis.NewSinkerCache(redisClient, logger)
-	var config config2.SinkConfig
-	config.SinkID = "123"
-	config.OwnerID = "test"
-	config.State = 0
-	config.Msg = ""
-	config.Config = types.Metadata{
-		"authentication": types.Metadata{
-			"password": "password",
-			"type":     "basicauth",
-			"username": "user",
-		},
-		"exporter": types.Metadata{
-			"headers": map[string]string{
-				"X-Tenant": "MY_TENANT_1",
+		{
+			testCase: "sink activity for new sink",
+			event: producer.SinkActivityEvent{
+				OwnerID:   "1",
+				SinkID:    "1",
+				State:     "active",
+				Size:      "40",
+				Timestamp: time.Now(),
 			},
-			"remote_host": "localhost",
 		},
-		"opentelemetry": "enabled",
-	}
-	config.LastRemoteWrite = time.Time{}
-	sinksConfig := map[string]struct {
-		config config2.SinkConfig
-	}{
-		"config 1": {
-			config: config2.SinkConfig{
-				SinkID:          "123",
-				OwnerID:         "test",
-				Config:          config.Config,
-				State:           0,
-				Msg:             "",
-				LastRemoteWrite: time.Time{},
+		{
+			testCase: "sink activity for existing sink",
+			event: producer.SinkActivityEvent{
+				OwnerID:   "1",
+				SinkID:    "1",
+				State:     "active",
+				Size:      "55",
+				Timestamp: time.Now(),
 			},
 		},
-		"config 2": {
-			config: config2.SinkConfig{
-				SinkID:          "134",
-				OwnerID:         "test",
-				Config:          config.Config,
-				State:           0,
-				Msg:             "",
-				LastRemoteWrite: time.Time{},
+		{
+			testCase: "sink activity for another new sink",
+			event: producer.SinkActivityEvent{
+				OwnerID:   "2",
+				SinkID:    "1",
+				State:     "active",
+				Size:      "37",
+				Timestamp: time.Now(),
 			},
 		},
 	}
-
-	for _, val := range sinksConfig {
-		err := sinkerCache.Add(val.config)
-		require.Nil(t, err, fmt.Sprintf("save sinker config to cache: expected nil got %s", err))
-	}
-
-	cases := map[string]struct {
-		size    int
-		ownerID string
-		err     error
-	}{
-		"Get Config by existing sinker-key": {
-			size:    2,
-			ownerID: "test",
-			err:     nil,
-		},
-	}
-
-	for desc, tc := range cases {
-		t.Run(desc, func(t *testing.T) {
-			sinksConfig, err := sinkerCache.GetAll(tc.ownerID)
-			assert.Nil(t, err, fmt.Sprintf("%s: unexpected error: %s", desc, err))
-			assert.GreaterOrEqual(t, len(sinksConfig), tc.size, fmt.Sprintf("%s: expected %d got %d", desc, tc.size, len(sinksConfig)))
-		})
+	for _, tt := range args {
+		ctx := context.WithValue(context.Background(), "test_case", tt.testCase)
+		err := sinkActivitySvc.PublishSinkActivity(ctx, tt.event)
+		require.NoError(t, err, fmt.Sprintf("%s: unexpected error: %s", tt.testCase, err))
 	}
+	logger.Debug("debugging breakpoint")
 }
diff --git a/sinker/service.go b/sinker/service.go
index db30bd2b8..adb0876a8 100644
--- a/sinker/service.go
+++ b/sinker/service.go
@@ -6,33 +6,25 @@ package sinker
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"time"
 
+	"github.com/orb-community/orb/sinker/redis/consumer"
+	"github.com/orb-community/orb/sinker/redis/producer"
+
 	"github.com/go-kit/kit/metrics"
 	"github.com/go-redis/redis/v8"
 	mfnats "github.com/mainflux/mainflux/pkg/messaging/nats"
 	fleetpb "github.com/orb-community/orb/fleet/pb"
 	policiespb "github.com/orb-community/orb/policies/pb"
-	"github.com/orb-community/orb/sinker/backend/pktvisor"
-	"github.com/orb-community/orb/sinker/config"
 	"github.com/orb-community/orb/sinker/otel"
 	"github.com/orb-community/orb/sinker/otel/bridgeservice"
-	"github.com/orb-community/orb/sinker/prometheus"
 	sinkspb "github.com/orb-community/orb/sinks/pb"
 	"go.uber.org/zap"
 )
 
 const (
-	BackendMetricsTopic = "be.*.m.>"
-	OtelMetricsTopic    = "otlp.*.m.>"
-	MaxMsgPayloadSize   = 1048 * 1000
-)
-
-var (
-	ErrPayloadTooBig = errors.New("payload too big")
-	ErrNotFound      = errors.New("non-existent entity")
+	OtelMetricsTopic = "otlp.*.m.>"
 )
 
 type Service interface {
@@ -49,16 +41,16 @@ type SinkerService struct {
 	otelLogsCancelFunct    context.CancelFunc
 	otelKafkaUrl           string
 
-	sinkerCache             config.ConfigRepo
 	inMemoryCacheExpiration time.Duration
-	esclient                *redis.Client
+	streamClient            *redis.Client
+	cacheClient             *redis.Client
+	sinkTTLSvc              producer.SinkerKeyService
+	sinkActivitySvc         producer.SinkActivityProducer
 	logger                  *zap.Logger
 
 	hbTicker *time.Ticker
 	hbDone   chan bool
 
-	promClient prometheus.Client
-
 	policiesClient policiespb.PolicyServiceClient
 	fleetClient    fleetpb.FleetServiceClient
 	sinksClient    sinkspb.SinkServiceClient
@@ -75,21 +67,25 @@ func (svc SinkerService) Start() error {
 	ctx := context.WithValue(context.Background(), "routine", "async")
 	ctx = context.WithValue(ctx, "cache_expiry", svc.inMemoryCacheExpiration)
 	svc.asyncContext, svc.cancelAsyncContext = context.WithCancel(ctx)
-	if !svc.otel {
-		topic := fmt.Sprintf("channels.*.%s", BackendMetricsTopic)
-		if err := svc.pubSub.Subscribe(topic, svc.handleMsgFromAgent); err != nil {
-			return err
-		}
-		svc.logger.Info("started metrics consumer", zap.String("topic", topic))
-	}
 
-	svc.hbTicker = time.NewTicker(CheckerFreq)
-	svc.hbDone = make(chan bool)
-	go svc.checkSinker()
+	svc.sinkTTLSvc = producer.NewSinkerKeyService(svc.logger, svc.cacheClient)
+	svc.sinkActivitySvc = producer.NewSinkActivityProducer(svc.logger, svc.streamClient, svc.sinkTTLSvc)
+	// Create Handle and Listener to Redis Key Events
+	sinkerIdleProducer := producer.NewSinkIdleProducer(svc.logger, svc.streamClient)
+	sinkerKeyExpirationListener := consumer.NewSinkerKeyExpirationListener(svc.logger, svc.cacheClient, sinkerIdleProducer)
+	err := sinkerKeyExpirationListener.SubscribeToKeyExpiration(svc.asyncContext)
+	if err != nil {
+		svc.logger.Error("error on starting otel, exiting")
+		ctx.Done()
+		svc.cancelAsyncContext()
+		return err
+	}
 
-	err := svc.startOtel(svc.asyncContext)
+	err = svc.startOtel(svc.asyncContext)
 	if err != nil {
 		svc.logger.Error("error on starting otel, exiting")
+		ctx.Done()
+		svc.cancelAsyncContext()
 		return err
 	}
 
@@ -100,7 +96,7 @@ func (svc SinkerService) startOtel(ctx context.Context) error {
 	if svc.otel {
 		var err error
 
-		bridgeService := bridgeservice.NewBridgeService(svc.logger, svc.inMemoryCacheExpiration, svc.sinkerCache,
+		bridgeService := bridgeservice.NewBridgeService(svc.logger, svc.inMemoryCacheExpiration, svc.sinkActivitySvc,
 			svc.policiesClient, svc.sinksClient, svc.fleetClient, svc.messageInputCounter)
 		svc.otelMetricsCancelFunct, err = otel.StartOtelMetricsComponents(ctx, &bridgeService, svc.logger, svc.otelKafkaUrl, svc.pubSub)
 
@@ -116,16 +112,9 @@ func (svc SinkerService) startOtel(ctx context.Context) error {
 }
 
 func (svc SinkerService) Stop() error {
-	if svc.otel {
-		otelTopic := fmt.Sprintf("channels.*.%s", OtelMetricsTopic)
-		if err := svc.pubSub.Unsubscribe(otelTopic); err != nil {
-			return err
-		}
-	} else {
-		topic := fmt.Sprintf("channels.*.%s", BackendMetricsTopic)
-		if err := svc.pubSub.Unsubscribe(topic); err != nil {
-			return err
-		}
+	otelTopic := fmt.Sprintf("channels.*.%s", OtelMetricsTopic)
+	if err := svc.pubSub.Unsubscribe(otelTopic); err != nil {
+		return err
 	}
 
 	svc.logger.Info("unsubscribed from agent metrics")
@@ -140,8 +129,8 @@ func (svc SinkerService) Stop() error {
 // New instantiates the sinker service implementation.
 func New(logger *zap.Logger,
 	pubSub mfnats.PubSub,
-	esclient *redis.Client,
-	configRepo config.ConfigRepo,
+	streamsClient *redis.Client,
+	cacheClient *redis.Client,
 	policiesClient policiespb.PolicyServiceClient,
 	fleetClient fleetpb.FleetServiceClient,
 	sinksClient sinkspb.SinkServiceClient,
@@ -152,14 +141,12 @@ func New(logger *zap.Logger,
 	inputCounter metrics.Counter,
 	defaultCacheExpiration time.Duration,
 ) Service {
-
-	pktvisor.Register(logger)
 	return &SinkerService{
 		inMemoryCacheExpiration: defaultCacheExpiration,
 		logger:                  logger,
 		pubSub:                  pubSub,
-		esclient:                esclient,
-		sinkerCache:             configRepo,
+		streamClient:            streamsClient,
+		cacheClient:             cacheClient,
 		policiesClient:          policiesClient,
 		fleetClient:             fleetClient,
 		sinksClient:             sinksClient,
diff --git a/sinks/api/http/endpoint_test.go b/sinks/api/http/endpoint_test.go
index 316885cfa..74fad1e81 100644
--- a/sinks/api/http/endpoint_test.go
+++ b/sinks/api/http/endpoint_test.go
@@ -13,7 +13,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"strings"
@@ -835,7 +834,7 @@ func TestListSinks(t *testing.T) {
 	}
 }
 
-func TestAuthentitcationTypesEndpoints(t *testing.T) {
+func TestAuthenticationTypesEndpoints(t *testing.T) {
 	service := newService(map[string]string{token: email})
 	server := newServer(service)
 	defer server.Close()
@@ -964,7 +963,7 @@ func TestViewBackend(t *testing.T) {
 			}
 			res, err := req.make()
 			assert.Nil(t, err, fmt.Sprintf("unexpected error %s", err))
-			body, err := ioutil.ReadAll(res.Body)
+			body, err := io.ReadAll(res.Body)
 			assert.Nil(t, err, fmt.Sprintf("unexpected error %s", err))
 			data := strings.Trim(string(body), "\n")
 			assert.Equal(t, tc.status, res.StatusCode, fmt.Sprintf("%s: expected status code %d got %d", desc, tc.status, res.StatusCode))
@@ -1147,7 +1146,7 @@ func TestViewSink(t *testing.T) {
 			}
 			res, err := req.make()
 			assert.Nil(t, err, fmt.Sprintf("unexpected error %s", err))
-			body, err := ioutil.ReadAll(res.Body)
+			body, err := io.ReadAll(res.Body)
 			assert.Nil(t, err, fmt.Sprintf("unexpected error %s", err))
 			data := strings.Trim(string(body), "\n")
 			assert.Equal(t, tc.status, res.StatusCode, fmt.Sprintf("%s: expected status code %d got %d", desc, tc.status, res.StatusCode))
diff --git a/sinks/api/http/logging.go b/sinks/api/http/logging.go
index 42256b88c..2bde997f0 100644
--- a/sinks/api/http/logging.go
+++ b/sinks/api/http/logging.go
@@ -6,11 +6,12 @@ package http
 
 import (
 	"context"
+	"time"
+
 	"github.com/orb-community/orb/sinks"
 	"github.com/orb-community/orb/sinks/authentication_type"
 	"github.com/orb-community/orb/sinks/backend"
 	"go.uber.org/zap"
-	"time"
 )
 
 var _ sinks.SinkService = (*loggingMiddleware)(nil)
@@ -27,7 +28,7 @@ func (l loggingMiddleware) ListSinksInternal(ctx context.Context, filter sinks.F
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: list_sinks_internal",
+			l.logger.Debug("method call: list_sinks_internal",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -41,7 +42,7 @@ func (l loggingMiddleware) ChangeSinkStateInternal(ctx context.Context, sinkID s
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: change_sink_state_internal",
+			l.logger.Debug("method call: change_sink_state_internal",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -55,7 +56,7 @@ func (l loggingMiddleware) CreateSink(ctx context.Context, token string, s sinks
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: create_sink",
+			l.logger.Debug("method call: create_sink",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -69,7 +70,7 @@ func (l loggingMiddleware) UpdateSink(ctx context.Context, token string, s sinks
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: edit_sink",
+			l.logger.Debug("method call: edit_sink",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -83,7 +84,7 @@ func (l loggingMiddleware) UpdateSinkInternal(ctx context.Context, s sinks.Sink)
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: edit_internal_sink",
+			l.logger.Debug("method call: edit_internal_sink",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -97,7 +98,7 @@ func (l loggingMiddleware) ListSinks(ctx context.Context, token string, pm sinks
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: list_sinks",
+			l.logger.Debug("method call: list_sinks",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -111,7 +112,7 @@ func (l loggingMiddleware) ListBackends(ctx context.Context, token string) (_ []
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: list_backends",
+			l.logger.Debug("method call: list_backends",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -125,7 +126,7 @@ func (l loggingMiddleware) ViewBackend(ctx context.Context, token string, key st
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: view_backend",
+			l.logger.Debug("method call: view_backend",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -139,7 +140,7 @@ func (l loggingMiddleware) ViewSink(ctx context.Context, token string, key strin
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Warn("method call: view_sink",
+			l.logger.Debug("method call: view_sink",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -153,7 +154,7 @@ func (l loggingMiddleware) ViewSinkInternal(ctx context.Context, ownerID string,
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Warn("method call: view_sink_internal",
+			l.logger.Debug("method call: view_sink_internal",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -167,7 +168,7 @@ func (l loggingMiddleware) DeleteSink(ctx context.Context, token string, key str
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Warn("method call: delete_sink",
+			l.logger.Debug("method call: delete_sink",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
@@ -181,7 +182,7 @@ func (l loggingMiddleware) ValidateSink(ctx context.Context, token string, s sin
 				zap.Error(err),
 				zap.Duration("duration", time.Since(begin)))
 		} else {
-			l.logger.Info("method call: validate_sink",
+			l.logger.Debug("method call: validate_sink",
 				zap.Duration("duration", time.Since(begin)))
 		}
 	}(time.Now())
diff --git a/sinks/api/http/metrics.go b/sinks/api/http/metrics.go
index 51bac1ee3..7ef0edcfb 100644
--- a/sinks/api/http/metrics.go
+++ b/sinks/api/http/metrics.go
@@ -6,6 +6,8 @@ package http
 
 import (
 	"context"
+	"time"
+
 	"github.com/go-kit/kit/metrics"
 	"github.com/mainflux/mainflux"
 	"github.com/orb-community/orb/pkg/errors"
@@ -13,7 +15,6 @@ import (
 	"github.com/orb-community/orb/sinks/authentication_type"
 	"github.com/orb-community/orb/sinks/backend"
 	"go.uber.org/zap"
-	"time"
 )
 
 var _ sinks.SinkService = (*metricsMiddleware)(nil)
diff --git a/sinks/mocks/sinks.go b/sinks/mocks/sinks.go
index b3a0c165e..f3cc7b602 100644
--- a/sinks/mocks/sinks.go
+++ b/sinks/mocks/sinks.go
@@ -30,23 +30,23 @@ type sinkRepositoryMock struct {
 	sinksMock immutable.Map[string, sinks.Sink]
 }
 
-func (s *sinkRepositoryMock) GetVersion(ctx context.Context) (string, error) {
+func (s *sinkRepositoryMock) GetVersion(_ context.Context) (string, error) {
 	return "", nil
 }
 
-func (s *sinkRepositoryMock) UpdateVersion(ctx context.Context, version string) error {
+func (s *sinkRepositoryMock) UpdateVersion(_ context.Context, _ string) error {
 	return nil
 }
 
-func (s *sinkRepositoryMock) SearchAllSinks(ctx context.Context, filter sinks.Filter) ([]sinks.Sink, error) {
+func (s *sinkRepositoryMock) SearchAllSinks(_ context.Context, _ sinks.Filter) ([]sinks.Sink, error) {
 	return nil, nil
 }
 
-func (s *sinkRepositoryMock) UpdateSinkState(ctx context.Context, sinkID string, msg string, ownerID string, state sinks.State) error {
+func (s *sinkRepositoryMock) UpdateSinkState(_ context.Context, _ string, _ string, _ string, _ sinks.State) error {
 	return nil
 }
 
-func (s *sinkRepositoryMock) RetrieveByOwnerAndId(ctx context.Context, ownerID string, key string) (sinks.Sink, error) {
+func (s *sinkRepositoryMock) RetrieveByOwnerAndId(_ context.Context, ownerID string, key string) (sinks.Sink, error) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
@@ -54,7 +54,7 @@ func (s *sinkRepositoryMock) RetrieveByOwnerAndId(ctx context.Context, ownerID s
 		if sink.MFOwnerID == ownerID {
 			// pass test code
 			v := sink.Config.GetSubMetadata(authentication_type.AuthenticationKey)
-			if v["password"] == "dbpass" {
+			if v["password"] == "dbpass" || v["password"] == "newpass" {
 				v["password"], _ = s.passSvc.EncodePassword(v["password"].(string))
 			}
 			return sink, nil
@@ -74,7 +74,7 @@ func NewSinkRepository(passSvc authentication_type.PasswordService) sinks.SinkRe
 	}
 }
 
-func (s *sinkRepositoryMock) Save(ctx context.Context, sink sinks.Sink) (string, error) {
+func (s *sinkRepositoryMock) Save(_ context.Context, sink sinks.Sink) (string, error) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
@@ -98,7 +98,7 @@ func (s *sinkRepositoryMock) Save(ctx context.Context, sink sinks.Sink) (string,
 	return sink.ID, nil
 }
 
-func (s *sinkRepositoryMock) Update(ctx context.Context, sink sinks.Sink) (err error) {
+func (s *sinkRepositoryMock) Update(_ context.Context, sink sinks.Sink) (err error) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 	if c, ok := s.sinksMock.Get(sink.ID); ok {
@@ -124,7 +124,7 @@ func copyMetadata(dst, src types.Metadata) {
 	}
 }
 
-func (s *sinkRepositoryMock) RetrieveAllByOwnerID(ctx context.Context, owner string, pm sinks.PageMetadata) (sinks.Page, error) {
+func (s *sinkRepositoryMock) RetrieveAllByOwnerID(_ context.Context, owner string, pm sinks.PageMetadata) (sinks.Page, error) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
@@ -158,14 +158,14 @@ func (s *sinkRepositoryMock) RetrieveAllByOwnerID(ctx context.Context, owner str
 	return page, nil
 }
 
-func (s *sinkRepositoryMock) RetrieveById(ctx context.Context, key string) (sinks.Sink, error) {
+func (s *sinkRepositoryMock) RetrieveById(_ context.Context, key string) (sinks.Sink, error) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
 	if c, ok := s.sinksMock.Get(key); ok {
 		// Pass test schema
 		v := c.Config.GetSubMetadata(authentication_type.AuthenticationKey)
-		if v["password"] == "dbpass" {
+		if v["password"] == "dbpass" || v["password"] == "newpass" {
 			v["password"], _ = s.passSvc.EncodePassword(v["password"].(string))
 		}
 		return c, nil
@@ -174,7 +174,7 @@ func (s *sinkRepositoryMock) RetrieveById(ctx context.Context, key string) (sink
 	return sinks.Sink{}, sinks.ErrNotFound
 }
 
-func (s *sinkRepositoryMock) Remove(ctx context.Context, owner string, key string) error {
+func (s *sinkRepositoryMock) Remove(_ context.Context, owner string, key string) error {
 	if c, ok := s.sinksMock.Get(key); ok {
 		if c.MFOwnerID == owner {
 			s.sinksMock = *s.sinksMock.Delete(key)
diff --git a/sinks/postgres/init.go b/sinks/postgres/init.go
index cab3b5390..90588b5b7 100644
--- a/sinks/postgres/init.go
+++ b/sinks/postgres/init.go
@@ -90,6 +90,19 @@ func migrateDB(db *sqlx.DB) error {
 					"DROP TABLE current_version",
 				},
 			},
+			{
+				Id: "sinks_4",
+				Up: []string{
+					`ALTER TYPE public.sinks_state ADD VALUE IF NOT EXISTS 'warning';`,
+					`ALTER TYPE public.sinks_state ADD VALUE IF NOT EXISTS 'provisioning';`,
+					`ALTER TYPE public.sinks_state ADD VALUE IF NOT EXISTS 'provisioning_error';`,
+				},
+				Down: []string{
+					`ALTER TYPE public.sinks_state DROP VALUE IF EXISTS 'warning';`,
+					`ALTER TYPE public.sinks_state DROP VALUE IF EXISTS 'provisioning';`,
+					`ALTER TYPE public.sinks_state DROP VALUE IF EXISTS 'provisioning_error';`,
+				},
+			},
 		},
 	}
 
diff --git a/sinks/postgres/sinks_test.go b/sinks/postgres/sinks_test.go
index 974d55e42..bdb4788d6 100644
--- a/sinks/postgres/sinks_test.go
+++ b/sinks/postgres/sinks_test.go
@@ -580,8 +580,16 @@ func TestUpdateSinkState(t *testing.T) {
 
 	for desc, tc := range cases {
 		t.Run(desc, func(t *testing.T) {
+			ctx := context.WithValue(context.Background(), "test", desc)
 			err := sinkRepo.UpdateSinkState(context.Background(), tc.sinkID, tc.msg, tc.ownerID, tc.state)
 			assert.True(t, errors.Contains(err, tc.err), fmt.Sprintf("%s: expected %s got %s\n", desc, tc.err, err))
+			// only validate success scenarios
+			if tc.err == nil {
+				got, err := sinkRepo.RetrieveById(ctx, sinkID)
+				assert.True(t, errors.Contains(err, tc.err), fmt.Sprintf("%s: expected %s got %s\n", desc, tc.err, err))
+				assert.Equal(t, tc.state, got.State, fmt.Sprintf("%s: expected state %d got %d", desc, tc.state, got.State))
+				assert.Equal(t, tc.msg, got.Error, fmt.Sprintf("%s: expected msg %s got %s", desc, tc.msg, got.Error))
+			}
 		})
 	}
 
diff --git a/sinks/redis/consumer/events.go b/sinks/redis/consumer/events.go
deleted file mode 100644
index a7702da0f..000000000
--- a/sinks/redis/consumer/events.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Mainflux
-// SPDX-License-Identifier: Apache-2.0
-
-// Adapted for Orb project, modifications licensed under MPL v. 2.0:
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-package consumer
-
-import (
-	"github.com/orb-community/orb/sinks"
-	"time"
-)
-
-type stateUpdateEvent struct {
-	ownerID   string
-	sinkID    string
-	state     sinks.State
-	msg       string
-	timestamp time.Time
-}
diff --git a/sinks/redis/consumer/sink_status_listener.go b/sinks/redis/consumer/sink_status_listener.go
new file mode 100644
index 000000000..55fe32730
--- /dev/null
+++ b/sinks/redis/consumer/sink_status_listener.go
@@ -0,0 +1,110 @@
+package consumer
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/go-redis/redis/v8"
+	"github.com/orb-community/orb/sinks"
+	redis2 "github.com/orb-community/orb/sinks/redis"
+
+	"go.uber.org/zap"
+)
+
+type SinkStatusListener interface {
+	SubscribeToMaestroSinkStatus(ctx context.Context) error
+	ReceiveMessage(ctx context.Context, message redis.XMessage) error
+}
+
+type sinkStatusListener struct {
+	logger       *zap.Logger
+	streamClient *redis.Client
+	sinkService  sinks.SinkService
+}
+
+func NewSinkStatusListener(l *zap.Logger, streamClient *redis.Client, sinkService sinks.SinkService) SinkStatusListener {
+	logger := l.Named("sink_status_listener")
+	return &sinkStatusListener{
+		logger:       logger,
+		streamClient: streamClient,
+		sinkService:  sinkService,
+	}
+}
+
+func (s *sinkStatusListener) SubscribeToMaestroSinkStatus(ctx context.Context) error {
+	// First will create consumer group
+	groupName := "orb.sinks"
+	streamName := "orb.maestro.sink_status"
+	consumerName := "sinks_consumer"
+	err := s.streamClient.XGroupCreateMkStream(ctx, streamName, groupName, "$").Err()
+	if err != nil && err.Error() != redis2.Exists {
+		s.logger.Error("failed to create group", zap.Error(err))
+		return err
+	}
+	go func(rLogger *zap.Logger) {
+		for {
+			select {
+			case <-ctx.Done():
+				rLogger.Info("closing sink_status_listener routine")
+				return
+			default:
+				streams, err := s.streamClient.XReadGroup(ctx, &redis.XReadGroupArgs{
+					Group:    groupName,
+					Consumer: consumerName,
+					Streams:  []string{streamName, ">"},
+					Count:    1000,
+				}).Result()
+				if err != nil || len(streams) == 0 {
+					if err != nil {
+						rLogger.Error("failed to read group", zap.Error(err))
+					}
+					continue
+				}
+				for _, msg := range streams[0].Messages {
+					err = s.ReceiveMessage(ctx, msg)
+					if err != nil {
+						rLogger.Error("failed to process message", zap.Error(err))
+					}
+				}
+			}
+		}
+	}(s.logger.Named("goroutine_sink_status_listener"))
+	return nil
+}
+
+func (s *sinkStatusListener) ReceiveMessage(ctx context.Context, message redis.XMessage) error {
+	logger := s.logger.Named(fmt.Sprintf("sink_status_msg:%s", message.ID))
+	go func(ctx context.Context, logger *zap.Logger, message redis.XMessage) {
+		event := s.decodeMessage(message.Values)
+		logger.Info("received message from maestro", zap.String("owner_id", event.OwnerID),
+			zap.String("sink_id", event.SinkID), zap.String("state", event.State), zap.String("msg", event.Msg))
+		gotSink, err := s.sinkService.ViewSinkInternal(ctx, event.OwnerID, event.SinkID)
+		if err != nil {
+			logger.Error("failed to get sink for sink_id from message", zap.String("owner_id", event.OwnerID),
+				zap.String("sink_id", event.SinkID), zap.Error(err))
+			return
+		}
+		newState := sinks.NewStateFromString(event.State)
+		if newState == sinks.Error || newState == sinks.ProvisioningError || newState == sinks.Warning {
+			gotSink.Error = event.Msg
+		}
+		gotSink.State = newState
+		err = s.sinkService.ChangeSinkStateInternal(ctx, gotSink.ID, gotSink.Error, gotSink.MFOwnerID, gotSink.State)
+		if err != nil {
+			logger.Error("failed to update sink", zap.String("owner_id", event.OwnerID),
+				zap.String("sink_id", event.SinkID), zap.Error(err))
+			return
+		}
+	}(ctx, logger, message)
+	return nil
+}
+
+// func (es eventStore) decodeSinkerStateUpdate(event map[string]interface{}) *sinks.SinkerStateUpdate {
+func (s *sinkStatusListener) decodeMessage(content map[string]interface{}) redis2.StateUpdateEvent {
+	return redis2.StateUpdateEvent{
+		OwnerID: content["owner_id"].(string),
+		SinkID:  content["sink_id"].(string),
+		State:   content["status"].(string),
+		Msg:     content["error_message"].(string),
+	}
+}
diff --git a/sinks/redis/consumer/streams.go b/sinks/redis/consumer/streams.go
index 4a5790d4f..27053c941 100644
--- a/sinks/redis/consumer/streams.go
+++ b/sinks/redis/consumer/streams.go
@@ -2,6 +2,7 @@ package consumer
 
 import (
 	"context"
+	redis2 "github.com/orb-community/orb/sinks/redis"
 	"time"
 
 	"github.com/go-redis/redis/v8"
@@ -74,26 +75,23 @@ func (es eventStore) Subscribe(context context.Context) error {
 	}
 }
 
-func (es eventStore) handleSinkerStateUpdate(ctx context.Context, event stateUpdateEvent) error {
-	err := es.sinkService.ChangeSinkStateInternal(ctx, event.sinkID, event.msg, event.ownerID, event.state)
+func (es eventStore) handleSinkerStateUpdate(ctx context.Context, event redis2.StateUpdateEvent) error {
+	state := sinks.NewStateFromString(event.State)
+	err := es.sinkService.ChangeSinkStateInternal(ctx, event.SinkID, event.Msg, event.OwnerID, state)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-func (es eventStore) decodeSinkerStateUpdate(event map[string]interface{}) stateUpdateEvent {
-	val := stateUpdateEvent{
-		ownerID:   read(event, "owner", ""),
-		sinkID:    read(event, "sink_id", ""),
-		msg:       read(event, "msg", ""),
-		timestamp: time.Time{},
-	}
-	err := val.state.Scan(event["state"])
-	if err != nil {
-		es.logger.Error("error parsing the state", zap.Error(err))
-		return stateUpdateEvent{}
+func (es eventStore) decodeSinkerStateUpdate(event map[string]interface{}) redis2.StateUpdateEvent {
+	val := redis2.StateUpdateEvent{
+		OwnerID:   read(event, "owner", ""),
+		SinkID:    read(event, "sink_id", ""),
+		Msg:       read(event, "msg", ""),
+		Timestamp: time.Time{},
 	}
+	val.State = event["state"].(string)
 	return val
 }
 
diff --git a/sinks/redis/events.go b/sinks/redis/events.go
new file mode 100644
index 000000000..3f6f3cc91
--- /dev/null
+++ b/sinks/redis/events.go
@@ -0,0 +1,64 @@
+package redis
+
+import (
+	"encoding/json"
+	"github.com/orb-community/orb/maestro/redis"
+	"github.com/orb-community/orb/pkg/types"
+	"time"
+)
+
+const (
+	SinkPrefix   = "sinks."
+	SinkCreate   = SinkPrefix + "create"
+	SinkDelete   = SinkPrefix + "remove"
+	SinkUpdate   = SinkPrefix + "update"
+	StreamSinks  = "orb.sinks"
+	GroupMaestro = "orb.maestro"
+	Exists       = "BUSYGROUP Consumer Group name already exists"
+)
+
+type StateUpdateEvent struct {
+	OwnerID   string
+	SinkID    string
+	State     string
+	Msg       string
+	Timestamp time.Time
+}
+
+func DecodeSinksEvent(event map[string]interface{}, operation string) (redis.SinksUpdateEvent, error) {
+	val := redis.SinksUpdateEvent{
+		SinkID:    read(event, "sink_id", ""),
+		Owner:     read(event, "owner", ""),
+		Backend:   read(event, "backend", ""),
+		Config:    readMetadata(event, "config"),
+		Timestamp: time.Now(),
+	}
+	if operation != SinkDelete {
+		var metadata types.Metadata
+		if err := json.Unmarshal([]byte(read(event, "config", "")), &metadata); err != nil {
+			return redis.SinksUpdateEvent{}, err
+		}
+		val.Config = metadata
+		return val, nil
+	}
+
+	return val, nil
+}
+
+func read(event map[string]interface{}, key, def string) string {
+	val, ok := event[key].(string)
+	if !ok {
+		return def
+	}
+
+	return val
+}
+
+func readMetadata(event map[string]interface{}, key string) types.Metadata {
+	val, ok := event[key].(types.Metadata)
+	if !ok {
+		return types.Metadata{}
+	}
+
+	return val
+}
diff --git a/sinks/redis/producer/events.go b/sinks/redis/producer/events.go
index acec59a7c..0e0306d53 100644
--- a/sinks/redis/producer/events.go
+++ b/sinks/redis/producer/events.go
@@ -33,6 +33,7 @@ var (
 type createSinkEvent struct {
 	sinkID    string
 	owner     string
+	backend   string
 	config    types.Metadata
 	timestamp time.Time
 }
@@ -45,6 +46,7 @@ func (cce createSinkEvent) Encode() (map[string]interface{}, error) {
 	return map[string]interface{}{
 		"sink_id":   cce.sinkID,
 		"owner":     cce.owner,
+		"backend":   cce.backend,
 		"config":    config,
 		"timestamp": cce.timestamp.Unix(),
 		"operation": SinkCreate,
@@ -68,6 +70,7 @@ type updateSinkEvent struct {
 	sinkID    string
 	owner     string
 	config    types.Metadata
+	backend   string
 	timestamp time.Time
 }
 
@@ -80,6 +83,7 @@ func (cce updateSinkEvent) Encode() (map[string]interface{}, error) {
 		"sink_id":   cce.sinkID,
 		"owner":     cce.owner,
 		"config":    config,
+		"backend":   cce.backend,
 		"timestamp": cce.timestamp.Unix(),
 		"operation": SinkUpdate,
 	}, nil
diff --git a/sinks/redis/producer/streams.go b/sinks/redis/producer/streams.go
index 7086deb19..01b68dff4 100644
--- a/sinks/redis/producer/streams.go
+++ b/sinks/redis/producer/streams.go
@@ -10,6 +10,7 @@ package producer
 
 import (
 	"context"
+
 	"github.com/orb-community/orb/sinks/authentication_type"
 
 	"github.com/go-redis/redis/v8"
@@ -23,33 +24,34 @@ const (
 	streamLen = 1000
 )
 
-var _ sinks.SinkService = (*eventStore)(nil)
+var _ sinks.SinkService = (*sinksStreamProducer)(nil)
 
-type eventStore struct {
+type sinksStreamProducer struct {
 	svc    sinks.SinkService
 	client *redis.Client
 	logger *zap.Logger
 }
 
 // ListSinksInternal will only call following service
-func (es eventStore) ListSinksInternal(ctx context.Context, filter sinks.Filter) ([]sinks.Sink, error) {
+func (es sinksStreamProducer) ListSinksInternal(ctx context.Context, filter sinks.Filter) ([]sinks.Sink, error) {
 	return es.svc.ListSinksInternal(ctx, filter)
 }
 
-func (es eventStore) ChangeSinkStateInternal(ctx context.Context, sinkID string, msg string, ownerID string, state sinks.State) error {
+func (es sinksStreamProducer) ChangeSinkStateInternal(ctx context.Context, sinkID string, msg string, ownerID string, state sinks.State) error {
 	return es.svc.ChangeSinkStateInternal(ctx, sinkID, msg, ownerID, state)
 }
 
-func (es eventStore) ViewSinkInternal(ctx context.Context, ownerID string, key string) (sinks.Sink, error) {
+func (es sinksStreamProducer) ViewSinkInternal(ctx context.Context, ownerID string, key string) (sinks.Sink, error) {
 	return es.svc.ViewSinkInternal(ctx, ownerID, key)
 }
 
-func (es eventStore) CreateSink(ctx context.Context, token string, s sinks.Sink) (sink sinks.Sink, err error) {
+func (es sinksStreamProducer) CreateSink(ctx context.Context, token string, s sinks.Sink) (sink sinks.Sink, err error) {
 	defer func() {
 		event := createSinkEvent{
-			sinkID: sink.ID,
-			owner:  sink.MFOwnerID,
-			config: sink.Config,
+			sinkID:  sink.ID,
+			owner:   sink.MFOwnerID,
+			config:  sink.Config,
+			backend: sink.Backend,
 		}
 
 		encode, err := event.Encode()
@@ -74,12 +76,13 @@ func (es eventStore) CreateSink(ctx context.Context, token string, s sinks.Sink)
 	return es.svc.CreateSink(ctx, token, s)
 }
 
-func (es eventStore) UpdateSinkInternal(ctx context.Context, s sinks.Sink) (sink sinks.Sink, err error) {
+func (es sinksStreamProducer) UpdateSinkInternal(ctx context.Context, s sinks.Sink) (sink sinks.Sink, err error) {
 	defer func() {
 		event := updateSinkEvent{
-			sinkID: sink.ID,
-			owner:  sink.MFOwnerID,
-			config: sink.Config,
+			sinkID:  sink.ID,
+			owner:   sink.MFOwnerID,
+			config:  sink.Config,
+			backend: sink.Backend,
 		}
 
 		encode, err := event.Encode()
@@ -102,7 +105,7 @@ func (es eventStore) UpdateSinkInternal(ctx context.Context, s sinks.Sink) (sink
 	return es.svc.UpdateSinkInternal(ctx, s)
 }
 
-func (es eventStore) UpdateSink(ctx context.Context, token string, s sinks.Sink) (sink sinks.Sink, err error) {
+func (es sinksStreamProducer) UpdateSink(ctx context.Context, token string, s sinks.Sink) (sink sinks.Sink, err error) {
 	defer func() {
 		event := updateSinkEvent{
 			sinkID: sink.ID,
@@ -130,35 +133,35 @@ func (es eventStore) UpdateSink(ctx context.Context, token string, s sinks.Sink)
 	return es.svc.UpdateSink(ctx, token, s)
 }
 
-func (es eventStore) ListSinks(ctx context.Context, token string, pm sinks.PageMetadata) (sinks.Page, error) {
+func (es sinksStreamProducer) ListSinks(ctx context.Context, token string, pm sinks.PageMetadata) (sinks.Page, error) {
 	return es.svc.ListSinks(ctx, token, pm)
 }
 
-func (es eventStore) ListAuthenticationTypes(ctx context.Context, token string) ([]authentication_type.AuthenticationTypeConfig, error) {
+func (es sinksStreamProducer) ListAuthenticationTypes(ctx context.Context, token string) ([]authentication_type.AuthenticationTypeConfig, error) {
 	return es.svc.ListAuthenticationTypes(ctx, token)
 }
 
-func (es eventStore) ViewAuthenticationType(ctx context.Context, token string, key string) (authentication_type.AuthenticationTypeConfig, error) {
+func (es sinksStreamProducer) ViewAuthenticationType(ctx context.Context, token string, key string) (authentication_type.AuthenticationTypeConfig, error) {
 	return es.svc.ViewAuthenticationType(ctx, token, key)
 }
 
-func (es eventStore) ListBackends(ctx context.Context, token string) (_ []string, err error) {
+func (es sinksStreamProducer) ListBackends(ctx context.Context, token string) (_ []string, err error) {
 	return es.svc.ListBackends(ctx, token)
 }
 
-func (es eventStore) ViewBackend(ctx context.Context, token string, key string) (_ backend.Backend, err error) {
+func (es sinksStreamProducer) ViewBackend(ctx context.Context, token string, key string) (_ backend.Backend, err error) {
 	return es.svc.ViewBackend(ctx, token, key)
 }
 
-func (es eventStore) ViewSink(ctx context.Context, token string, key string) (_ sinks.Sink, err error) {
+func (es sinksStreamProducer) ViewSink(ctx context.Context, token string, key string) (_ sinks.Sink, err error) {
 	return es.svc.ViewSink(ctx, token, key)
 }
 
-func (es eventStore) GetLogger() *zap.Logger {
+func (es sinksStreamProducer) GetLogger() *zap.Logger {
 	return es.logger
 }
 
-func (es eventStore) DeleteSink(ctx context.Context, token, id string) (err error) {
+func (es sinksStreamProducer) DeleteSink(ctx context.Context, token, id string) (err error) {
 	sink, err := es.svc.ViewSink(ctx, token, id)
 	if err != nil {
 		return err
@@ -193,14 +196,14 @@ func (es eventStore) DeleteSink(ctx context.Context, token, id string) (err erro
 	return nil
 }
 
-func (es eventStore) ValidateSink(ctx context.Context, token string, sink sinks.Sink) (sinks.Sink, error) {
+func (es sinksStreamProducer) ValidateSink(ctx context.Context, token string, sink sinks.Sink) (sinks.Sink, error) {
 	return es.svc.ValidateSink(ctx, token, sink)
 }
 
-// NewEventStoreMiddleware returns wrapper around sinks service that sends
+// NewSinkStreamProducerMiddleware returns wrapper around sinks service that sends
 // events to event store.
-func NewEventStoreMiddleware(svc sinks.SinkService, client *redis.Client) sinks.SinkService {
-	return eventStore{
+func NewSinkStreamProducerMiddleware(svc sinks.SinkService, client *redis.Client) sinks.SinkService {
+	return sinksStreamProducer{
 		svc:    svc,
 		client: client,
 	}
diff --git a/sinks/sinks.go b/sinks/sinks.go
index 14cb8455f..a5e8bf29e 100644
--- a/sinks/sinks.go
+++ b/sinks/sinks.go
@@ -7,13 +7,14 @@ package sinks
 import (
 	"context"
 	"database/sql/driver"
+	"time"
+
 	"github.com/orb-community/orb/pkg/errors"
 	"github.com/orb-community/orb/pkg/types"
 	"github.com/orb-community/orb/sinks/authentication_type"
 	"github.com/orb-community/orb/sinks/authentication_type/basicauth"
 	"github.com/orb-community/orb/sinks/backend"
 	"go.uber.org/zap"
-	"time"
 )
 
 var (
@@ -52,6 +53,8 @@ const (
 	Error
 	Idle
 	Warning
+	Provisioning
+	ProvisioningError
 )
 
 type State int
@@ -62,6 +65,8 @@ var stateMap = [...]string{
 	"error",
 	"idle",
 	"warning",
+	"provisioning",
+	"provisioning_error",
 }
 
 const MetadataLabelOtel = "opentelemetry"
@@ -72,11 +77,13 @@ type Filter struct {
 }
 
 var stateRevMap = map[string]State{
-	"unknown": Unknown,
-	"active":  Active,
-	"error":   Error,
-	"idle":    Idle,
-	"warning": Warning,
+	"unknown":            Unknown,
+	"active":             Active,
+	"error":              Error,
+	"idle":               Idle,
+	"warning":            Warning,
+	"provisioning":       Provisioning,
+	"provisioning_error": ProvisioningError,
 }
 
 func (s State) String() string {
@@ -97,6 +104,10 @@ func (s *State) Scan(value interface{}) error {
 }
 func (s State) Value() (driver.Value, error) { return s.String(), nil }
 
+func NewStateFromString(state string) State {
+	return stateRevMap[state]
+}
+
 func NewConfigBackends(e backend.Backend, a authentication_type.AuthenticationType) Configuration {
 	return Configuration{
 		Exporter:       e,
diff --git a/sinks/sinks_service.go b/sinks/sinks_service.go
index faf942bc1..c10be9d17 100644
--- a/sinks/sinks_service.go
+++ b/sinks/sinks_service.go
@@ -10,6 +10,7 @@ package sinks
 
 import (
 	"context"
+	"encoding/hex"
 
 	"github.com/orb-community/orb/pkg/errors"
 	"github.com/orb-community/orb/pkg/types"
@@ -54,7 +55,7 @@ func (svc sinkService) CreateSink(ctx context.Context, token string, sink Sink)
 		return Sink{}, err
 	}
 
-	//// add default values
+	// add default values
 	defaultMetadata := make(types.Metadata, 1)
 	defaultMetadata["opentelemetry"] = "enabled"
 	sink.Config.Merge(defaultMetadata)
@@ -271,27 +272,28 @@ func (svc sinkService) UpdateSink(ctx context.Context, token string, sink Sink)
 		return Sink{}, err
 	}
 
-	var currentSink Sink
-	currentSink, err = svc.sinkRepo.RetrieveById(ctx, sink.ID)
+	currentSink, err := svc.sinkRepo.RetrieveById(ctx, sink.ID)
 	if err != nil {
 		return Sink{}, err
 	}
-	var cfg Configuration
+
+	authType, _ := authentication_type.GetAuthType(currentSink.GetAuthenticationTypeName())
+	be := backend.GetBackend(currentSink.Backend)
+	cfg := Configuration{
+		Authentication: authType,
+		Exporter:       be,
+	}
+
+	// get the decrypted config, otherwise the password would be encrypted again
+	currentSink, err = svc.decryptMetadata(cfg, currentSink)
+	if err != nil {
+		return Sink{}, errors.Wrap(ErrUpdateEntity, err)
+	}
+
 	if sink.Config == nil && sink.ConfigData == "" {
 		// No config sent, keep the previous
 		sink.Config = currentSink.Config
-		authType, _ := authentication_type.GetAuthType(sink.GetAuthenticationTypeName())
-		be := backend.GetBackend(currentSink.Backend)
-		cfg = Configuration{
-			Authentication: authType,
-			Exporter:       be,
-		}
-
-		// get the decrypted config, otherwise the password would be encrypted again
-		sink, err = svc.decryptMetadata(cfg, sink)
-		if err != nil {
-			return Sink{}, errors.Wrap(ErrUpdateEntity, err)
-		}
+		sink.ConfigData = currentSink.ConfigData
 	} else {
 		sink.Backend = currentSink.Backend
 		be, err := svc.validateBackend(&sink)
@@ -306,12 +308,23 @@ func (svc sinkService) UpdateSink(ctx context.Context, token string, sink Sink)
 			Authentication: at,
 			Exporter:       be,
 		}
-		//// add default values
+
+		// check if the password is encrypted and decrypt it if it is
+		if existingAuth := sink.Config.GetSubMetadata(authentication_type.AuthenticationKey); existingAuth != nil {
+			if password, ok := existingAuth["password"]; ok {
+				// if the password is encrypted, it will be a hex string
+				if _, err := hex.DecodeString(password.(string)); err == nil {
+					if sink, err = svc.decryptMetadata(cfg, sink); err != nil {
+						return Sink{}, errors.Wrap(ErrUpdateEntity, err)
+					}
+				}
+			}
+		}
+
+		// add default values
 		defaultMetadata := make(types.Metadata, 1)
 		defaultMetadata["opentelemetry"] = "enabled"
 		sink.Config.Merge(defaultMetadata)
-		sink.State = Unknown
-		sink.Error = ""
 		if sink.Format == "yaml" {
 			configDataByte, err := yaml.Marshal(sink.Config)
 			if err != nil {
@@ -475,9 +488,7 @@ func (svc sinkService) ChangeSinkStateInternal(ctx context.Context, sinkID strin
 }
 
 func (svc sinkService) validateBackend(sink *Sink) (be backend.Backend, err error) {
-	if backend.HaveBackend(sink.Backend) {
-		sink.State = Unknown
-	} else {
+	if !backend.HaveBackend(sink.Backend) {
 		return nil, ErrInvalidBackend
 	}
 	sinkBe := backend.GetBackend(sink.Backend)
diff --git a/sinks/sinks_service_test.go b/sinks/sinks_service_test.go
index 9b90ea0db..b68ae8780 100644
--- a/sinks/sinks_service_test.go
+++ b/sinks/sinks_service_test.go
@@ -27,7 +27,6 @@ import (
 )
 
 const (
-	contentType  = "application/json"
 	token        = "token"
 	invalidToken = "invalid"
 	email        = "user@example.com"
@@ -199,17 +198,14 @@ func TestIdempotencyUpdateSink(t *testing.T) {
 }
 
 func TestPartialUpdateSink(t *testing.T) {
-	ctx := context.Background()
 	service := newService(map[string]string{token: email})
 	jsonSinkName, err := types.NewIdentifier("initial-json-Sink")
 	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
 	yamlSinkName, err := types.NewIdentifier("initial-yaml-Sink")
 	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-	//newSinkName, err := types.NewIdentifier("updated-Sink")
-	require.Nil(t, err, fmt.Sprintf("unexpected error: %s", err))
-	//aNewDescription := "A new description worthy reading"
 	aInitialDescription := "A initial description worthy reading"
-	initialJsonSink := sinks.Sink{
+	updatedDescription := "An updated description worthy reading"
+	initialJSONSink := sinks.Sink{
 		Name:        jsonSinkName,
 		Description: &aInitialDescription,
 		Backend:     "prometheus",
@@ -225,27 +221,22 @@ func TestPartialUpdateSink(t *testing.T) {
 		Backend:     "prometheus",
 		State:       sinks.Unknown,
 		Error:       "",
-		ConfigData:  "exporter:\n    remote_host: https://orb.community/\nauthentication:\n    type: basicauth\n    username: netops\n    password: w0w-orb-Rocks!",
+		ConfigData:  "exporter:\n    remote_host: https://orb.community/\nauthentication:\n    type: basicauth\n    username: netops\n    password: dbpass",
 		Format:      "yaml",
 		MFOwnerID:   "OrbCommunity",
 		Tags:        map[string]string{"cloud": "aws"},
 	}
-	jsonCreatedSink, err := service.CreateSink(ctx, token, initialJsonSink)
-	require.NoError(t, err, "failed to create entity")
-	require.NotEmptyf(t, jsonCreatedSink.ID, "id must not be empty")
-	yamlCreatedSink, err := service.CreateSink(ctx, token, initialYamlSink)
-	require.NoError(t, err, "failed to create entity")
-	initialJsonSink.ID = jsonCreatedSink.ID
-	initialYamlSink.ID = yamlCreatedSink.ID
+
 	var cases = map[string]struct {
 		name        string
+		format      string
 		requestSink sinks.Sink
 		expected    func(t *testing.T, value sinks.Sink, err error)
 		token       string
 	}{
 		"update config json": {
+			format: "json",
 			requestSink: sinks.Sink{
-				ID: jsonCreatedSink.ID,
 				Config: map[string]interface{}{
 					"exporter":       map[string]interface{}{"remote_host": "https://orb.community/prom/push"},
 					"authentication": map[string]interface{}{"type": "basicauth", "username": "netops_admin", "password": "newpass"},
@@ -258,23 +249,70 @@ func TestPartialUpdateSink(t *testing.T) {
 				require.Equalf(t, "newpass", value.Config.GetSubMetadata("authentication")["password"], "want %s, got %s", "newpass", value.Config.GetSubMetadata("authentication")["password"])
 			},
 			token: token,
-		}, "update config yaml": {
+		},
+		"update config yaml": {
+			format: "yaml",
 			requestSink: sinks.Sink{
-				ID:         yamlCreatedSink.ID,
 				Format:     "yaml",
-				ConfigData: "exporter:\n    remote_host: https://orb.community/\nauthentication:\n    type: basicauth\n    username: netops\n    password: w0w-orb-Rocks!",
+				ConfigData: "exporter:\n    remote_host: https://orb.community/\nauthentication:\n    type: basicauth\n    username: netops\n    password: dbpass",
 			},
 			expected: func(t *testing.T, value sinks.Sink, err error) {
 				require.NoError(t, err, "no error expected")
 				require.Equalf(t, "https://orb.community/", value.Config.GetSubMetadata("exporter")["remote_host"], "want %s, got %s", "https://orb.community/", value.Config.GetSubMetadata("exporter")["remote_host"])
+				require.Equalf(t, "netops", value.Config.GetSubMetadata("authentication")["username"], "want %s, got %s", "netops", value.Config.GetSubMetadata("authentication")["username"])
+				require.Equalf(t, "dbpass", value.Config.GetSubMetadata("authentication")["password"], "want %s, got %s", "dbpass", value.Config.GetSubMetadata("authentication")["password"])
+			},
+			token: token,
+		},
+		"update description json": {
+			format: "json",
+			requestSink: sinks.Sink{
+				Description: &updatedDescription,
+			},
+			expected: func(t *testing.T, value sinks.Sink, err error) {
+				require.NoError(t, err, "no error expected")
+				require.Equalf(t, "https://orb.community/", value.Config.GetSubMetadata("exporter")["remote_host"], "want %s, got %s", "https://orb.community/", value.Config.GetSubMetadata("exporter")["remote_host"])
+				require.Equalf(t, "dbuser", value.Config.GetSubMetadata("authentication")["username"], "want %s, got %s", "dbuser", value.Config.GetSubMetadata("authentication")["username"])
+				require.Equalf(t, "dbpass", value.Config.GetSubMetadata("authentication")["password"], "want %s, got %s", "dbpass", value.Config.GetSubMetadata("authentication")["password"])
+			},
+			token: token,
+		},
+		"update description yaml": {
+			format: "yaml",
+			requestSink: sinks.Sink{
+				Description: &updatedDescription,
+			},
+			expected: func(t *testing.T, value sinks.Sink, err error) {
+				require.NoError(t, err, "no error expected")
+				require.Equalf(t, "https://orb.community/", value.Config.GetSubMetadata("exporter")["remote_host"], "want %s, got %s", "https://orb.community/", value.Config.GetSubMetadata("exporter")["remote_host"])
+				require.Equalf(t, "netops", value.Config.GetSubMetadata("authentication")["username"], "want %s, got %s", "netops", value.Config.GetSubMetadata("authentication")["username"])
+				require.Equalf(t, "dbpass", value.Config.GetSubMetadata("authentication")["password"], "want %s, got %s", "dbpass", value.Config.GetSubMetadata("authentication")["password"])
 			},
 			token: token,
 		},
 	}
 	for desc, tc := range cases {
 		t.Run(desc, func(t *testing.T) {
+			ctx := context.Background()
+			var sinkToCreate sinks.Sink
+			switch tc.format {
+			case "json":
+				sinkToCreate = initialJSONSink
+			case "yaml":
+				sinkToCreate = initialYamlSink
+			default:
+				t.Errorf("unsupported format %s", tc.format)
+			}
+
+			sink, err := service.CreateSink(ctx, token, sinkToCreate)
+			require.NoError(t, err, "failed to create entity")
+			require.NotEmptyf(t, sink.ID, "id must not be empty")
+
+			tc.requestSink.ID = sink.ID
 			res, err := service.UpdateSink(ctx, tc.token, tc.requestSink)
 			tc.expected(t, res, err)
+			err = service.DeleteSink(ctx, tc.token, sink.ID)
+			assert.NoError(t, err)
 		})
 	}
 }
@@ -506,8 +544,8 @@ func TestUpdateSink(t *testing.T) {
 	}
 
 	for desc, tc := range cases {
-		ctx := context.WithValue(context.Background(), "tc", desc)
 		t.Run(desc, func(t *testing.T) {
+			ctx := context.WithValue(context.Background(), "tc", desc)
 			res, err := service.UpdateSink(ctx, tc.token, tc.incomingSink)
 			if err == nil {
 				assert.Equal(t, tc.expectedSink.Name.String(), res.Name.String(), "sink name not as expected")
diff --git a/ui/README.md b/ui/README.md
index 13bb86cb8..98c139769 100644
--- a/ui/README.md
+++ b/ui/README.md
@@ -9,10 +9,10 @@
 
 The following are needed to run the UI:
 
-* [node](https://nodejs.org/en/blog/release/v12.21.0/)
-* [npm](https://github.com/npm/cli/tree/v7.22.0)
-
-*It is recomended to build the UI using [yarn](https://www.npmjs.com/package/yarn)*
+* [node - lts/fermium](https://nodejs.org/en/blog/release/v14.21.3/)
+* [npm](https://github.com/npm/cli/tree/v6.14.18)
+> If using [nvm](https://github.com/nvm-sh/nvm), simply run  
+> `nvm install lts/fermium`
 
 ### Install
 
@@ -24,7 +24,7 @@ git clone git@github.com:orb-community/orb.git --no-checkout --depth 1 ${path}
 
 # however you clone the project
 cd ${path}/ui
-yarn install
+npm install
 ```
 
 ### Usage
@@ -32,7 +32,7 @@ yarn install
 A developer build from the source can be achieved using the following command:
 
 ```bash
-yarn build
+npm run build
 ```
 
 *(Check [package.json](./package.json) file for available tasks.)*
@@ -42,7 +42,7 @@ yarn build
 
 While developing, it is useful to serve UI locally and have your changes to the code having effect immediately.
 
-The commands `yarn start` and `yarn start:withmock` will generate a dev build and serve it at `http://localhost:4200/`.
+The command `npm run start` will generate a dev build and serve it at `http://localhost:4200/`.
 
 *(Note that `http://localhost:4200/` is for development use only, and is not intended to be used by the end-user.)*
 
@@ -69,9 +69,7 @@ fs.inotify.max_user_watches=524288
 See [data examples](https://github.com/orb-community/orb/wiki/Orb-UI---Entities-Data-Examples) for examples of *Orb Entities*
 to aid in UI design , form validation and related info.
 
-
 ---  
-
 ## QA & Testing
 
 Quality Assurance & Test frameworks and scripts are still a *WORK IN PROGRESS*  
diff --git a/ui/docker/Dockerfile b/ui/docker/Dockerfile
index 9bacbdae4..0e20a297c 100644
--- a/ui/docker/Dockerfile
+++ b/ui/docker/Dockerfile
@@ -8,7 +8,7 @@ ARG ENV_GTAGID=""
 
 COPY ./ /app/
 
-RUN GTAGID=$ENV_GTAGID yarn build:prod
+RUN GTAGID=$ENV_GTAGID npm run build:prod
 
 # Stage 1, based on Nginx, to have only the compiled app, ready for production with Nginx
 FROM nginx:1.13-alpine
diff --git a/ui/docker/Dockerfile.buildyarn b/ui/docker/Dockerfile.buildyarn
index 3e3721a3c..03d3fab30 100644
--- a/ui/docker/Dockerfile.buildyarn
+++ b/ui/docker/Dockerfile.buildyarn
@@ -1,6 +1,7 @@
 # Stage 0, based on Node.js, install all dependencies
-FROM node:14.17
+FROM node:14.21.3
 
 WORKDIR /app
 COPY package.json /app/
-RUN yarn install
+
+RUN npm install
\ No newline at end of file
diff --git a/ui/package.json b/ui/package.json
index d2661df79..bed575b04 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -21,8 +21,9 @@
     "test": "ng test",
     "test:coverage": "rimraf coverage && npm run test -- --code-coverage",
     "lint": "ng lint",
-    "lint:fix": "ng lint orb-ui --fix",
+    "lint:fix": "tslint --fix -c ./tslint.json 'src/**/*{.ts,.tsx}'",
     "lint:styles": "stylelint ./src/**/*.scss",
+    "lint:styles:fix": "stylelint ./src/**/*.scss --fix",
     "lint:ci": "npm run lint && npm run lint:styles",
     "pree2e": "webdriver-manager update --standalone false --gecko false",
     "e2e": "ng e2e",
@@ -55,6 +56,7 @@
     "core-js": "2.5.1",
     "dotenv": "^10.0.0",
     "eva-icons": "^1.1.3",
+    "http-status-codes": "^2.3.0",
     "intl": "1.2.5",
     "ionicons": "2.0.1",
     "js-yaml": "^4.1.0",
diff --git a/ui/src/app/@core/core.module.ts b/ui/src/app/@core/core.module.ts
index 7ea5a6ce7..8f8a1f888 100644
--- a/ui/src/app/@core/core.module.ts
+++ b/ui/src/app/@core/core.module.ts
@@ -49,8 +49,8 @@ export const NB_CORE_PROVIDERS = [
               method: 'put',
               redirect: {
                 success: '/auth/login',
-                failure: null
-              }
+                failure: null,
+              },
             },
             logout:
              { method: null, redirect: { success: '/', failure: '/' } },
@@ -94,7 +94,7 @@ export const NB_CORE_PROVIDERS = [
         },
         tos: {
           required: true,
-        }
+        },
       },
     },
   }).providers,
diff --git a/ui/src/app/@theme/styles/_overrides.scss b/ui/src/app/@theme/styles/_overrides.scss
index 2b3e408b5..71ef97b96 100644
--- a/ui/src/app/@theme/styles/_overrides.scss
+++ b/ui/src/app/@theme/styles/_overrides.scss
@@ -111,7 +111,7 @@
       background: #969fb9;
       border-radius: 16px;
     }
-    scrollbar-color: #969fb9 #969fb980; 
+    scrollbar-color: #969fb9 #969fb980;
     margin: 20px 0 !important;
   }
 
@@ -176,36 +176,36 @@
 
 .tableWrapper {
   display: flex;
-  margin-top: 2em;
+  margin-top: 2em !important;
   flex-direction: column;
   flex-wrap: nowrap;
   align-content: flex-start;
   justify-content: flex-start;
   align-items: stretch;
-  overflow-x: auto;
   min-width: 800px;
+  overflow-x: hidden !important;
 }
 
 .orb-table {
-  min-height: calc(100vh - 300px);
+  min-height: calc(100vh - 300px) !important;
   min-width: 800px;
-  max-height: calc(100vh - 300px);
+  max-height: calc(100vh - 300px) !important;
 }
 
 .orb-table-small {
-  min-height: calc(25vh);
+  min-height: calc(40vh);
   min-width: 600px;
-  max-height: calc(25vh);
+  max-height: calc(40vh);
 }
 
 .orb-service- {
-  &new {
+  &new, &unknown {
     color: #9b51e0;
   }
-  &online, &healthy {
+  &online, &healthy, &active {
     color: #6fcf97;
   }
-  &stale {
+  &stale, &idle {
     color: #f2994a;
   }
   &error, &failure {
@@ -214,6 +214,38 @@
   &offline, &none {
     color: #969fb9;
   }
+  &provisioning {
+    color: #3089fc;
+  }
+  &provioning_error {
+    color: #df316f;
+  }
+  &warning {
+    color: #f2c94c;
+  }
+}
+.orb-service-background- {
+  &new, &unknown {
+    background-color: #9b51e0;
+  }
+  &online, &healthy, &active {
+    background-color: #6fcf97;
+  }
+  &stale, &idle {
+    background-color: #f2994a;
+  }
+  &error, &failure, &provioning_error {
+    background-color: #df316f;
+  }
+  &offline, &none {
+    background-color: #969fb9;
+  }
+  &warning {
+    background-color: #f2c94c;
+  }
+  &provisioning {
+    background-color: #3089fc;
+  }
 }
 .required {
   color: #df316f;
@@ -257,14 +289,18 @@
   }
 }
 .delete-selected {
-  color: #ffffff !important; 
+  color: #ffffff !important;
   font-family: 'Montserrat', sans-serif;
   font-weight: 600;
   text-transform: none !important;
-  width: 110px;
+  width: 105px;
   background-color: #df316f !important;
   opacity: 0;
   animation: appear 0.3s forwards;
+  height: 27px;
+  font-size: 14px;
+  align-self: flex-end;
+  margin-bottom: 5px;
 }
 
 @keyframes appear {
@@ -294,14 +330,17 @@ input {
 }
 .next-button {
   border-radius: 16px !important;
-  background: #3089FC !important; 
+  background: #3089fc !important;
   padding: 8px 24px !important;
   color: #fff !important;
-  border: none !important; 
+  border: none !important;
   outline: none !important;
   font-size: 14px !important;
   font-weight: 600 !important;
   transition: background-color 0.3s ease !important;
+  font-family: 'Montserrat';
+  max-height: 32px !important;
+  line-height: 1.15 !important;
 }
 .next-button:hover {
   background-color: #509afc!important;
@@ -310,16 +349,19 @@ input {
   background: #2b3148 !important;
 }
 .cancel-back-button {
-  border-radius: 16px !important;; 
+  border-radius: 16px !important;
   padding: 8px 24px !important;
   background-color: transparent !important;
-  color: #3089FC !important;
+  color: #3089fc !important;
   border: none !important;
   outline: none !important;
   font-size: 14px !important;
-  font-weight: 600 !important; 
+  font-weight: 600 !important;
   transition: background-color 0.3s ease !important;
   margin-right: 0 !important;
+  font-family: 'Montserrat';
+  max-height: 32px !important;
+  line-height: 1.15 !important;
 }
 .cancel-back-button:hover {
   background-color: rgba(255, 255, 255, 0.05) !important;
diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts
index abf751850..128523b34 100644
--- a/ui/src/app/app.module.ts
+++ b/ui/src/app/app.module.ts
@@ -41,7 +41,6 @@ import { ProfileComponent } from 'app/pages/profile/profile.component';
 import { GoogleAnalyticsService } from './common/services/analytics/google-service-analytics.service';
 import { MonacoEditorModule } from 'ngx-monaco-editor';
 import { OrbService } from './common/services/orb.service';
-import { CodeEditorService } from 'app/common/services/code.editor.service';
 
 
 @NgModule({
diff --git a/ui/src/app/auth/auth.token.interceptor.service.ts b/ui/src/app/auth/auth.token.interceptor.service.ts
index b61c8e59e..9943e7a94 100644
--- a/ui/src/app/auth/auth.token.interceptor.service.ts
+++ b/ui/src/app/auth/auth.token.interceptor.service.ts
@@ -48,6 +48,7 @@ export class TokenInterceptor implements HttpInterceptor {
           if (expirationDate < new Date()) {
             this.authService.logout('email');
             this.router.navigate(['auth/login']);
+            localStorage.removeItem('auth_app_token');
           }
 
           request = request.clone({
diff --git a/ui/src/app/auth/components/auth.component.scss b/ui/src/app/auth/components/auth.component.scss
index 6bf4c46ee..310b18736 100644
--- a/ui/src/app/auth/components/auth.component.scss
+++ b/ui/src/app/auth/components/auth.component.scss
@@ -1,3 +1,7 @@
+@import '~bootstrap/scss/mixins/breakpoints';
+@import '~@nebular/theme/styles/global/breakpoints';
+@import '../../@theme/styles/themes';
+
 :host {
   $auth-layout-padding: 2.5rem;
 
@@ -29,7 +33,7 @@
     margin: auto;
   }
 
-media-breakpoint-down(sm) {
+@include media-breakpoint-down(sm) {
   nb-card {
     border-radius: 0;
     height: 100vh;
@@ -39,10 +43,12 @@ media-breakpoint-down(sm) {
   ::ng-deep {
     nb-layout .layout .layout-container .content .columns nb-layout-column {
       padding: $auth-layout-padding;
-
-    media-breakpoint-down(sm) {
-      padding: 0;
     }
+    @include media-breakpoint-down(sm) {
+      nb-layout .layout .layout-container .content .columns nb-layout-column {
+      padding: 0;
+      }
     }
+    
   }
 }
diff --git a/ui/src/app/auth/pages/login/login.component.scss b/ui/src/app/auth/pages/login/login.component.scss
index 3f009f11c..01f47cce5 100644
--- a/ui/src/app/auth/pages/login/login.component.scss
+++ b/ui/src/app/auth/pages/login/login.component.scss
@@ -53,7 +53,7 @@
   top: 0;
   width: 600px;
 
-  input[type="checkbox"] {
+  input[type='checkbox'] {
     height: 2rem;
     padding: 0 1rem;
     margin-top: 0.5rem;
diff --git a/ui/src/app/auth/pages/register/register.component.html b/ui/src/app/auth/pages/register/register.component.html
index c555fe44a..728b8ea6f 100644
--- a/ui/src/app/auth/pages/register/register.component.html
+++ b/ui/src/app/auth/pages/register/register.component.html
@@ -190,14 +190,20 @@ <h1 class="title" id="title">Create an account</h1>
         </div>
 
         <div class="form-control-group accept-group" *ngIf="getConfigValue('forms.register.terms')">
+          <div class="accept-group-display">
           <input type="checkbox" name="terms" id="input-terms" #terms="ngModel" [(ngModel)]="user.terms"
             [required]="getConfigValue('forms.register.terms')" />
           <label class="label" for="input-terms">
-            I agree to the NetBox Labs 
+            I agree to the NetBox Labs
+            <a href="https://netboxlabs.com/privacy" target="_blank">
+              <strong>Privacy Policy</strong>
+            </a>
+            and
             <a href="https://netboxlabs.com/terms-of-service" target="_blank">
               <strong>Terms & Conditions</strong>
             </a>
           </label>
+          </div>
           <ng-container *ngIf="terms.invalid && terms.touched">
             <p *ngIf="terms.errors?.required" class="caption status-danger mb-1">
               You must agree to the terms of service!
diff --git a/ui/src/app/auth/pages/register/register.component.scss b/ui/src/app/auth/pages/register/register.component.scss
index 969698a1f..13bac8523 100644
--- a/ui/src/app/auth/pages/register/register.component.scss
+++ b/ui/src/app/auth/pages/register/register.component.scss
@@ -1 +1,10 @@
 @import '../login/login.component';
+
+.accept-group-display{
+  display: inline-flex;
+  margin-top: 0.5rem;
+  align-items: stretch;
+  .label {
+    margin-top: 0.9rem;
+  }
+}
\ No newline at end of file
diff --git a/ui/src/app/auth/pages/register/register.component.ts b/ui/src/app/auth/pages/register/register.component.ts
index 24b15a02c..46547661f 100644
--- a/ui/src/app/auth/pages/register/register.component.ts
+++ b/ui/src/app/auth/pages/register/register.component.ts
@@ -59,7 +59,7 @@ export class RegisterComponent extends NbRegisterComponent implements OnInit {
     this.errors = this.messages = [];
     this.submitted = true;
     this.repeatedEmail = null;
-    
+
     const { email, password, company } = this.user;
     this.authService
       .register(this.strategy, {
@@ -87,7 +87,7 @@ export class RegisterComponent extends NbRegisterComponent implements OnInit {
           }
         }
       });
-    
+
   }
 
   authenticateAndRedirect(email, password) {
diff --git a/ui/src/app/common/interfaces/orb/agent.policy.interface.ts b/ui/src/app/common/interfaces/orb/agent.policy.interface.ts
index cdb932037..04b4454e3 100644
--- a/ui/src/app/common/interfaces/orb/agent.policy.interface.ts
+++ b/ui/src/app/common/interfaces/orb/agent.policy.interface.ts
@@ -18,6 +18,12 @@ export enum AgentPolicyUsage {
   notInUse = 'not in use',
 }
 
+export enum AgentPolicyBackend {
+  pktvisor = 'pktvisor',
+  diode = 'diode',
+  otel = 'otel',
+}
+
 export interface AgentPolicyState {
   id?: string;
   name?: string;
diff --git a/ui/src/app/common/interfaces/orb/filter-option.ts b/ui/src/app/common/interfaces/orb/filter-option.ts
index ac959d094..cbd56fcc0 100644
--- a/ui/src/app/common/interfaces/orb/filter-option.ts
+++ b/ui/src/app/common/interfaces/orb/filter-option.ts
@@ -2,9 +2,10 @@ import { Observable } from 'rxjs';
 
 export enum FilterTypes {
   Input, // string input
-  AutoComplete,
+  Tags,
   Select, // allows select one option
   MultiSelect, // allows select multi options
+  MultiSelectAsync, // allows select multi options | async
   Checkbox, // on|off option
   Number, // number input
 }
@@ -46,20 +47,39 @@ export function filterTags(item: any, prop: any, value: any, exact?: any) {
   if (!item || typeof item[prop] !== 'object') {
     return false;
   }
-  // tag values
   const values = Object.entries(item[prop]).map(
     (entry) => `${entry[0]}:${entry[1]}`,
   );
   const filterFn = exact ? filterExact : filterSubstr;
   const filterValue = value.replace(' ', '');
+
   return values.reduce((acc, val) => {
     acc = acc || filterFn(val, filterValue);
     return acc;
   }, false);
+
+}
+
+export function filterMultiTags(item: any, prop: any, values: any[], exact?: any) {
+  if (!item || typeof item[prop] !== 'object') {
+    return false;
+  }
+  const filterFn = exact ? filterExact : filterSubstr;
+  const itemValues = Object.entries(item[prop]).map(
+    (entry) => `${entry[0]}:${entry[1]}`,
+  );
+  return values.some(filterValue => {
+    const normalizedFilterValue = filterValue.replace(' ', '');
+    return itemValues.some(val => filterFn(val, normalizedFilterValue));
+  });
 }
 
 export function filterMultiSelect(item: any, prop: any, values: any, exact?: any) {
   return values.reduce((prev, cur) => {
-    return item[prop] === cur || prev;
+    if (exact) {
+      return item[prop] ? item[prop].toString() === cur || prev : false;
+    } else {
+      return item[prop] ? item[prop].toString().includes(cur) || prev : false;
+    }
   }, false);
 }
diff --git a/ui/src/app/common/interfaces/orb/sink.interface.ts b/ui/src/app/common/interfaces/orb/sink.interface.ts
index 658618577..1be3921af 100644
--- a/ui/src/app/common/interfaces/orb/sink.interface.ts
+++ b/ui/src/app/common/interfaces/orb/sink.interface.ts
@@ -16,6 +16,9 @@ export enum SinkStates {
   error = 'error',
   idle = 'idle',
   unknown = 'unknown',
+  provisioning = 'provisioning',
+  provisioning_error = 'provisioning_error',
+  warning = 'warning',
 }
 
 /**
@@ -23,7 +26,7 @@ export enum SinkStates {
  */
 export enum SinkBackends {
   prometheus = 'prometheus',
-  otlp = 'otlphttp'
+  otlp = 'OTLP HTTP',
 }
 
 /**
diff --git a/ui/src/app/common/interfaces/orb/sink/config/otlp.config.interface.ts b/ui/src/app/common/interfaces/orb/sink/config/otlp.config.interface.ts
index 4d191fce6..f3643b832 100644
--- a/ui/src/app/common/interfaces/orb/sink/config/otlp.config.interface.ts
+++ b/ui/src/app/common/interfaces/orb/sink/config/otlp.config.interface.ts
@@ -23,13 +23,13 @@ export interface OtlpConfig extends SinkConfig<string> {
         *  Username|Email(?) {string}
         */
         username?: string;
-    }
+    };
     exporter: |any| {
         /**
         *  Endpoint (Otlp sinks) or Remote Host (Prometheus sink) Link {string}
         */
         endpoint?: string;
         remote_host?: string;
-    }
-    
-}
\ No newline at end of file
+    };
+
+}
diff --git a/ui/src/app/common/services/agents/agent.groups.service.ts b/ui/src/app/common/services/agents/agent.groups.service.ts
index 907d96551..ec675cbd6 100644
--- a/ui/src/app/common/services/agents/agent.groups.service.ts
+++ b/ui/src/app/common/services/agents/agent.groups.service.ts
@@ -8,6 +8,8 @@ import { OrbPagination } from 'app/common/interfaces/orb/pagination.interface';
 import { NotificationsService } from 'app/common/services/notifications/notifications.service';
 import { environment } from 'environments/environment';
 import { catchError, expand, map, scan, takeWhile } from 'rxjs/operators';
+import { getStatusCodeText } from '../http-codes';
+
 @Injectable()
 export class AgentGroupsService {
   constructor(
@@ -31,7 +33,7 @@ export class AgentGroupsService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to create Agent Group',
-          `Error: ${err.status} - ${err.statusText} - ${err.error.error}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)} - ${err.error.error}`,
         );
         return Observable.throwError(err);
       });
@@ -53,7 +55,7 @@ export class AgentGroupsService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to Validate Agent Group',
-          `Error: ${err.status} - ${err.statusText} - ${err.error.error}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)} - ${err.error.error}`,
         );
         return Observable.throwError(err);
       });
@@ -64,7 +66,7 @@ export class AgentGroupsService {
       catchError((err) => {
         this.notificationsService.error(
           'Failed to fetch Agent Group',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         err['id'] = id;
         return of(err);
@@ -129,7 +131,7 @@ export class AgentGroupsService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to get Agent Groups',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         return Observable.throwError(err);
       });
@@ -144,7 +146,7 @@ export class AgentGroupsService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to edit Agent Group',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         return Observable.throwError(err);
       });
@@ -156,7 +158,7 @@ export class AgentGroupsService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to Delete Agent Group',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         return Observable.throwError(err);
       });
diff --git a/ui/src/app/common/services/agents/agent.policies.service.ts b/ui/src/app/common/services/agents/agent.policies.service.ts
index 35fb9d7ca..79cb04b20 100644
--- a/ui/src/app/common/services/agents/agent.policies.service.ts
+++ b/ui/src/app/common/services/agents/agent.policies.service.ts
@@ -8,6 +8,7 @@ import { OrbPagination } from 'app/common/interfaces/orb/pagination.interface';
 import { NotificationsService } from 'app/common/services/notifications/notifications.service';
 import { environment } from 'environments/environment';
 import { catchError, expand, map, scan, takeWhile } from 'rxjs/operators';
+import { getStatusCodeText } from '../http-codes';
 
 @Injectable()
 export class AgentPoliciesService {
@@ -47,7 +48,7 @@ export class AgentPoliciesService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to duplicate Agent Policy',
-          `Error: ${err.status} - ${err.statusText} - ${err.error.error}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)} - ${err.error.error}`,
         );
         return of(err);
       });
@@ -58,7 +59,7 @@ export class AgentPoliciesService {
       catchError((err) => {
         this.notificationsService.error(
           'Failed to fetch Agent Policy',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         err['id'] = id;
         return of(err);
@@ -72,7 +73,7 @@ export class AgentPoliciesService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to Edit Agent Policy',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         return throwError(err);
       });
@@ -84,7 +85,7 @@ export class AgentPoliciesService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to Delete Agent Policies',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         return Observable.throwError(err);
       });
@@ -144,7 +145,7 @@ export class AgentPoliciesService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to get Agent Policies',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         return Observable.throwError(err);
       });
@@ -159,7 +160,7 @@ export class AgentPoliciesService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to get Available Backends',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         return Observable.throwError(err);
       });
@@ -176,7 +177,7 @@ export class AgentPoliciesService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to get Available Backends',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         return Observable.throwError(err);
       });
diff --git a/ui/src/app/common/services/agents/agents.service.ts b/ui/src/app/common/services/agents/agents.service.ts
index 4a4218310..806cb0175 100644
--- a/ui/src/app/common/services/agents/agents.service.ts
+++ b/ui/src/app/common/services/agents/agents.service.ts
@@ -15,6 +15,7 @@ import { OrbPagination } from 'app/common/interfaces/orb/pagination.interface';
 import { NotificationsService } from 'app/common/services/notifications/notifications.service';
 import { environment } from 'environments/environment';
 import { expand, map, scan, takeWhile } from 'rxjs/operators';
+import { getStatusCodeText } from '../http-codes';
 
 export enum AvailableOS {
   DOCKER = 'docker',
@@ -45,7 +46,7 @@ export class AgentsService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to create Agent',
-          `Error: ${err.status} - ${err.statusText} - ${err.error.error}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)} - ${err.error.error}`,
         );
         return Observable.throwError(err);
       });
@@ -61,7 +62,7 @@ export class AgentsService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to reset Agent',
-          `Error: ${err.status} - ${err.statusText} - ${err.error.error}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)} - ${err.error.error}`,
         );
         return Observable.throwError(err);
       });
@@ -80,7 +81,7 @@ export class AgentsService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to Validate Agent',
-          `Error: ${err.status} - ${err.statusText} - ${err.error.error}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)} - ${err.error.error}`,
         );
         return Observable.throwError(err);
       });
@@ -98,7 +99,7 @@ export class AgentsService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to fetch Agent',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         return Observable.throwError(err);
       });
@@ -116,7 +117,7 @@ export class AgentsService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to edit Agent',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         return Observable.throwError(err);
       });
@@ -128,7 +129,7 @@ export class AgentsService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to Delete Agent',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         return Observable.throwError(err);
       });
@@ -202,7 +203,7 @@ export class AgentsService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to get Agents',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         return Observable.throwError(err);
       });
diff --git a/ui/src/app/common/services/bootstrap/bootstrap.service.ts b/ui/src/app/common/services/bootstrap/bootstrap.service.ts
index 83fa67a61..e620dfae8 100644
--- a/ui/src/app/common/services/bootstrap/bootstrap.service.ts
+++ b/ui/src/app/common/services/bootstrap/bootstrap.service.ts
@@ -6,6 +6,7 @@ import { Gateway } from 'app/common/interfaces/gateway.interface';
 import { Config, ConfigContent, ConfigUpdate } from 'app/common/interfaces/bootstrap.interface';
 import { NotificationsService } from 'app/common/services/notifications/notifications.service';
 import { ThingsService } from 'app/common/services/things/things.service';
+import { getStatusCodeText } from '../http-codes';
 
 @Injectable()
 export class BootstrapService {
@@ -70,7 +71,7 @@ export class BootstrapService {
         err => {
           this.notificationsService.error(
             'Failed to add bootstrap config to gateway',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
         },
       );
   }
diff --git a/ui/src/app/common/services/code.editor.service.ts b/ui/src/app/common/services/code.editor.service.ts
index 07a00df63..ad45681d5 100644
--- a/ui/src/app/common/services/code.editor.service.ts
+++ b/ui/src/app/common/services/code.editor.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from "@angular/core";
+import { Injectable } from '@angular/core';
 import * as YAML from 'yaml';
 
 @Injectable({
@@ -29,8 +29,8 @@ export class CodeEditorService {
     }
 
     checkEmpty (object) {
-        for (let key in object) {
-            if (object[key] === "" || typeof object[key] === "undefined" || object[key] === null) {
+        for (const key in object) {
+            if (object[key] === '' || typeof object[key] === 'undefined' || object[key] === null) {
                 return true;
             }
         }
diff --git a/ui/src/app/common/services/dataset/dataset.policies.service.ts b/ui/src/app/common/services/dataset/dataset.policies.service.ts
index 97697e5a4..e6a1b0cf2 100644
--- a/ui/src/app/common/services/dataset/dataset.policies.service.ts
+++ b/ui/src/app/common/services/dataset/dataset.policies.service.ts
@@ -8,6 +8,7 @@ import { OrbPagination } from 'app/common/interfaces/orb/pagination.interface';
 import { NotificationsService } from 'app/common/services/notifications/notifications.service';
 import { environment } from 'environments/environment';
 import { catchError, expand, map, scan, takeWhile } from 'rxjs/operators';
+import { getStatusCodeText } from '../http-codes';
 
 @Injectable()
 export class DatasetPoliciesService {
@@ -29,7 +30,7 @@ export class DatasetPoliciesService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to create Dataset for this Policy',
-          `Error: ${err.status} - ${err.statusText} - ${err.error.error}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)} - ${err.error.error}`,
         );
         return Observable.throwError(err);
       });
@@ -40,10 +41,10 @@ export class DatasetPoliciesService {
       .get<Dataset>(`${environment.datasetPoliciesUrl}/${id}`)
       .pipe(
         catchError((err) => {
-          if (err.status !== 404 && err.error.error !== "non-existent entity") {
+          if (err.status !== 404 && err.error.error !== 'non-existent entity') {
             this.notificationsService.error(
               'Failed to fetch Dataset of this Policy',
-              `Error: ${err.status} - ${err.statusText}`,
+              `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
             );
           }
           err['id'] = id;
@@ -61,7 +62,7 @@ export class DatasetPoliciesService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to edit Dataset',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         return Observable.throwError(err);
       });
@@ -76,7 +77,7 @@ export class DatasetPoliciesService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to Delete Dataset Policies',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         return Observable.throwError(err);
       });
@@ -144,7 +145,7 @@ export class DatasetPoliciesService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to get Datasets',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         return Observable.throwError(err);
       });
diff --git a/ui/src/app/common/services/filter.service.ts b/ui/src/app/common/services/filter.service.ts
index 8d1d46701..8ea39270f 100644
--- a/ui/src/app/common/services/filter.service.ts
+++ b/ui/src/app/common/services/filter.service.ts
@@ -14,6 +14,8 @@ export class FilterService {
 
   private activeRoute$: Observable<string>;
 
+  public searchName: string;
+
   constructor(private router: Router) {
     this.activeRoute$ = this.router.events.pipe(
       filter((event) => event instanceof NavigationEnd),
@@ -29,6 +31,18 @@ export class FilterService {
 
   private loadFromRoute(route: string) {
     const storedFilters = window.sessionStorage.getItem(route) || '[]';
+    const storedFiltersList = JSON.parse(storedFilters);
+    let found = false;
+
+    storedFiltersList.map((filter) => {
+      if (filter.name === 'Name' && filter.prop === 'name') {
+        this.searchName = filter.param;
+        found = true;
+      }
+    });
+    if (!found) {
+      this.searchName = '';
+    }
 
     this.resetFilters(JSON.parse(storedFilters));
   }
@@ -53,7 +67,8 @@ export class FilterService {
   }
 
   cleanFilters() {
-    this.commitFilter([]);
+    const filters = this._filters.filter((f) => f.name === 'Name');
+    this.commitFilter(filters);
   }
 
   private commitFilter(filters: FilterOption[]) {
@@ -74,8 +89,17 @@ export class FilterService {
     }
   }
 
-  removeFilterByParam(param: string) {
-    this.removeFilter(this._filters.findIndex((filter) => filter.param === param && filter.name === 'Name' && filter));
+  findAndRemove(param: any, name: string) {
+    this.removeFilter(this._filters.findIndex((f) => f.param === param && f.name === name && f));
+  }
+
+  findFilter(param: any, name: string) {
+    return this._filters.findIndex((f) => f.param === param && f.name === name && f);
+  }
+
+  getMultiAppliedParams(filterName: string) {
+    const filter = this._filters.find((f) => f.name === filterName);
+    return filter?.param ? filter.param : [];
   }
 
   // make a decorator out of this?
diff --git a/ui/src/app/common/services/fleets/fleets.service.ts b/ui/src/app/common/services/fleets/fleets.service.ts
index 75b5ce75d..2cf80a3d1 100644
--- a/ui/src/app/common/services/fleets/fleets.service.ts
+++ b/ui/src/app/common/services/fleets/fleets.service.ts
@@ -7,6 +7,7 @@ import { Router } from '@angular/router';
 import { environment } from 'environments/environment';
 import { User } from 'app/common/interfaces/mainflux.interface';
 import { NotificationsService } from 'app/common/services/notifications/notifications.service';
+import { getStatusCodeText } from '../http-codes';
 
 const defLimit: number = 100;
 
@@ -31,7 +32,7 @@ export class FleetsService {
       .catch(
         err => {
           this.notificationsService.error('Failed to create User',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
           return Observable.throw(err);
         },
       );
@@ -77,7 +78,7 @@ export class FleetsService {
       .catch(
         err => {
           this.notificationsService.error('Failed to fetch Users',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
           return Observable.throw(err);
         },
       );
@@ -93,7 +94,7 @@ export class FleetsService {
       .catch(
         err => {
           this.notificationsService.error('Failed to edit User',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
           return Observable.throw(err);
         },
       );
@@ -109,7 +110,7 @@ export class FleetsService {
       .catch(
         err => {
           this.notificationsService.error('Failed to change User password',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
           return Observable.throw(err);
         },
       );
@@ -133,7 +134,7 @@ export class FleetsService {
       .catch(
         err => {
           this.notificationsService.error('Failed to fetch Group memberships',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
           return Observable.throw(err);
         },
       );
diff --git a/ui/src/app/common/services/http-codes.ts b/ui/src/app/common/services/http-codes.ts
new file mode 100644
index 000000000..904c565dc
--- /dev/null
+++ b/ui/src/app/common/services/http-codes.ts
@@ -0,0 +1,5 @@
+import { StatusCodes } from 'http-status-codes';
+
+export function getStatusCodeText(statusCode: number): string {
+    return StatusCodes[statusCode];
+};
\ No newline at end of file
diff --git a/ui/src/app/common/services/orb.service.ts b/ui/src/app/common/services/orb.service.ts
index acf5f0aa8..0e77af6e4 100644
--- a/ui/src/app/common/services/orb.service.ts
+++ b/ui/src/app/common/services/orb.service.ts
@@ -22,7 +22,6 @@ import {
   debounceTime,
   map,
   mergeMap,
-  retry,
   shareReplay,
   switchMap,
   takeUntil,
@@ -74,7 +73,7 @@ export class OrbService implements OnDestroy {
       this.pollController$.pipe(
         switchMap((control) => {
           if (control === PollControls.RESUME)
-            return defer(() => timer(1, this.pollInterval)); 
+            return defer(() => timer(1, this.pollInterval));
           return EMPTY;
         }),
       ),
@@ -91,7 +90,6 @@ export class OrbService implements OnDestroy {
           }),
         ),
       ),
-      retry(),
       shareReplay(1),
     );
   }
@@ -116,20 +114,22 @@ export class OrbService implements OnDestroy {
 
     if (localStorage.getItem(pollIntervalKey)) {
       pollInterval = Number(localStorage.getItem(pollIntervalKey));
-    } 
-    else {
+    } else {
       pollInterval = 60000;
       localStorage.setItem(pollIntervalKey, pollInterval.toString());
     }
-  
+
     return pollInterval;
   }
 
-  private mapTags = (list: AgentGroup[] & Sink[]) => {
+  private mapTags = (list: (AgentGroup & Sink)[]) => {
     return list
-      .map((item) =>
-        Object.entries(item.tags).map((entry) => `${entry[0]}: ${entry[1]}`),
-      )
+      .map((item) => {
+        if (item.tags) {
+          return Object.entries(item.tags).map((entry) => `${entry[0]}: ${entry[1]}`);
+        }
+        return [];
+      })
       .reduce((acc, val) => acc.concat(val), [])
       .filter(this.onlyUnique);
   }
@@ -160,6 +160,16 @@ export class OrbService implements OnDestroy {
       ),
     );
   }
+  getAgentsVersions() {
+    return this.observe(this.agent.getAllAgents()).pipe(
+      map((agents) => {
+        return agents
+          .map((_agent) => _agent?.agent_metadata?.orb_agent?.version)
+          .filter(version => version !== undefined)
+          .filter(this.onlyUnique);
+      }),
+    );
+  }
 
   getGroupsTags() {
     return this.observe(this.group.getAllAgentGroups()).pipe(
@@ -209,7 +219,7 @@ export class OrbService implements OnDestroy {
               : of([]);
           return groups$.pipe(map((groups) => ({ agent, groups, datasets })));
         }),
-      )
+      ),
     );
   }
 
@@ -267,8 +277,8 @@ export class OrbService implements OnDestroy {
           policy: { ...policy, groups, datasets },
           groups,
         })),
-      )
-    ); 
+      ),
+    );
   }
 
   getSinkView(id: string) {
@@ -288,6 +298,10 @@ export class OrbService implements OnDestroy {
       map((sinks) => this.mapTags(sinks)),
     );
   }
-
+  getPolicyTags() {
+    return this.observe(this.policy.getAllAgentPolicies()).pipe(
+      map((policies) => this.mapTags(policies)),
+    );
+  }
   onlyUnique = (value, index, self) => self.indexOf(value) === index;
 }
diff --git a/ui/src/app/common/services/sinks/sinks.service.ts b/ui/src/app/common/services/sinks/sinks.service.ts
index 059286c5c..28f9f9db2 100644
--- a/ui/src/app/common/services/sinks/sinks.service.ts
+++ b/ui/src/app/common/services/sinks/sinks.service.ts
@@ -8,6 +8,7 @@ import { Sink } from 'app/common/interfaces/orb/sink.interface';
 import { NotificationsService } from 'app/common/services/notifications/notifications.service';
 import { environment } from 'environments/environment';
 import { catchError, expand, map, scan, takeWhile } from 'rxjs/operators';
+import { getStatusCodeText } from '../http-codes';
 
 @Injectable()
 export class SinksService {
@@ -29,7 +30,7 @@ export class SinksService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to create Sink',
-          `Error: ${err.status} - ${err.statusText} - ${err.error.error}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)} - ${err.error.error}`,
         );
         return Observable.throwError(err);
       });
@@ -40,7 +41,7 @@ export class SinksService {
       catchError((err) => {
         this.notificationsService.error(
           'Failed to fetch Sink',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         err['id'] = sinkId;
         return of(err);
@@ -57,7 +58,7 @@ export class SinksService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to get Sink Backends',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         return Observable.throwError(err);
       });
@@ -123,7 +124,7 @@ export class SinksService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to get Sinks',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         return Observable.throwError(err);
       });
@@ -138,7 +139,7 @@ export class SinksService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to edit Sink',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         return Observable.throwError(err);
       });
@@ -153,7 +154,7 @@ export class SinksService {
       .catch((err) => {
         this.notificationsService.error(
           'Failed to delete Sink',
-          `Error: ${err.status} - ${err.statusText}`,
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`,
         );
         return Observable.throwError(err);
       });
diff --git a/ui/src/app/common/services/things/things.service.ts b/ui/src/app/common/services/things/things.service.ts
index bb39a2d00..ebc58d868 100644
--- a/ui/src/app/common/services/things/things.service.ts
+++ b/ui/src/app/common/services/things/things.service.ts
@@ -5,6 +5,7 @@ import { Observable } from 'rxjs';
 import { environment } from 'environments/environment';
 import { Thing, PageFilters } from 'app/common/interfaces/mainflux.interface';
 import { NotificationsService } from 'app/common/services/notifications/notifications.service';
+import { getStatusCodeText } from '../http-codes';
 
 const defLimit: number = 10;
 const defConnLimit: number = 5;
@@ -27,7 +28,7 @@ export class ThingsService {
       .catch(
         err => {
           this.notificationsService.error('Failed to create Thing',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
           return Observable.throw(err);
         },
       );
@@ -43,7 +44,7 @@ export class ThingsService {
       .catch(
         err => {
           this.notificationsService.error('Failed to create Things',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
           return Observable.throw(err);
         },
       );
@@ -59,7 +60,7 @@ export class ThingsService {
       .catch(
         err => {
           this.notificationsService.error('Failed to fetch Thing',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
           return Observable.throw(err);
         },
       );
@@ -96,7 +97,7 @@ export class ThingsService {
       .catch(
         err => {
           this.notificationsService.error('Failed to get Things',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
           return Observable.throw(err);
         },
       );
@@ -112,7 +113,7 @@ export class ThingsService {
       .catch(
         err => {
           this.notificationsService.error('Failed to delete Thing',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
           return Observable.throw(err);
         },
       );
@@ -128,7 +129,7 @@ export class ThingsService {
       .catch(
         err => {
           this.notificationsService.error('Failed to edit Thing',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
           return Observable.throw(err);
         },
       );
@@ -153,7 +154,7 @@ export class ThingsService {
     .catch(
       err => {
         this.notificationsService.error('Failed to fetch connected Chanels to the Thing',
-          `Error: ${err.status} - ${err.statusText}`);
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
         return Observable.throw(err);
       },
     );
@@ -179,7 +180,7 @@ export class ThingsService {
     .catch(
       err => {
         this.notificationsService.error('Failed to fetch not connected Channels to the Thing',
-          `Error: ${err.status} - ${err.statusText}`);
+          `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
         return Observable.throw(err);
       },
     );
diff --git a/ui/src/app/common/services/users/groups.service.ts b/ui/src/app/common/services/users/groups.service.ts
index f70468cdf..a92949bf9 100644
--- a/ui/src/app/common/services/users/groups.service.ts
+++ b/ui/src/app/common/services/users/groups.service.ts
@@ -5,6 +5,7 @@ import { Observable } from 'rxjs';
 import { environment } from 'environments/environment';
 import { UserGroup } from 'app/common/interfaces/mainflux.interface';
 import { NotificationsService } from 'app/common/services/notifications/notifications.service';
+import { getStatusCodeText } from '../http-codes';
 
 const defLimit: number = 100;
 
@@ -26,7 +27,7 @@ export class UserGroupsService {
       .catch(
         err => {
           this.notificationsService.error('Failed to create User Group',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
           return Observable.throw(err);
         },
       );
@@ -42,7 +43,7 @@ export class UserGroupsService {
       .catch(
         err => {
           this.notificationsService.error('Failed to edit User Group',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
           return Observable.throw(err);
         },
       );
@@ -58,7 +59,7 @@ export class UserGroupsService {
       .catch(
         err => {
           this.notificationsService.error('Failed to delete User Group',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
           return Observable.throw(err);
         },
       );
@@ -78,7 +79,7 @@ export class UserGroupsService {
       .catch(
         err => {
           this.notificationsService.error('Failed to Assing User to Group',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
             return Observable.throw(err);
         },
       );
@@ -97,7 +98,7 @@ export class UserGroupsService {
       .catch(
         err => {
           this.notificationsService.error('Failed to Unassing User from Group',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
             return Observable.throw(err);
         },
       );
@@ -113,7 +114,7 @@ export class UserGroupsService {
       .catch(
         err => {
           this.notificationsService.error('Failed to fetch User Group',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
             return Observable.throw(err);
         },
       );
@@ -140,7 +141,7 @@ export class UserGroupsService {
       .catch(
         err => {
           this.notificationsService.error('Failed to fetch User Groups',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
             return Observable.throw(err);
         },
       );
@@ -156,7 +157,7 @@ export class UserGroupsService {
       .catch(
         err => {
           this.notificationsService.error('Failed to fetch Group members',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
             return Observable.throw(err);
         },
       );
diff --git a/ui/src/app/common/services/users/users.service.ts b/ui/src/app/common/services/users/users.service.ts
index acf979cc1..0f7979f11 100644
--- a/ui/src/app/common/services/users/users.service.ts
+++ b/ui/src/app/common/services/users/users.service.ts
@@ -7,6 +7,7 @@ import { Router } from '@angular/router';
 import { environment } from 'environments/environment';
 import { User } from 'app/common/interfaces/mainflux.interface';
 import { NotificationsService } from 'app/common/services/notifications/notifications.service';
+import { getStatusCodeText } from '../http-codes';
 
 const defLimit: number = 20;
 
@@ -30,7 +31,7 @@ export class UsersService {
       .catch(
         err => {
           this.notificationsService.error('Failed to create User',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
           return Observable.throw(err);
         },
       );
@@ -76,7 +77,7 @@ export class UsersService {
       .catch(
         err => {
           this.notificationsService.error('Failed to fetch Users',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
             return Observable.throw(err);
         },
       );
@@ -92,7 +93,7 @@ export class UsersService {
       .catch(
         err => {
           this.notificationsService.error('Failed to edit User',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
             return Observable.throw(err);
         },
       );
@@ -108,7 +109,7 @@ export class UsersService {
       .catch(
         err => {
           this.notificationsService.error('Failed to change User password',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
             return Observable.throw(err);
         },
       );
@@ -132,7 +133,7 @@ export class UsersService {
       .catch(
         err => {
           this.notificationsService.error('Failed to fetch Group memberships',
-            `Error: ${err.status} - ${err.statusText}`);
+            `Error: ${err.status} - ${getStatusCodeText(err.status)}`);
             return Observable.throw(err);
         },
       );
diff --git a/ui/src/app/pages/dashboard/dashboard.component.scss b/ui/src/app/pages/dashboard/dashboard.component.scss
index af7247aa2..601e0580b 100644
--- a/ui/src/app/pages/dashboard/dashboard.component.scss
+++ b/ui/src/app/pages/dashboard/dashboard.component.scss
@@ -1,5 +1,5 @@
 nb-card {
-  margin: 10px 10px !important;
+  margin: 10px !important;
   nb-card-header {
     text-align: center;
     background: #232940;
diff --git a/ui/src/app/pages/datasets/dataset-from/dataset-from.component.html b/ui/src/app/pages/datasets/dataset-from/dataset-from.component.html
index 952635bfd..d879673ae 100644
--- a/ui/src/app/pages/datasets/dataset-from/dataset-from.component.html
+++ b/ui/src/app/pages/datasets/dataset-from/dataset-from.component.html
@@ -1,6 +1,4 @@
-<nb-card
-        class="nb-card-medium"
-        size="large">
+<nb-card>
     <nb-card-header>
         Dataset Details
         <button
@@ -13,16 +11,27 @@
         </button>
     </nb-card-header>
     <nb-card-body>
+        <div *ngIf="!fetchedData">
+            <div class="loading-spinner" style="top: 40% !important; left: 46% !important;"></div>
+          </div>
         <form [formGroup]="form" [hidden]="isLoading()">
             <!--      GROUP-->
-            <div [hidden]="!!group">
+            <div [hidden]="!!group" *ngIf="fetchedData">
                 <nb-form-field *ngIf="isEdit">
                     <div>
                         <label class="input-label">Agent Group</label>
                         <span class="required">*</span>
                     </div>
-                    <input class="input-agent-group" nbInput disabled [value]="groupName"/>
+                    <input *ngIf="groupName" class="input-agent-group" nbInput disabled [value]="groupName"/>
+                    <input *ngIf="!groupName" class="input-agent-group" style="color: #df316f !important;" nbInput disabled [value]="'Agent Group has been deleted'"/>
+                    <button 
+                        *ngIf="isGroupSelected"
+                        class="match-agents-button"
+                        (click)="onMatchingAgentsModal()">
+                        See Matching Agents
+                    </button>
                 </nb-form-field>
+                
                 <nb-form-field *ngIf="!isEdit">
                     <div>
                         <label class="input-label">Agent Group</label>
@@ -31,7 +40,7 @@
 
                     <input
                             (input)="onChangeGroupName($event)"
-                            class="dataset-agent-group-input input-agent-group"
+                            class="input-agent-group"
                             [readonly]="fetchedData && !(availableAgentGroups.length > 0)"
                             [nbAutocomplete]="autoControl"
                             formControlName="agent_group_name"
@@ -62,11 +71,17 @@
                     <div class="required" *ngIf="fetchedData && !(availableAgentGroups.length > 0)"> 
                         There are no agent groups available
                     </div>
+                    <button 
+                        *ngIf="isGroupSelected"
+                        class="match-agents-button"
+                        (click)="onMatchingAgentsModal()">
+                        See Matching Agents
+                    </button>
                 </nb-form-field>
                 <br>
             </div>
             <!--      POLICY-->
-            <div [hidden]="!!policy || isEdit">
+            <div [hidden]="!!policy || isEdit" *ngIf="fetchedData">
                 <nb-form-field>
                     <div>
                         <label class="input-label">Collection Policy</label>
@@ -101,18 +116,18 @@
             </div>
             <!--      SINK-->
 
-            <div>
+            <div *ngIf="fetchedData">
                 <label class="input-label">Sinks</label>
                 <span class="required">*</span>
             </div>
-            <div>
+            <div *ngIf="fetchedData">
                 <ngx-sink-display [(selectedSinks)]="selectedSinks"></ngx-sink-display>
                 <ngx-sink-control
                   [(selectedSinks)]="selectedSinks"
                   [sinksList]="unselectedSinks"
                 ></ngx-sink-control>
                 <div
-                  *ngIf="sinkIDs.length === 0 && form.controls?.sink_ids.dirty"
+                  *ngIf="sinkIDs.length === 0 && (form.controls?.agent_group_name.dirty || isEdit)"
                   class="required"
                 >
                   At least one Sink is required.
@@ -125,31 +140,29 @@
                 </div>
             </div>
         </form>
+        <br>
     </nb-card-body>
     <nb-card-footer>
         <button
                 (click)="onFormSubmit()"
                 [disabled]="form.invalid || sinkIDs.length === 0 || isRequesting"
-                class="dataset-save-button"
-                nbButton
-                shape="round"
-                status="primary">Save
+                class="next-button"
+                status="primary"
+                style="padding: 6px 16px !important;">
+                {{isEdit ? 'Save' : 'Create'}}
         </button>
         <button
                 (click)="onClose()"
-                ghost
-                nbButton
-                shape="round"
+                class="cancel-back-button"
                 status="primary"
+                style="padding: 6px 14px !important; margin-right: 3px !important;"
                 type="button">Cancel
         </button>
         <button
                 (click)="onDelete()"
                 *ngIf="isEdit"
-                class="dataset-delete-button"
-                ghost
-                nbButton
-                shape="round"
-                type="button"><span>Delete Dataset</span></button>
+                class="dataset-delete-button">
+                Delete Dataset
+        </button>
     </nb-card-footer>
 </nb-card>
diff --git a/ui/src/app/pages/datasets/dataset-from/dataset-from.component.scss b/ui/src/app/pages/datasets/dataset-from/dataset-from.component.scss
index 26d282f03..d35129a97 100644
--- a/ui/src/app/pages/datasets/dataset-from/dataset-from.component.scss
+++ b/ui/src/app/pages/datasets/dataset-from/dataset-from.component.scss
@@ -1,3 +1,27 @@
+nb-card {
+  padding: 0 !important;
+  width: 600px;
+  height: fit-content;
+  min-height: 400px;
+  nb-card-header {
+    background: #232940 !important;
+    color: #969fb9 !important;
+  }
+  
+  nb-card-body {
+    overflow: hidden !important;
+    margin: 2rem 3rem !important;
+    padding: 0 !important;
+  }
+  
+}
+.info-icon {
+  font-size: 14px;
+  color: #ffffff;
+  margin-left: 3px;
+}
+
+
 nb-icon {
   vertical-align: middle;
 }
@@ -15,10 +39,6 @@ nb-icon {
   color: #df316f;
 }
 
-nb-select {
-  width: 100%;
-}
-
 button {
   float: right;
 }
@@ -34,14 +54,37 @@ nb-tabset {
 }
 
 .dataset-save-button {
-  margin-top: 6px;
-  background-color: blue;
+  margin-top: 3px;
+  background-color: #3089fc;
+  &.btn-disabled {
+    background: #232940 !important;
+  }
 }
 
 .dataset-delete-button {
   color: #df316f !important;
   float: left;
+  font-size: 13px !important;
+  font-weight: 600 !important;
+  padding: 6px 16px !important;
+  border-radius: 16px !important;
+  background-color: transparent;
+  outline: none;
+  border: none;
+  font-family: 'Montserrat';
+  transition: background-color 0.3s ease !important;
 }
+.dataset-delete-button:hover {
+  background-color: rgba(255, 255, 255, 0.05) !important;
+ }
+ .label-name {
+  color: #969fb9;
+  font-size: 13px;
+  margin-bottom: 0 !important;
+ }
+ .group-name {
+  margin-bottom: 0 !important;
+ }
 
 .orb-close-dialog {
   background-color: #23294000;
@@ -209,14 +252,19 @@ nb-accordion {
   overflow-y: inherit !important;
 }
 
-.dataset-agent-group-input {
-  &:read-only {
-    background-color: #232940 !important;
-    cursor: default;
-    opacity: 0.5;
-  }
-}
-
 .input-agent-group {
-  width: 560px;
-}
\ No newline at end of file
+  width: 100%;
+}
+.match-agents-button {
+  background-color: transparent;
+  border: none;
+  outline: none;
+  color: #3089fc;
+  font-size: 12px;
+  float: left;
+  font-weight: 600;
+  margin-top: 2px;
+}
+.match-agents-button:hover {
+  color: #81b8ff;
+}
diff --git a/ui/src/app/pages/datasets/dataset-from/dataset-from.component.ts b/ui/src/app/pages/datasets/dataset-from/dataset-from.component.ts
index 829ac94f3..f0976e437 100644
--- a/ui/src/app/pages/datasets/dataset-from/dataset-from.component.ts
+++ b/ui/src/app/pages/datasets/dataset-from/dataset-from.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectorRef, Component, Input, OnChanges, OnInit, SimpleChange, SimpleChanges } from '@angular/core';
 import {
   AbstractControl,
   FormBuilder,
@@ -17,6 +17,7 @@ import { DatasetPoliciesService } from 'app/common/services/dataset/dataset.poli
 import { NotificationsService } from 'app/common/services/notifications/notifications.service';
 import { SinksService } from 'app/common/services/sinks/sinks.service';
 import { DatasetDeleteComponent } from 'app/pages/datasets/delete/dataset.delete.component';
+import { AgentMatchComponent } from 'app/pages/fleet/agents/match/agent.match.component';
 import { Observable, of } from 'rxjs';
 
 export const DATASET_RESPONSE = {
@@ -38,7 +39,7 @@ const CONFIG = {
   templateUrl: './dataset-from.component.html',
   styleUrls: ['./dataset-from.component.scss'],
 })
-export class DatasetFromComponent implements OnInit {
+export class DatasetFromComponent implements OnInit, OnChanges {
   @Input()
   dataset: Dataset;
 
@@ -50,6 +51,8 @@ export class DatasetFromComponent implements OnInit {
 
   isEdit: boolean;
 
+  isGroupSelected: boolean = false;
+
   selectedGroup: string;
   groupName: string;
   selectedPolicy: string;
@@ -94,6 +97,10 @@ export class DatasetFromComponent implements OnInit {
     this.getDatasetAvailableConfigList();
 
     this.readyForms();
+
+    this.form.get('agent_group_id').valueChanges.subscribe(value => {
+      this.ngOnChanges({ agent_group_id: new SimpleChange(null, value, true) });
+    });
   }
 
   private _selectedSinks: Sink[];
@@ -173,6 +180,24 @@ export class DatasetFromComponent implements OnInit {
     this.filteredAgentGroups$ = of(this.filter(value));
   }
 
+  onMatchingAgentsModal() {
+    this.dialogService.open(AgentMatchComponent, {
+      context: {
+        agentGroupId: this.form.controls.agent_group_id.value,
+        policy: this.policy,
+      },
+      autoFocus: true,
+      closeOnEsc: true,
+    });
+  }
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes.agent_group_id.currentValue) {
+      this.isGroupSelected = true;
+    } else {
+      this.isGroupSelected = false;
+    }
+  }
+
   ngOnInit(): void {
     if (!!this.group) {
       this.selectedGroup = this.group.id;
diff --git a/ui/src/app/pages/datasets/delete/dataset.delete.component.scss b/ui/src/app/pages/datasets/delete/dataset.delete.component.scss
index 6bf6eb96a..812be145b 100644
--- a/ui/src/app/pages/datasets/delete/dataset.delete.component.scss
+++ b/ui/src/app/pages/datasets/delete/dataset.delete.component.scss
@@ -1,5 +1,4 @@
 nb-card {
-  max-width: 38rem !important;
   padding: 0 !important;
   
   nb-card-header {
diff --git a/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html b/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html
index e3a851290..137f7bc4f 100644
--- a/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html
+++ b/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html
@@ -93,6 +93,8 @@ <h4>{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}</h4>
                          fullWidth="true"
                          placeholder="Select backend type"
                          size="medium"
+                         [(ngModel)]="backendName"
+                         required
               >
                 <nb-option *ngFor="let type of availableBackends | keyvalue"
                            [value]="type.value.backend">{{ type.key | titlecase }}</nb-option>
@@ -118,11 +120,10 @@ <h4>{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}</h4>
                 {{ strings.stepper.cancel }}
               </button>
               <button
-                (click)="resizeComponents()"
+                (click)="resizeComponents(); defineDefaultConfig();"
                 [disabled]="!detailsFG?.valid"
                 class="next-button"
                 data-orb-qa-id="button#next"
-                class="next-button"
                 nbStepperNext
                 shape="round"
                 type="button"
@@ -143,19 +144,19 @@ <h4>{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}</h4>
             </div>
           </ng-template>
           <div class="div-language-button">
-            <button 
-            class="language-button {{isJsonMode}}"
-            (click)="isJsonMode = true">
-              JSON
-            </button>
             <button 
             class="language-button {{!isJsonMode}}"
             (click)="isJsonMode = false">
               YAML
             </button>
+            <button 
+            class="language-button {{isJsonMode}}"
+            (click)="isJsonMode = true">
+              JSON
+            </button>
           </div>
-          <div style="display: flex; margin-top: 10px; margin-bottom: 10px; gap: 34px;">
-            <p class="summary-accent align">Paste or Upload your {{isJsonMode ? 'Json' : 'Yaml'}} configuration</p>
+          <div style="display: flex; margin-top: 10px; width: calc(105%); margin-bottom: 10px; gap: 85px;">
+            <span class="summary-accent align">Paste or Upload your {{isJsonMode ? 'Json' : 'Yaml'}} configuration</span>
             <button class="upload-button align" (click)="fileInput.click()">
               <nb-icon [icon]="uploadIconKey" pack="eva">
               </nb-icon>
@@ -181,7 +182,9 @@ <h4>{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}</h4>
                   class="code-editor">
                 </ngx-monaco-editor>
               </ng-container>
+              <span class="errorMessage">{{ errorConfigMessage }}</span>
             </div>
+            
           </div>
           <div class="d-flex justify-content-end">
             <button
@@ -206,7 +209,6 @@ <h4>{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}</h4>
               [disabled]="!canCreate()"
               class="next-button"
               data-orb-qa-id="button#next"
-              class="next-button"
               nbStepperNext
               shape="round"
               type="button"
@@ -279,7 +281,6 @@ <h4>{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}</h4>
               (click)="onSubmit()"
               class="next-button"
               data-orb-qa-id="button#save"
-              class="next-button"
               nbStepperNext
               shape="round"
               status="primary"
diff --git a/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.scss b/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.scss
index 959ba6122..c42d4f9c9 100644
--- a/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.scss
+++ b/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.scss
@@ -23,7 +23,7 @@ mat-chip nb-icon {
   font-size: 1rem;
 }
 label {
-  color: #969FB9;
+  color: #969fb9;
 }
 
 ngx-tag-control, ngx-tag-display {
@@ -33,36 +33,36 @@ ngx-tag-control, ngx-tag-display {
 .review-label {
   font-family: 'Montserrat';
   font-size: 13px;
-  font-weight: 400 !important; 
+  font-weight: 400 !important;
   margin: 0;
   color: #969fb9 !important;
 }
 .language-button {
   border-radius: 16px;
-
-  padding: 8px 24px; 
+  padding: 8px 24px;
   color: #fff;
-  border: none; 
+  border: none;
   outline: none;
   font-size: 14px;
   font-weight: 600;
   transition: background-color 0.2s ease;
-  margin: 8px 4px 8px 4px;
+  margin: 8px 4px;
   width: 90px;
-
+  max-height: 32px !important;
+  line-height: 1.15 !important;
 }
 .div-language-button {
-  background-color: #24293E;
+  background-color: #24293e;
   width: fit-content;
-  padding: 0 4px 0 4px;
+  padding: 0 4px;
   border-radius: 25px;
-  margin-bottom: 20px;
+  margin-bottom: 10px;
 }
 .true {
-  background: #3089FC; 
+  background: #3089fc;
 }
 .false {
-  background-color: #181C2F;
+  background-color: #181c2f;
 }
 
 ::ng-deep {
@@ -233,7 +233,7 @@ ngx-tag-control, ngx-tag-display {
   min-height: 300px;
   min-width: 200px;
   height: calc(50vh);
-  width: calc(100%);
+  width: calc(105%);
 }
 .stepper {
   margin: 0 !important;
@@ -264,5 +264,10 @@ ngx-tag-control, ngx-tag-display {
   color: #969fb9 !important;
 }
 .align {
-  margin: 0px;
-}
\ No newline at end of file
+  margin: 0;
+}
+.errorMessage {
+  color: #df316f;
+  font-size: 14px;
+  font-weight: 600;
+}
diff --git a/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.ts b/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.ts
index bf3cb9219..01e2b9d34 100644
--- a/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.ts
+++ b/ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.ts
@@ -1,13 +1,14 @@
-import { Component, ViewChild } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 
 import { NotificationsService } from 'app/common/services/notifications/notifications.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { AgentPolicy } from 'app/common/interfaces/orb/agent.policy.interface';
+import { AgentPolicy, AgentPolicyBackend } from 'app/common/interfaces/orb/agent.policy.interface';
 import { AgentPoliciesService } from 'app/common/services/agents/agent.policies.service';
 import { STRINGS } from '../../../../../assets/text/strings';
 import { Tags } from 'app/common/interfaces/orb/tag';
 import { CodeEditorService } from 'app/common/services/code.editor.service';
+import { POLICY_DIODE_CONFIG_JSON, POLICY_DIODE_CONFIG_YAML, POLICY_OTEL_CONFIG_JSON, POLICY_OTEL_CONFIG_YAML, POLICY_PKTVISOR_CONFIG_JSON, POLICY_PKTVISOR_CONFIG_YAML } from 'app/shared/configurations/configurations_schemas';
 const CONFIG = {
   TAPS: 'TAPS',
   BACKEND: 'BACKEND',
@@ -21,7 +22,7 @@ const CONFIG = {
   templateUrl: './agent.policy.add.component.html',
   styleUrls: ['./agent.policy.add.component.scss'],
 })
-export class AgentPolicyAddComponent {
+export class AgentPolicyAddComponent implements OnInit {
   strings = { stepper: STRINGS.stepper };
 
   // #forms
@@ -49,6 +50,8 @@ export class AgentPolicyAddComponent {
 
   editorVisible = true;
 
+  errorConfigMessage: string;
+
   @ViewChild('editorComponentYaml')
   editorYaml;
 
@@ -57,6 +60,8 @@ export class AgentPolicyAddComponent {
 
   isEdit: boolean;
 
+  backendName = '';
+
   editorOptions = {
     theme: 'vs-dark',
     language: 'yaml',
@@ -89,39 +94,12 @@ export class AgentPolicyAddComponent {
     lineNumbersMinChars: 0,
   };
 
-  codeyaml = `handlers:
-  modules:
-    default_dns:
-      type: dns
-    default_net:
-      type: net
-input:
-  input_type: pcap
-  tap: default_pcap
-kind: collection`;
-
-  codejson = 
-  `{
-  "handlers": {
-    "modules": {
-      "default_dns": {
-        "type": "dns"
-      },
-      "default_net": {
-        "type": "net"
-      }
-    }
-  },
-  "input": {
-    "input_type": "pcap",
-    "tap": "default_pcap"
-  },
-  "kind": "collection"
-}
-    `;
+  codeyaml = ``;
+
+  codejson = ``;
 
   // is config specified wizard mode or in YAML or JSON
-  isJsonMode = true;
+  isJsonMode = false;
 
   // format definition
   format = 'yaml';
@@ -135,9 +113,9 @@ kind: collection`;
 
   selectedTags: Tags;
 
-  uploadIconKey = 'upload-outline'
+  uploadIconKey = 'upload-outline';
 
-  isRequesting: boolean;  
+  isRequesting: boolean;
 
   constructor(
     private agentPoliciesService: AgentPoliciesService,
@@ -152,6 +130,7 @@ kind: collection`;
     this.agentPolicyID = this.route.snapshot.paramMap.get('id');
     this.agentPolicy = this.newAgent();
     this.isEdit = !!this.agentPolicyID;
+    this.errorConfigMessage = '';
 
     this.readyForms();
 
@@ -162,7 +141,7 @@ kind: collection`;
       .then(() => this.updateForms())
       .catch((reason) => console.warn(`Couldn't fetch ${this.agentPolicy?.backend} data. Reason: ${reason}`));
   }
-  ngOnInit(): void {
+  ngOnInit() {
     this.selectedTags = this.agentPolicy?.tags || {};
   }
   resizeComponents() {
@@ -282,7 +261,7 @@ kind: collection`;
   onFileSelected(event: any) {
     const file: File = event.target.files[0];
     const reader: FileReader = new FileReader();
-  
+
     reader.onload = (e: any) => {
     const fileContent = e.target.result;
       if (this.isJsonMode) {
@@ -291,7 +270,7 @@ kind: collection`;
         this.codeyaml = fileContent;
       }
     };
-  
+
     reader.readAsText(file);
   }
   onSubmit() {
@@ -306,9 +285,8 @@ kind: collection`;
         policy: policy,
         version: !!this.isEdit && !!this.agentPolicy.version && this.agentPolicy.version || 1,
         tags: this.selectedTags,
-      }
-    }
-    else {
+      };
+    } else {
       payload = {
         name: this.detailsFG.controls.name.value,
         description: this.detailsFG.controls.description.value,
@@ -335,17 +313,41 @@ kind: collection`;
         );
         this.isRequesting = false;
       },
-    );   
+    );
   }
   canCreate() {
     if (this.isJsonMode) {
-      return this.editor.isJson(this.codejson);
+      if (this.editor.isJson(this.codejson)) {
+        this.errorConfigMessage = '';
+        return true;
+      } else {
+        this.errorConfigMessage = 'Invalid JSON configuration, check syntax errors.';
+        return false;
+      }
     } else {
-      return this.editor.isYaml(this.codeyaml);
+      if (this.editor.isYaml(this.codeyaml) && !this.editor.isJson(this.codeyaml)) {
+        this.errorConfigMessage = '';
+        return true;
+      } else {
+        this.errorConfigMessage = 'Invalid YAML configuration, check syntax errors.';
+        return false;
+      }
     }
   }
   refreshEditor() {
-    this.editorVisible = false; setTimeout(() => { this.editorVisible = true; }, 0); 
+    this.editorVisible = false; setTimeout(() => { this.editorVisible = true; }, 0);
+  }
+  defineDefaultConfig() {
+    if (this.backendName === AgentPolicyBackend.otel) {
+      this.codeyaml = POLICY_OTEL_CONFIG_YAML;
+      this.codejson = POLICY_OTEL_CONFIG_JSON;
+    } else if (this.backendName === AgentPolicyBackend.pktvisor) {
+      this.codeyaml = POLICY_PKTVISOR_CONFIG_YAML;
+      this.codejson = POLICY_PKTVISOR_CONFIG_JSON;
+    }
+    else {
+      this.codeyaml = POLICY_DIODE_CONFIG_YAML;
+      this.codejson = POLICY_DIODE_CONFIG_JSON;
+    }
   }
-  
 }
diff --git a/ui/src/app/pages/datasets/policies.agent/duplicate/agent.policy.duplicate.confirmation.scss b/ui/src/app/pages/datasets/policies.agent/duplicate/agent.policy.duplicate.confirmation.scss
index 87db6a24b..725ba81bb 100644
--- a/ui/src/app/pages/datasets/policies.agent/duplicate/agent.policy.duplicate.confirmation.scss
+++ b/ui/src/app/pages/datasets/policies.agent/duplicate/agent.policy.duplicate.confirmation.scss
@@ -52,5 +52,5 @@ nb-card {
   }
 
 span {
-    color: #3089fc;
-}
\ No newline at end of file
+  color: #3089fc;
+}
diff --git a/ui/src/app/pages/datasets/policies.agent/duplicate/agent.policy.duplicate.confirmation.ts b/ui/src/app/pages/datasets/policies.agent/duplicate/agent.policy.duplicate.confirmation.ts
index ce767ad28..dcae99434 100644
--- a/ui/src/app/pages/datasets/policies.agent/duplicate/agent.policy.duplicate.confirmation.ts
+++ b/ui/src/app/pages/datasets/policies.agent/duplicate/agent.policy.duplicate.confirmation.ts
@@ -8,7 +8,7 @@ import { NbDialogRef } from '@nebular/theme';
 })
 
 export class PolicyDuplicateComponent {
-  @Input() policy: string
+  @Input() policy: string;
   constructor(
     protected dialogRef: NbDialogRef<PolicyDuplicateComponent>,
   ) {
@@ -22,4 +22,4 @@ export class PolicyDuplicateComponent {
     this.dialogRef.close(false);
   }
 
-}
\ No newline at end of file
+}
diff --git a/ui/src/app/pages/datasets/policies.agent/list/agent.policy.list.component.html b/ui/src/app/pages/datasets/policies.agent/list/agent.policy.list.component.html
index aa459edda..c3ae5083b 100644
--- a/ui/src/app/pages/datasets/policies.agent/list/agent.policy.list.component.html
+++ b/ui/src/app/pages/datasets/policies.agent/list/agent.policy.list.component.html
@@ -1,4 +1,4 @@
-<div>
+<div (click)="handleContextClick()">
   <header>
     <xng-breadcrumb class="orb-breadcrumb"> </xng-breadcrumb>
     <div
@@ -53,8 +53,16 @@ <h4>All Policies</h4>
       class="orb orb-table"
       [selected]="selected"
       [selectionType]="'checkbox'"
+      (tableContextmenu)="onTableContextMenu($event)"
     >
     </ngx-datatable>
+    <ngx-table-context-menu 
+      *ngIf="showContextMenu" 
+      [items]="policyContextMenu" 
+      [left]="menuPositionLeft" 
+      [top]="menuPositionTop" 
+      [rowObject]="contextMenuRow">
+    </ngx-table-context-menu>
   </div>
 </div>
 
@@ -82,7 +90,7 @@ <h4>All Policies</h4>
         let-row="row"
         let-value="value"
 >
-    <mat-chip-list>
+    <mat-chip-list nbTooltip="{{ (row?.tags | json) === '{}' ? 'No tags were created' : row.tags | jsonlist }}">
       <mat-chip
         *ngFor="let tag of value | keyvalue"
         style="background-color: #2B3148;"
@@ -101,7 +109,6 @@ <h4>All Policies</h4>
         <span style="color: #df316f;">No tag were created</span>
       </mat-chip>
     </mat-chip-list>
-
 </ng-template>
 
 <ng-template #versionTemplateCell let-i="index" let-row="row" let-value="value">
@@ -157,6 +164,12 @@ <h4>All Policies</h4>
   </span>
 </ng-template>
 
+<ng-template #backendStateTemplateCell let-value="value">
+  <span>
+    {{ value }}
+  </span>
+</ng-template>
+
 <ng-template #checkboxTemplateCell let-i="index" let-row="row" let-value="value">
   <input type="checkbox" [checked]="getChecked(row)" 
   (change)="onCheckboxChange($event, row)">
diff --git a/ui/src/app/pages/datasets/policies.agent/list/agent.policy.list.component.scss b/ui/src/app/pages/datasets/policies.agent/list/agent.policy.list.component.scss
index 289605f05..d07550258 100644
--- a/ui/src/app/pages/datasets/policies.agent/list/agent.policy.list.component.scss
+++ b/ui/src/app/pages/datasets/policies.agent/list/agent.policy.list.component.scss
@@ -202,7 +202,7 @@ mat-chip-list {
   }
 }
 
-.orb-service-{
+.orb-service- {
   &in {
     color: #6fcf97;
   }
@@ -215,10 +215,9 @@ mat-chip-list {
 }
 .options {
   display: flex;
-  flex-direction: row;
   align-items: center;
-  gap: 10px;
+  gap: 160px;
 }
 input[type=checkbox] {
   margin-left: 10px;
-}
\ No newline at end of file
+}
diff --git a/ui/src/app/pages/datasets/policies.agent/list/agent.policy.list.component.ts b/ui/src/app/pages/datasets/policies.agent/list/agent.policy.list.component.ts
index e54b32e47..d2577bac0 100644
--- a/ui/src/app/pages/datasets/policies.agent/list/agent.policy.list.component.ts
+++ b/ui/src/app/pages/datasets/policies.agent/list/agent.policy.list.component.ts
@@ -15,12 +15,13 @@ import {
   DatatableComponent,
   TableColumn,
 } from '@swimlane/ngx-datatable';
-import { AgentPolicy, AgentPolicyUsage } from 'app/common/interfaces/orb/agent.policy.interface';
+import { AgentPolicy, AgentPolicyBackend, AgentPolicyUsage } from 'app/common/interfaces/orb/agent.policy.interface';
 import {
   filterNumber,
   FilterOption, filterString, filterTags,
   FilterTypes,
   filterMultiSelect,
+  filterMultiTags,
 } from 'app/common/interfaces/orb/filter-option';
 import { AgentPoliciesService } from 'app/common/services/agents/agent.policies.service';
 import { FilterService } from 'app/common/services/filter.service';
@@ -61,6 +62,8 @@ export class AgentPolicyListComponent
 
   @ViewChild('usageStateTemplateCell') usageStateTemplateCell: TemplateRef<any>;
 
+  @ViewChild('backendStateTemplateCell') backendStateTemplateCell: TemplateRef<any>;
+
   @ViewChild('checkboxTemplateCell') checkboxTemplateCell: TemplateRef<any>;
 
   @ViewChild('checkboxTemplateHeader') checkboxTemplateHeader: TemplateRef<any>;
@@ -85,6 +88,19 @@ export class AgentPolicyListComponent
   filters$!: Observable<FilterOption[]>;
   filteredPolicies$: Observable<AgentPolicy[]>;
 
+  contextMenuRow: any;
+
+  showContextMenu = false;
+  menuPositionLeft: number;
+  menuPositionTop: number;
+
+  policyContextMenu = [
+    {icon: 'search-outline', action: 'openview'},
+    {icon: 'edit-outline', action: 'openview'},
+    {icon: 'copy-outline', action: 'openduplicate'},
+    {icon: 'trash-2-outline', action: 'opendelete'},
+  ];
+
   constructor(
     private cdr: ChangeDetectorRef,
     private dialogService: NbDialogService,
@@ -100,7 +116,7 @@ export class AgentPolicyListComponent
     this.selected = [];
     this.policies$ = combineLatest([
       this.orb.getPolicyListView(),
-      this.orb.getDatasetListView()
+      this.orb.getDatasetListView(),
     ]).pipe(
       filter(([policies, datasets]) => policies !== undefined && policies !== null && datasets !== undefined && datasets !== null),
       map(([policies, datasets]) => {
@@ -108,7 +124,7 @@ export class AgentPolicyListComponent
           const dataset = datasets.filter((d) => d.valid && d.agent_policy_id === policy.id);
           return { ...policy, policy_usage: dataset.length > 0 ? AgentPolicyUsage.inUse : AgentPolicyUsage.notInUse };
         });
-      })
+      }),
     );
 
     this.filterOptions = [
@@ -121,20 +137,29 @@ export class AgentPolicyListComponent
       {
         name: 'Tags',
         prop: 'tags',
+        autoSuggestion: orb.getPolicyTags(),
         filter: filterTags,
-        type: FilterTypes.AutoComplete,
+        type: FilterTypes.Tags,
+      },
+      {
+        name: 'MultiTags',
+        prop: 'tags',
+        filter: filterMultiTags,
+        autoSuggestion: orb.getAgentsTags(),
+        type: FilterTypes.MultiSelect,
       },
       {
         name: 'Version',
         prop: 'version',
-        filter: filterNumber,
-        type: FilterTypes.Number,
+        filter: filterMultiSelect,
+        type: FilterTypes.MultiSelect,
+        exact: true,
       },
       {
         name: 'Description',
         prop: 'description',
-        filter: filterString,
-        type: FilterTypes.Input,
+        filter: filterMultiSelect,
+        type: FilterTypes.MultiSelect,
       },
       {
         name: 'Usage',
@@ -142,6 +167,15 @@ export class AgentPolicyListComponent
         filter: filterMultiSelect,
         type: FilterTypes.MultiSelect,
         options: Object.values(AgentPolicyUsage).map((value) => value as string),
+        exact: true,
+      },
+      {
+        name: 'Backend',
+        prop: 'backend',
+        filter: filterMultiSelect,
+        type: FilterTypes.MultiSelect,
+        options: Object.values(AgentPolicyBackend).map((value) => value as string),
+        exact: true,
       },
     ];
 
@@ -152,6 +186,25 @@ export class AgentPolicyListComponent
     );
   }
 
+  onTableContextMenu(event) {
+    event.event.preventDefault();
+    event.event.stopPropagation();
+    if (event.type === 'body') {
+      this.contextMenuRow = {
+        objectType: 'policy',
+        ...event.content,
+      };
+      this.menuPositionLeft = event.event.clientX;
+      this.menuPositionTop = event.event.clientY;
+      this.showContextMenu = true;
+    }
+  }
+  handleContextClick() {
+    if (this.showContextMenu) {
+      this.showContextMenu = false;
+    }
+  }
+
   onOpenDuplicatePolicy(agentPolicy: any) {
     const policy = agentPolicy.name;
     this.dialogService
@@ -164,7 +217,7 @@ export class AgentPolicyListComponent
         if (confirm) {
           this.duplicatePolicy(agentPolicy);
         }
-      })
+      });
   }
   duplicatePolicy(agentPolicy: any) {
     this.agentPoliciesService
@@ -181,7 +234,7 @@ export class AgentPolicyListComponent
       }
     });
   }
-  
+
   ngOnDestroy(): void {
     if (this.policiesSubscription) {
       this.policiesSubscription.unsubscribe();
@@ -208,9 +261,10 @@ export class AgentPolicyListComponent
       {
         name: '',
         prop: 'checkbox',
-        width: 1,
+        width: 62,
         minWidth: 62,
-        canAutoResize: true,
+        canAutoResize: false,
+        resizeable: false,
         sortable: false,
         cellTemplate: this.checkboxTemplateCell,
         headerTemplate: this.checkboxTemplateHeader,
@@ -229,15 +283,26 @@ export class AgentPolicyListComponent
         name: 'Usage',
         resizeable: true,
         canAutoResize: true,
-        width: 130,
-        minWidth: 100,
+        width: 140,
+        minWidth: 140,
+        maxWidth: 150,
         cellTemplate: this.usageStateTemplateCell,
       },
+      {
+        prop: 'backend',
+        name: 'Backend',
+        resizeable: true,
+        canAutoResize: true,
+        width: 110,
+        minWidth: 110,
+        maxWidth: 120,
+        cellTemplate: this.backendStateTemplateCell,
+      },
       {
         prop: 'description',
         name: 'Description',
         resizeable: true,
-        width: 280,
+        width: 250,
         minWidth: 100,
         cellTemplate: this.nameTemplateCell,
       },
@@ -263,7 +328,8 @@ export class AgentPolicyListComponent
         name: 'Version',
         resizeable: true,
         width: 100,
-        minWidth: 50,
+        minWidth: 100,
+        maxWidth: 110,
         cellTemplate: this.versionTemplateCell,
       },
       {
@@ -273,17 +339,19 @@ export class AgentPolicyListComponent
             this.datePipe.transform(value, 'M/d/yy, HH:mm z'),
         },
         name: 'Last Modified',
-        minWidth: 110,
-        width: 150,
+        minWidth: 160,
+        width: 160,
+        maxWidth: 170,
         resizeable: true,
       },
       {
         name: '',
         prop: 'actions',
         minWidth: 200,
+        width: 200,
+        maxWidth: 200,
         resizeable: true,
         sortable: false,
-        width: 150,
         cellTemplate: this.actionsTemplateCell,
       },
     ];
@@ -331,7 +399,7 @@ export class AgentPolicyListComponent
       });
   }
   onOpenDeleteSelected() {
-    const elementName = "Policies"
+    const elementName = 'Policies';
     const selected = this.selected;
     this.dialogService
       .open(DeleteSelectedComponent, {
@@ -351,19 +419,18 @@ export class AgentPolicyListComponent
   deleteSelectedAgentsPolicy() {
     this.selected.forEach((policy) => {
       this.agentPoliciesService.deleteAgentPolicy(policy.id).subscribe();
-    })
+    });
     this.notificationsService.success('All selected Policies delete requests succeeded', '');
   }
-  public onCheckboxChange(event: any, row: any): void { 
+  public onCheckboxChange(event: any, row: any): void {
     const policySelected = {
       id: row.id,
       name: row.name,
       usage: row.policy_usage,
-    }
+    };
     if (this.getChecked(row) === false) {
       this.selected.push(policySelected);
-    } 
-    else {
+    } else {
       for (let i = 0; i < this.selected.length; i++) {
         if (this.selected[i].id === row.id) {
           this.selected.splice(i, 1);
@@ -387,7 +454,7 @@ export class AgentPolicyListComponent
             id: row.id,
             name: row.name,
             usage: row.policy_usage,
-          }
+          };
           this.selected.push(policySelected);
         });
       });
diff --git a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.html b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.html
index aae188a96..88417ffe9 100644
--- a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.html
+++ b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.html
@@ -30,29 +30,44 @@ <h4>Policy View</h4>
   </div>
 </div>
 </header>
+
 <div *ngIf="isLoading">
   <div class="loading-spinner"></div>
 </div>
 
-<div *ngIf="!isLoading" class="row" #content>
-  <div class="card-col col-4" style="padding-right: 10px !important;">
-    <ngx-policy-details
-      [(editMode)]="editMode.details"
-      [policy]="policy"
-      [interfaceEditMode]="editMode.interface"
-    ></ngx-policy-details>
-    <ngx-policy-groups [groups]="policy.groups" [policy]="policy"></ngx-policy-groups>
+<div *ngIf="!isLoading" #content>
+  <div class="tabs">
+    <button *ngFor="let tab of tabs" (click)="onTabChange(tab)" class="tab-button" [ngClass]="{'active': tab.active}">
+      {{ tab.title }}
+    </button>
+  </div>
+  <div class="row" *ngIf="tabs[0].active">
+    <div class="col-4">
+      <ngx-policy-details
+        [(editMode)]="editMode.details"
+        [policy]="policy"
+        [interfaceEditMode]="editMode.interface"
+      ></ngx-policy-details>
+    </div>
+    <div class="col-8" style="padding-left: 0 !important;">
+      <ngx-policy-interface
+        [(editMode)]="editMode.interface"
+        [policy]="policy"
+        [detailsEditMode]="editMode.details"
+        [errorConfigMessage]="errorConfigMessage"
+      ></ngx-policy-interface>
+    </div>
   </div>
-  <div class="card-col col-8"  style="padding-left: 10px !important;">
-    <ngx-policy-interface
-      [(editMode)]="editMode.interface"
-      [policy]="policy"
-      [detailsEditMode]="editMode.details"
-    ></ngx-policy-interface>
-    <ngx-policy-datasets
-      (refreshPolicy)="retrievePolicy()"
-      [datasets]="datasets"
-      [policy]="policy"
-    ></ngx-policy-datasets>
+  <div class="row" *ngIf="tabs[1].active">
+    <div class="col-8">
+      <ngx-policy-datasets
+        (refreshPolicy)="retrievePolicy()"
+        [datasets]="datasets"
+        [policy]="policy"
+      ></ngx-policy-datasets>
+    </div>
+    <div class="col-4" style="padding-left: 0 !important;">
+      <ngx-policy-groups [groups]="policy.groups" [policy]="policy"></ngx-policy-groups>
+    </div>
   </div>
 </div>
diff --git a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.scss b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.scss
index 19ed35e11..176d4d7f0 100644
--- a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.scss
+++ b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.scss
@@ -6,6 +6,14 @@ h4 {
   line-height: 2rem;
   margin-bottom: 1.5rem;
 }
+.row {
+  display: flex;
+
+}
+nb-tab {
+  padding: 0 !important;
+  overflow: hidden !important;
+}
 
 nb-card {
   border: transparent;
@@ -250,4 +258,31 @@ header {
   display: flex;
   align-items: center;
 }
+.tab-button {
+  margin: 0 !important;
+  box-sizing: content-box !important;
+  padding: 16px 32px !important;
+  background-color: transparent;
+  border: none;
+  outline: none;
+  font-family: Open Sans,sans-serif;
+  font-size: .875rem;
+  font-weight: 700;
+  line-height: 1rem;
+  text-transform: uppercase;
+  color: #969fb9;
+  border: none;
+  border-bottom: solid 2px transparent;
+  &:hover {
+    color: #5aa1ff;
+    border-color: #5aa1ff;
+  }
+}
+.active {
+  color: #3089fc;
+  border-color: #3089fc;
+  &:hover {
+    border-color: #3089fc !important;
+  }
+}
 
diff --git a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.ts b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.ts
index 04fffa9ef..aa2891ca4 100644
--- a/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.ts
+++ b/ui/src/app/pages/datasets/policies.agent/view/agent.policy.view.component.ts
@@ -1,6 +1,7 @@
 import {
   ChangeDetectorRef,
   Component,
+  HostListener,
   OnChanges,
   OnDestroy,
   OnInit,
@@ -59,6 +60,25 @@ export class AgentPolicyViewComponent implements OnInit, OnDestroy {
 
   lastUpdate: Date | null = null;
 
+  errorConfigMessage: string;
+
+  tabs = [
+    {
+      title: 'Details & Configuration',
+      urlState: 'details-configuration',
+      active: false,
+    },
+    {
+      title: 'Datasets',
+      urlState: 'datasets',
+      active: false,
+    },
+  ];
+
+  policyTags: any;
+
+  private popstateListener: () => void;
+
   @ViewChild(PolicyDetailsComponent) detailsComponent: PolicyDetailsComponent;
 
   @ViewChild(PolicyInterfaceComponent)
@@ -75,19 +95,21 @@ export class AgentPolicyViewComponent implements OnInit, OnDestroy {
     private editor: CodeEditorService,
   ) {
     this.isRequesting = false;
+    this.errorConfigMessage = '';
+    this.popstateListener = this.onPopState.bind(this);
   }
 
   ngOnInit() {
     this.fetchData();
     updateMenuItems('Policy Management');
+    this.getUrlState();
   }
 
   fetchData(newPolicyId?: any) {
     this.isLoading = true;
     if (newPolicyId) {
       this.policyId = newPolicyId;
-    }
-    else {
+    } else {
       this.policyId = this.route.snapshot.paramMap.get('id');
     }
     this.retrievePolicy();
@@ -96,10 +118,14 @@ export class AgentPolicyViewComponent implements OnInit, OnDestroy {
 
 
   isEditMode() {
-    return Object.values(this.editMode).reduce(
+    const resp = Object.values(this.editMode).reduce(
       (prev, cur) => prev || cur,
       false,
     );
+    if (!resp) {
+      this.errorConfigMessage = '';
+    }
+    return resp;
   }
 
   canSave() {
@@ -107,13 +133,25 @@ export class AgentPolicyViewComponent implements OnInit, OnDestroy {
       ? this.detailsComponent?.formGroup?.status === 'VALID'
       : true;
 
-    let config = this.interfaceComponent?.code
+    const config = this.interfaceComponent?.code;
     let interfaceValid = false;
 
-    if (this.editor.isJson(config)) {
-      interfaceValid = true;
-    } else if (this.editor.isYaml(config)) {
-      interfaceValid = true;
+    if (this.policy.format === 'json') {
+      if (this.editor.isJson(config)) {
+        interfaceValid = true;
+        this.errorConfigMessage = '';
+      } else {
+        interfaceValid = false;
+        this.errorConfigMessage = 'Invalid JSON configuration, check syntax errors';
+      }
+    } else if (this.policy.format === 'yaml') {
+      if (this.editor.isYaml(config) && !this.editor.isJson(config)) {
+        interfaceValid = true;
+        this.errorConfigMessage = '';
+      } else {
+        interfaceValid = false;
+        this.errorConfigMessage = 'Invalid YAML configuration, check syntax errors';
+      }
     }
     return detailsValid && interfaceValid;
   }
@@ -142,6 +180,9 @@ export class AgentPolicyViewComponent implements OnInit, OnDestroy {
 
     try {
       if (format === 'yaml') {
+        if (this.editor.isJson(policyInterface)) {
+          throw new Error('Invalid YAML format');
+        }
         yaml.load(policyInterface);
 
         interfacePartial = {
@@ -165,22 +206,23 @@ export class AgentPolicyViewComponent implements OnInit, OnDestroy {
 
       this.policiesService.editAgentPolicy(payload).subscribe(
         (resp) => {
-        this.notifications.success('Agent Policy updated successfully', '');
-        this.discard();
-        this.policy = resp;
-        this.orb.refreshNow();
-        this.isRequesting = false;
+          this.notifications.success('Agent Policy updated successfully', '');
+          this.discard();
+          this.policy = resp;
+          this.orb.refreshNow();
+          this.isRequesting = false;
         },
-        (error) => {
+        (err) => {
           this.isRequesting = false;
-        }
-        );
+        },
+      );
 
     } catch (err) {
       this.notifications.error(
         'Failed to edit Agent Policy',
         `Error: Invalid ${format.toUpperCase()}`,
       );
+      this.isRequesting = false;
     }
   }
 
@@ -192,6 +234,7 @@ export class AgentPolicyViewComponent implements OnInit, OnDestroy {
         this.datasets = datasets;
         this.groups = groups;
         this.isLoading = false;
+        this.policyTags = Object.assign({}, policy.tags);
         this.cdr.markForCheck();
       });
   }
@@ -207,27 +250,28 @@ export class AgentPolicyViewComponent implements OnInit, OnDestroy {
         if (confirm) {
           this.duplicatePolicy(this.policy);
         }
-      })
+      });
   }
   duplicatePolicy(agentPolicy: any) {
     this.policiesService
-    .duplicateAgentPolicy(agentPolicy.id)
-    .subscribe((newAgentPolicy) => {
-      if (newAgentPolicy?.id) {
-        this.notifications.success(
-          'Agent Policy Duplicated',
-          `New Agent Policy Name: ${newAgentPolicy?.name}`,
-        );
-        this.router.navigateByUrl(`/pages/datasets/policies/view/${newAgentPolicy?.id}`);
-        this.fetchData(newAgentPolicy.id);
-      }
-    });
+      .duplicateAgentPolicy(agentPolicy.id)
+      .subscribe((newAgentPolicy) => {
+        if (newAgentPolicy?.id) {
+          this.notifications.success(
+            'Agent Policy Duplicated',
+            `New Agent Policy Name: ${newAgentPolicy?.name}`,
+          );
+          this.router.navigateByUrl(`/pages/datasets/policies/view/${newAgentPolicy?.id}`);
+          this.fetchData(newAgentPolicy.id);
+        }
+      });
   }
 
   ngOnDestroy() {
     this.policySubscription?.unsubscribe();
     this.orb.isPollingPaused ? this.orb.startPolling() : null;
     this.orb.killPolling.next();
+    window.removeEventListener('popstate', this.popstateListener);
   }
   openDeleteModal() {
     const { name: name, id } = this.policy as AgentPolicy;
@@ -254,18 +298,62 @@ export class AgentPolicyViewComponent implements OnInit, OnDestroy {
   }
 
   hasChanges() {
-    let policyDetails = this.detailsComponent.formGroup?.value;
+    const policyDetails = this.detailsComponent.formGroup?.value;
     const tags = this.detailsComponent.selectedTags;
 
-    const description = this.policy.description ? this.policy.description : "";
-    const formsDescription = policyDetails.description === null ? "" : policyDetails.description
+    const description = this.policy.description ? this.policy.description : '';
+    const formsDescription = policyDetails.description === null ? '' : policyDetails.description;
 
-    let selectedTags = JSON.stringify(tags);
-    let orb_tags = JSON.stringify(this.policy.tags);
+    const selectedTags = JSON.stringify(tags);
+    const orb_tags = JSON.stringify(this.policyTags);
 
     if (policyDetails.name !== this.policy.name || formsDescription !== description || selectedTags !== orb_tags) {
       return true;
     }
     return false;
   }
+
+  @HostListener('window:popstate', ['$event'])
+  onPopState(event) {
+    if (event.target.location.search) {
+      this.getUrlState();
+    } else if (event.target.location.pathname.includes('view')) {
+      window.history.back();
+    }
+  }
+
+  getUrlState() {
+    this.route.queryParams.subscribe(queryParams => {
+      this.tabs.forEach(tab => {
+        if (tab.urlState === queryParams.tab) {
+          tab.active = true;
+          this.pageState(tab.urlState);
+        } else {
+          tab.active = false;
+        }
+      });
+    });
+    if (this.tabs.filter(tab => tab.active === true).length === 0) {
+      this.pageState('details-configuration');
+    }
+  }
+  onTabChange(selectedTab) {
+    this.tabs.forEach(tab => {
+      if (tab.urlState === selectedTab.urlState) {
+        tab.active = true;
+        this.pageState(tab.urlState);
+      } else {
+        tab.active = false;
+      }
+    });
+  }
+  pageState(option: string) {
+    this.router.navigate(
+      [],
+      {
+        queryParams: { tab: option },
+        queryParamsHandling: 'merge',
+      },
+    );
+  }
 }
diff --git a/ui/src/app/pages/fleet/agents/add/agent.add.component.html b/ui/src/app/pages/fleet/agents/add/agent.add.component.html
index e6d920d42..f24838095 100644
--- a/ui/src/app/pages/fleet/agents/add/agent.add.component.html
+++ b/ui/src/app/pages/fleet/agents/add/agent.add.component.html
@@ -130,7 +130,6 @@ <h4>{{isEdit ? 'Edit Agent' : 'New Agent'}}</h4>
               </div>
             </div>
           </div>
-          <hr/>
           <div class="d-flex row">
             <div class="col-12">
               <label class="review-label" style="margin-bottom: 3px;">Orb Tags</label>
diff --git a/ui/src/app/pages/fleet/agents/add/agent.add.component.scss b/ui/src/app/pages/fleet/agents/add/agent.add.component.scss
index e6bdcc01c..27c89c7b0 100644
--- a/ui/src/app/pages/fleet/agents/add/agent.add.component.scss
+++ b/ui/src/app/pages/fleet/agents/add/agent.add.component.scss
@@ -110,7 +110,7 @@ nb-card-footer {
 .review-label {
   font-family: 'Montserrat';
   font-size: 13px;
-  font-weight: 400 !important; 
+  font-weight: 400 !important;
   margin: 0;
   color: #969fb9 !important;
 }
diff --git a/ui/src/app/pages/fleet/agents/key/agent.key.component.html b/ui/src/app/pages/fleet/agents/key/agent.key.component.html
index 966c4249f..878ff9b6a 100644
--- a/ui/src/app/pages/fleet/agents/key/agent.key.component.html
+++ b/ui/src/app/pages/fleet/agents/key/agent.key.component.html
@@ -10,49 +10,39 @@
       <span class="nb-close"></span>
     </button>
   </nb-card-header>
-
   <nb-card-body>
-    <p style="color: #df316f !important; margin-left: 1rem; margin-top: 1rem;">
+    <p class="red-warning">
       *Make sure to copy the Agent Key now. You won’t be able to see it again!
     </p>
-    <nb-card>
+    <nb-card class="command-card">
       <nb-card-header>Agent Key</nb-card-header>
-      <nb-card-body style="margin: 0 !important; background-color: #1c2339 !important;">
-        <pre style="padding-bottom: 17px !important;">
+      <nb-card-body>
+        <pre>
           <button autofocus
                   [cdkCopyToClipboard]="key2copy"
                   class="copy"
-                  nbTooltip="Copy Agent Key">
+                  nbTooltip="Copy Agent Key"
+                  style="margin-top: 9px;">
             <nb-icon (click)="toggleIcon('key')"
                      [icon]="copyKeyIcon"
                      pack="eva">
             </nb-icon>
           </button>
-          <code style="margin-top: 3px !important;">{{ agent?.key }}</code>
+          <code>{{ agent?.key }}</code>
         </pre>
       </nb-card-body>
     </nb-card>
-    <p style="margin-left: 1rem;">
+    <p class="link-text">
       <a href="https://orb.community/documentation/running_orb_agent/"
-        target="_blank">Click here 
+        target="_blank">&nbsp;Click here 
       </a>
-      &nbsp; for more advanced options.
+      &nbsp;for more advanced options.
     </p> 
-    <nb-card style="  border: transparent;
-    border-radius: 0.5rem;">
+    <nb-card class="command-card">
       <nb-card-header>
         Provisioning Command
-        <button
-        style="color: #3089fc"
-        ghost="true"
-        nbButton
-        (click)="toggleProvisioningCommand()">
-        <nb-icon [icon]="hideCommand ? 'plus-outline': 'minus-outline'"
-                 pack="eva">
-        </nb-icon>
-      </button>
       </nb-card-header>
-      <nb-card-body [hidden]="hideCommand"  style="margin: 0 !important; background-color: #1c2339 !important;">
+      <nb-card-body>
         <pre>
           <button [cdkCopyToClipboard]="defaultCommandCopy" class="copy"
             nbTooltip="Copy Provisioning Command">
@@ -61,7 +51,7 @@
           </button>
           <button (click)="downloadCommand('default')" class="download"
             nbTooltip="Save Command as a File">
-            <nb-icon [icon]="saveKeyIcon" pack="eva" style="margin-bottom: 10px !important;"></nb-icon>
+            <nb-icon [icon]="saveKeyIcon" pack="eva"></nb-icon>
           </button>
           <code [innerHtml]="defaultCommandShow">
             {{ defaultCommandShow }}
@@ -69,29 +59,19 @@
         </pre>
       </nb-card-body>    
     </nb-card>
-    <nb-card style="  border: transparent;
-    border-radius: 0.5rem;">
+    <nb-card class="command-card">
       <nb-card-header>
         Provisioning Command with Configuration File
-        <button
-        style="color: #3089fc"
-        ghost="true"
-        nbButton
-        (click)="toggleProvisioningCommand2()">
-        <nb-icon [icon]="hideCommand2 ? 'plus-outline': 'minus-outline'"
-                 pack="eva">
+        <nb-icon icon="info-outline" 
+        nbTooltip="Requires a configuration file named &quot;agent.yaml&quot; exist in your current working directory. PWD should be replaced with the path of your configuration file.">
         </nb-icon>
-      </button>
-      <nb-icon icon="info-outline" style="margin-top: 10px; margin-right: 10px;" 
-      nbTooltip="This command requires that a configuration file named &quot;agent.yaml&quot; exist in your current working directory">
-      </nb-icon>
       </nb-card-header>
-      <nb-card-body [hidden]="hideCommand2"  style="margin: 0 !important; background-color: #1c2339 !important;">
+      <nb-card-body>
         <pre>
           <button [cdkCopyToClipboard]="fileConfigCommandCopy" class="copy"
-          nbTooltip="Copy Provisioning Command">
-          <nb-icon (click)="toggleIcon('command')" [icon]="copyCommandIcon" pack="eva">
-          </nb-icon>
+            nbTooltip="Copy Provisioning Command">
+            <nb-icon (click)="toggleIcon('command2')" [icon]="copyCommandIcon2" pack="eva">
+            </nb-icon>
           </button>
           <button (click)="downloadCommand('fileConfig')" class="download"
             nbTooltip="Save Command as a File">
@@ -103,21 +83,21 @@
         </pre>
       </nb-card-body>  
     </nb-card> 
-    <p style="margin-left: 1rem;">
+    <p class="link-text warning">
       <a href="https://orb.community/documentation/running_orb_agent/#configuration-files"
-        target="_blank"
-        style="background-color: #ff9f05 !important;">Click here 
+        target="_blank">
+        &nbsp;Click here 
       </a>
-      &nbsp; <span style="color: #ff9f05 !important;">to learn more about how create and apply configuration files.</span>
+      <span>&nbsp;to learn more about how create and apply configuration files.</span>
     </p> 
   </nb-card-body>
 
-  <nb-card-footer>
+  <!-- <nb-card-footer>
     <button
       (click)="onClose()"
       ghost
       nbButton
       status="primary">Close
     </button>
-  </nb-card-footer>
+  </nb-card-footer> -->
 </nb-card>
diff --git a/ui/src/app/pages/fleet/agents/key/agent.key.component.scss b/ui/src/app/pages/fleet/agents/key/agent.key.component.scss
index c87226b2e..7a6d429c1 100644
--- a/ui/src/app/pages/fleet/agents/key/agent.key.component.scss
+++ b/ui/src/app/pages/fleet/agents/key/agent.key.component.scss
@@ -1,6 +1,6 @@
 nb-card {
   max-width: 60rem;
-  max-height: 700px;
+  max-height: 80vh;
   min-width: 700px;
 
   nb-card-header {
@@ -13,14 +13,14 @@ nb-card {
       float: right;
     }
     nb-icon {
-      float: right  ;
+      float: right;
     }
   }
   
   nb-card-body {
     border-bottom-left-radius: 0.5rem;
     border-bottom-right-radius: 0.5rem;
-    margin: 0 2rem 2rem 2rem;
+    margin: 0 2rem 2rem;
     padding: 0;
   
     p {
@@ -50,24 +50,26 @@ nb-card {
         border: 0 transparent;
         color: #969fb9;
         position: relative;
-        top: -0.25rem;
-        float: right;
-        right: -0.5rem;
+        top: -0.10rem;
+        right: -0.15rem;
         outline: none;
+        max-height: 28px !important;
+        display: flex;
+        align-items: center;
+        justify-content: center;
       }
 
       code {
         color: #ffffff;
-        line-height: 2.5 !important;
+        line-height: 2 !important;
         font-size: 16px !important;
+        padding-left: 1rem;
+        @media(max-width: 1400px) {
+          font-size: 15px !important;
+        }
       }
     }
   }
-  
-  nb-card-footer {
-    text-align: right;
-    padding: 1.5rem;
-  }
 }
 
 .orb-close-dialog {
@@ -93,7 +95,7 @@ nb-card {
 }
 a {
   white-space: nowrap !important;
-  padding: 0 0.3rem !important;
+  padding: 0 0.15rem !important;
   background-color: #3089fc !important;
   font-weight: 700 !important;
   text-decoration: none !important;
@@ -101,3 +103,32 @@ a {
   border-radius: 10px;
   fill: #3089fc !important;
 }
+.command-card {
+  margin: 1.5rem 0 !important; 
+  background-color: #1c2339 !important;
+  padding: 0 !important;
+  border: transparent;
+  nb-card-header {
+    border: none !important;
+    border-radius: 0px !important;
+  }
+  nb-card-body {
+    margin: 0 !important;
+  }
+}
+.red-warning {
+  color: #df316f !important;
+  margin-top: 1rem !important;
+  margin-left: 1rem !important;
+  font-weight: 500 !important;
+}
+.link-text {
+  margin-left: 1rem;
+}
+.warning {
+  color: #ff9f05 !important;
+  a {
+    background-color: #ff9f05 !important;
+    color: #ffffff !important;
+  }
+} 
diff --git a/ui/src/app/pages/fleet/agents/key/agent.key.component.ts b/ui/src/app/pages/fleet/agents/key/agent.key.component.ts
index 5310006dd..6fb9a1a5c 100644
--- a/ui/src/app/pages/fleet/agents/key/agent.key.component.ts
+++ b/ui/src/app/pages/fleet/agents/key/agent.key.component.ts
@@ -18,12 +18,11 @@ export class AgentKeyComponent implements OnInit {
   fileConfigCommandShow: string;
 
   copyCommandIcon: string;
+  copyCommandIcon2: string;
 
   key2copy: string;
   copyKeyIcon: string;
   saveKeyIcon: string;
-  hideCommand: boolean;
-  hideCommand2: boolean;
 
   @Input() agent: Agent = {};
 
@@ -32,14 +31,14 @@ export class AgentKeyComponent implements OnInit {
     protected route: ActivatedRoute,
     protected router: Router,
   ) {
-    this.hideCommand = false;
-    this.hideCommand2 = false;
+
   }
 
   ngOnInit(): void {
     this.makeCommand2Copy();
     this.key2copy = this.agent.key;
     this.copyCommandIcon = 'copy-outline';
+    this.copyCommandIcon2 = 'copy-outline';
     this.copyKeyIcon = 'copy-outline';
     this.saveKeyIcon = 'save-outline';
   }
@@ -66,18 +65,16 @@ orbcommunity/orb-agent`;
 -e ORB_CLOUD_MQTT_ID=${ this.agent.id } \\
 -e ORB_CLOUD_MQTT_CHANNEL_ID=${ this.agent.channel_id } \\
 -e ORB_CLOUD_MQTT_KEY=${ this.agent.key } \\
--e PKTVISOR_PCAP_IFACE_DEFAULT=auto \\
--v \${PWD}/:/usr/local/orb/ \\
-orbcommunity/orb-agent run -c /usr/local/orb/agent.yaml`;
+-v \${PWD}/:/opt/orb/ \\
+orbcommunity/orb-agent run -c /opt/orb/agent.yaml`;
 
   this.fileConfigCommandShow = `docker run -d --restart=always --net=host \\
 -e ORB_CLOUD_ADDRESS=${ document.location.hostname } \\
 -e ORB_CLOUD_MQTT_ID=${ this.agent.id } \\
 -e ORB_CLOUD_MQTT_CHANNEL_ID=${ this.agent.channel_id } \\
 -e ORB_CLOUD_MQTT_KEY=${ this.agent.key } \\
--e PKTVISOR_PCAP_IFACE_DEFAULT=<mark>auto</mark> \\
--v \${PWD}/:/usr/local/orb/ \\
-orbcommunity/orb-agent run -c /usr/local/orb/agent.yaml`;
+-v \${PWD}/:/opt/orb/ \\
+orbcommunity/orb-agent run -c /opt/orb/agent.yaml`;
   }
 
   toggleIcon (target) {
@@ -89,7 +86,12 @@ orbcommunity/orb-agent run -c /usr/local/orb/agent.yaml`;
     } else if (target === 'command') {
       this.copyCommandIcon = 'checkmark-outline';
       setTimeout(() => {
-        this.copyCommandIcon = "copy-outline";
+        this.copyCommandIcon = 'copy-outline';
+      }, 2000);
+    } else if (target === 'command2') {
+      this.copyCommandIcon2 = 'checkmark-outline';
+      setTimeout(() => {
+        this.copyCommandIcon2 = 'copy-outline';
       }, 2000);
     }
   }
@@ -106,8 +108,7 @@ orbcommunity/orb-agent run -c /usr/local/orb/agent.yaml`;
       a.download = `${this.agent.id}.txt`;
       a.click();
       window.URL.revokeObjectURL(url);
-    }
-    else if (commandType === 'fileConfig') {
+    } else if (commandType === 'fileConfig') {
       const blob = new Blob([this.fileConfigCommandCopy], { type: 'text/plain' });
       const url = window.URL.createObjectURL(blob);
       const a = document.createElement('a');
@@ -118,10 +119,5 @@ orbcommunity/orb-agent run -c /usr/local/orb/agent.yaml`;
     }
 
   }
-  toggleProvisioningCommand() {
-    this.hideCommand = !this.hideCommand;
-  }
-  toggleProvisioningCommand2() {
-    this.hideCommand2 = !this.hideCommand2;
-  }
+
 }
diff --git a/ui/src/app/pages/fleet/agents/list/agent.list.component.html b/ui/src/app/pages/fleet/agents/list/agent.list.component.html
index adf5a4a5d..cdcada7ca 100644
--- a/ui/src/app/pages/fleet/agents/list/agent.list.component.html
+++ b/ui/src/app/pages/fleet/agents/list/agent.list.component.html
@@ -1,4 +1,4 @@
-<header>
+<header (click)="handleContextClick()">
   <xng-breadcrumb class="orb-breadcrumb"> </xng-breadcrumb>
   <div
     style="
@@ -14,27 +14,27 @@ <h4>All Agents</h4>
     <ngx-poll-control></ngx-poll-control>
   </div>
 </header>
-<div #tableWrapper class="tableWrapper">
+<div #tableWrapper class="tableWrapper" (click)="handleContextClick()">
   <div class="options">
     <ngx-filter [availableFilters]="filterOptions"></ngx-filter>
-    <button (click)="onOpenDeleteSelected()"
-      *ngIf="selected.length > 0"
-      class="delete-selected"
-      nbButton
-      shape="round">
-      <nb-icon icon="trash-2-outline"></nb-icon>
-      Delete
-    </button>
-    <button (click)="onOpenResetAgents()"      
-      class="agent-reset"
-      data-orb-qa-id="button#reset"
-      nbButton
-      shape="round"
-      *ngIf="selected.length > 0"
-      [disabled]="canResetAgents || isResetting">
-      <nb-icon icon="refresh-outline"></nb-icon>
-      Reset Agent
-    </button>
+    <div *ngIf="selected.length > 0" class="selected-buttons">
+      <button (click)="onOpenDeleteSelected()"
+        class="delete-selected"
+        nbButton
+        shape="round">
+        <nb-icon icon="trash-2-outline"></nb-icon>
+        Delete
+      </button>
+      <button (click)="onOpenResetAgents()"      
+        class="agent-reset"
+        data-orb-qa-id="button#reset"
+        nbButton
+        shape="round"
+        [disabled]="canResetAgents || isResetting">
+        <nb-icon icon="refresh-outline"></nb-icon>
+        Reset Agent
+      </button>
+    </div>
   </div>
   
   <div class="add-agent-container">
@@ -63,8 +63,17 @@ <h4>All Agents</h4>
     class="orb orb-table"
     [selected]="selected"
     [selectionType]="'checkbox'"
+    (tableContextmenu)="onTableContextMenu($event)"
   >
   </ngx-datatable>
+  
+  <ngx-table-context-menu 
+    *ngIf="showContextMenu" 
+    [items]="agentContextMenu" 
+    [left]="menuPositionLeft" 
+    [top]="menuPositionTop" 
+    [rowObject]="contextMenuRow">
+  </ngx-table-context-menu>
 </div>
 
 <ng-template
@@ -106,7 +115,7 @@ <h4>All Agents</h4>
   let-row="row"
   let-value="value"
 >
-  <mat-chip-list #tablechiplist nbTooltip="{{ row.combined_tags | json }}">
+  <mat-chip-list #tablechiplist nbTooltip="{{ (row?.combined_tags | json) === '{}' ? 'No tags were created' : row.combined_tags | jsonlist }}">
     <mat-chip
       *ngFor="let tag of value | keyvalue"
       style="background-color: #2B3148;"
diff --git a/ui/src/app/pages/fleet/agents/list/agent.list.component.scss b/ui/src/app/pages/fleet/agents/list/agent.list.component.scss
index 0612f71ef..7deee9687 100644
--- a/ui/src/app/pages/fleet/agents/list/agent.list.component.scss
+++ b/ui/src/app/pages/fleet/agents/list/agent.list.component.scss
@@ -181,15 +181,22 @@ tr div p {
 input[type=checkbox] {
   margin-left: 10px;
 }
+.selected-buttons {
+  width: 270px; 
+  display: flex; 
+  align-self: flex-end; 
+  gap: 5px; 
+}
 .agent-reset {
   color: #fff !important;
   font-family: 'Montserrat', sans-serif;
   font-weight: 600;
   text-transform: none !important;
-  width: 160px;
+  width: 150px;
   opacity: 0;
   animation: appear 0.3s forwards;
-
+  height: 27px;
+  font-size: 14px;
   &.btn-disabled {
     background: #2b3148;
   }
@@ -200,7 +207,6 @@ input[type=checkbox] {
 }
 .options {
   display: flex;
-  flex-direction: row;
   align-items: center;
   gap: 10px;
 }
diff --git a/ui/src/app/pages/fleet/agents/list/agent.list.component.ts b/ui/src/app/pages/fleet/agents/list/agent.list.component.ts
index ffa64ffc0..f38449d14 100644
--- a/ui/src/app/pages/fleet/agents/list/agent.list.component.ts
+++ b/ui/src/app/pages/fleet/agents/list/agent.list.component.ts
@@ -18,6 +18,7 @@ import {
 import {Agent, AgentPolicyAggStates, AgentStates} from 'app/common/interfaces/orb/agent.interface';
 import {
   filterMultiSelect,
+  filterMultiTags,
   FilterOption, filterString,
   filterTags,
   FilterTypes,
@@ -53,7 +54,7 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe
   canResetAgents: boolean;
 
   isResetting: boolean;
-  
+
   private agentsSubscription: Subscription;
 
 
@@ -93,6 +94,17 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe
   filteredAgents$: Observable<Agent[]>;
   private currentComponentWidth;
 
+  contextMenuRow: any;
+
+  showContextMenu = false;
+  menuPositionLeft: number;
+  menuPositionTop: number;
+
+  agentContextMenu = [
+    {icon: 'search-outline', action: 'openview'},
+    {icon: 'edit-outline', action: 'openview'},
+    {icon: 'trash-2-outline', action: 'opendelete'},
+  ];
   constructor(
     private cdr: ChangeDetectorRef,
     private dialogService: NbDialogService,
@@ -111,7 +123,7 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe
       map(agents => {
         return agents.map(agent => {
           let version: string;
-          if (agent.state !== 'new') {
+          if (agent.state !== AgentStates.new && agent?.agent_metadata?.orb_agent?.version) {
             version = agent.agent_metadata.orb_agent.version;
           } else {
             version = '-';
@@ -121,7 +133,7 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe
             version,
           };
         });
-      })
+      }),
     );
 
     this.columns = [];
@@ -140,7 +152,14 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe
         prop: 'combined_tags',
         filter: filterTags,
         autoSuggestion: orb.getAgentsTags(),
-        type: FilterTypes.AutoComplete,
+        type: FilterTypes.Tags,
+      },
+      {
+        name: 'MultiTags',
+        prop: 'combined_tags',
+        filter: filterMultiTags,
+        autoSuggestion: orb.getAgentsTags(),
+        type: FilterTypes.MultiSelect,
       },
       {
         name: 'Status',
@@ -148,6 +167,7 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe
         filter: filterMultiSelect,
         type: FilterTypes.MultiSelect,
         options: Object.values(AgentStates).map((value) => value as string),
+        exact: true,
       },
       {
         name: 'Policies',
@@ -155,12 +175,15 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe
         filter: filterMultiSelect,
         type: FilterTypes.MultiSelect,
         options: Object.values(AgentPolicyAggStates).map((value) => value as string),
+        exact: true,
       },
       {
         name: 'Version',
         prop: 'version',
-        filter: filterString,
-        type: FilterTypes.Input,
+        filter: filterMultiSelect,
+        type: FilterTypes.MultiSelectAsync,
+        autoSuggestion: orb.getAgentsVersions(),
+        exact: false,
       },
     ];
 
@@ -191,14 +214,34 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe
     }
   }
 
+  onTableContextMenu(event) {
+    event.event.preventDefault();
+    event.event.stopPropagation();
+    if (event.type === 'body') {
+      this.contextMenuRow = {
+        objectType: 'agent',
+        ...event.content,
+      };
+      this.menuPositionLeft = event.event.clientX;
+      this.menuPositionTop = event.event.clientY;
+      this.showContextMenu = true;
+    }
+  }
+  handleContextClick() {
+    if (this.showContextMenu) {
+      this.showContextMenu = false;
+    }
+  }
+
   ngAfterViewInit() {
     this.columns = [
       {
         name: '',
         prop: 'checkbox',
-        width: 1,
+        width: 62,
         minWidth: 62,
-        canAutoResize: true,
+        canAutoResize: false,
+        resizeable: false,
         sortable: false,
         cellTemplate: this.checkboxTemplateCell,
         headerTemplate: this.checkboxTemplateHeader,
@@ -207,32 +250,35 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe
         prop: 'name',
         width: 250,
         canAutoResize: true,
-        minWidth: 150,
+        minWidth: 250,
         name: 'Name',
         cellTemplate: this.agentNameTemplateCell,
-        resizeable: true, 
+        resizeable: true,
       },
       {
         prop: 'state',
-        width: 100,
+        width: 120,
         minWidth: 90,
+        maxWidth: 130,
         canAutoResize: true,
         name: 'Status',
         cellTemplate: this.agentStateTemplateRef,
-        resizeable: true, 
+        resizeable: true,
       },
       {
         prop: 'policy_agg_info',
-        width: 170,
+        width: 190,
         canAutoResize: true,
         minWidth: 150,
+        maxWidth: 200,
         name: 'Policies',
         cellTemplate: this.agentPolicyStateTemplateRef,
-        resizeable: true, 
+        resizeable: true,
       },
       {
         prop: 'combined_tags',
         width: 300,
+        minWidth: 300,
         canAutoResize: true,
         name: 'Tags',
         cellTemplate: this.agentTagsTemplateCell,
@@ -245,49 +291,52 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe
                 .map(([key, value]) => `${key}:${value}`)
                 .join(','),
             ),
-        resizeable: true, 
+        resizeable: true,
       },
       {
         prop: 'version',
-        width: 200,
+        width: 210,
         minWidth: 150,
+        maxWidth: 220,
         canAutoResize: true,
         name: 'Version',
         sortable: true,
         cellTemplate: this.agentVersionTemplateCell,
-        resizeable: true, 
+        resizeable: true,
       },
       {
         prop: 'ts_last_hb',
-        width: 150,
-        minWidth: 150,
+        width: 170,
+        minWidth: 160,
+        maxWidth: 180,
         canAutoResize: true,
         name: 'Last Activity',
         sortable: true,
         cellTemplate: this.agentLastActivityTemplateCell,
-        resizeable: true, 
+        resizeable: true,
       },
       {
         name: '',
         prop: 'actions',
-        width: 150,
-        minWidth: 150,
+        width: 155,
+        minWidth: 155,
+        maxWidth: 155,
         canAutoResize: true,
         sortable: false,
         cellTemplate: this.actionsTemplateCell,
-        resizeable: true, 
+        resizeable: true,
       },
     ];
   }
 
 
-  public onCheckboxChange(event: any, row: any): void { 
-    let selectedAgent = {
+  public onCheckboxChange(event: any, row: any): void {
+    const selectedAgent = {
       id: row.id,
       resetable: true,
       name: row.name,
       state: row.state,
-    }
+    };
     if (this.getChecked(row) === false) {
       let resetable = true;
       if (row.state === 'new' || row.state === 'offline') {
@@ -349,7 +398,7 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe
   }
   onOpenDeleteSelected() {
     const selected = this.selected;
-    const elementName = "Agents"
+    const elementName = 'Agents';
     this.dialogService
       .open(DeleteSelectedComponent, {
         context: { selected, elementName },
@@ -368,7 +417,7 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe
   deleteSelectedAgents() {
     this.selected.forEach((agent) => {
       this.agentService.deleteAgent(agent.id).subscribe();
-    })
+    });
     this.notificationsService.success('All selected Agents delete requests succeeded', '');
   }
 
@@ -385,14 +434,14 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe
           this.resetAgents();
           this.orb.refreshNow();
         }
-      })
+      });
   }
   resetAgents() {
     if (!this.isResetting) {
       this.isResetting = true;
       this.selected.forEach((agent) => {
         this.agentService.resetAgent(agent.id).subscribe();
-      })
+      });
       this.notifyResetSuccess();
       this.selected = [];
       this.isResetting = false;
@@ -409,7 +458,7 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe
             name: row.name,
             state: row.state,
             resetable: row.state === 'new' || row.state === 'offline' ? false : true,
-          }
+          };
           this.selected.push(policySelected);
         });
       });
diff --git a/ui/src/app/pages/fleet/agents/match/agent.match.component.html b/ui/src/app/pages/fleet/agents/match/agent.match.component.html
index 7e026295f..83e0550c7 100644
--- a/ui/src/app/pages/fleet/agents/match/agent.match.component.html
+++ b/ui/src/app/pages/fleet/agents/match/agent.match.component.html
@@ -50,7 +50,7 @@
 </ng-template>
 
 <ng-template #agentTagsTemplateCell let-row="row" let-value="value" let-i="index">
-  <mat-chip-list #tablechiplist nbTooltip="{{ row.combined_tags | json }}">
+  <mat-chip-list #tablechiplist nbTooltip="{{ row.combined_tags | jsonlist }}">
     <mat-chip
       *ngFor="let tag of value | keyvalue"
       style="background-color: #2B3148;"
diff --git a/ui/src/app/pages/fleet/agents/match/agent.match.component.ts b/ui/src/app/pages/fleet/agents/match/agent.match.component.ts
index 21ffc5217..11d10a645 100644
--- a/ui/src/app/pages/fleet/agents/match/agent.match.component.ts
+++ b/ui/src/app/pages/fleet/agents/match/agent.match.component.ts
@@ -8,6 +8,7 @@ import { AgentGroup } from 'app/common/interfaces/orb/agent.group.interface';
 import { AgentsService } from 'app/common/services/agents/agents.service';
 import { Router } from '@angular/router';
 import { AgentPolicy, AgentPolicyStates } from 'app/common/interfaces/orb/agent.policy.interface';
+import { AgentGroupsService } from 'app/common/services/agents/agent.groups.service';
 
 @Component({
   selector: 'ngx-agent-match-component',
@@ -21,6 +22,9 @@ export class AgentMatchComponent implements OnInit, AfterViewInit {
   @Input()
   agentGroup: AgentGroup;
 
+  @Input()
+  agentGroupId: string;
+
   @Input()
   policy!: AgentPolicy;
 
@@ -64,6 +68,7 @@ export class AgentMatchComponent implements OnInit, AfterViewInit {
     protected dialogRef: NbDialogRef<AgentMatchComponent>,
     protected agentsService: AgentsService,
     protected router: Router,
+    protected groupsService: AgentGroupsService,
   ) {
     this.specificPolicy = false;
   }
@@ -127,29 +132,40 @@ export class AgentMatchComponent implements OnInit, AfterViewInit {
   }
 
   onOpenView(agent: any) {
-    this.router.navigateByUrl(`pages/fleet/agents/view/${ agent.id }`);
+    this.router.navigateByUrl(`pages/fleet/agents/view/${agent.id}`);
     this.dialogRef.close();
   }
 
   updateMatchingAgents() {
+    if (!!this.agentGroupId) {
+      this.groupsService.getAgentGroupById(this.agentGroupId).subscribe(
+        (resp) => {
+          this.agentGroup = resp;
+          this.getMatchingAgentsInfo();
+        },
+      );
+    } else {
+      this.getMatchingAgentsInfo();
+    }
+  }
+  getMatchingAgentsInfo() {
     const { tags } = this.agentGroup;
     const tagsList = Object.keys(tags).map(key => ({ [key]: tags[key] }));
     this.agentsService.getAllAgents(tagsList).subscribe(
       resp => {
-        if(!!this.policy) {
+        if (!!this.policy) {
           this.specificPolicy = true;
           this.agents = resp.map((agent) => {
-            const {policy_state} = agent;
+            const { policy_state } = agent;
             const policy_agg_info = !!policy_state && policy_state[this.policy.id]?.state || AgentPolicyStates.failedToApply;
-            return {...agent, policy_agg_info };
-          })
+            return { ...agent, policy_agg_info };
+          });
         } else {
           this.agents = resp;
         }
       },
     );
   }
-
   onClose() {
     this.dialogRef.close(false);
   }
diff --git a/ui/src/app/pages/fleet/agents/reset/agent.reset.component.html b/ui/src/app/pages/fleet/agents/reset/agent.reset.component.html
index d2096fcdf..941f52494 100644
--- a/ui/src/app/pages/fleet/agents/reset/agent.reset.component.html
+++ b/ui/src/app/pages/fleet/agents/reset/agent.reset.component.html
@@ -11,8 +11,9 @@
       </button>
     </nb-card-header>
     <nb-card-body>
-      <p>Are you sure you want to reset a total of {{ selected.length }} Agent(s)?</p>
-      <div class="element-list">
+      <p *ngIf="!agent">Are you sure you want to reset a total of {{ selected.length }} Agent(s)?</p>
+      <p *ngIf="agent">Are you sure you want to reset this agent?</p>
+      <div class="element-list" *ngIf="!agent">
         <div *ngFor="let item of selected" class="item-row">
           <div class="col-8 overflow-ellipsis">
             {{ item.name }}
@@ -22,9 +23,14 @@
           </div>
         </div>
       </div>
-      <p class="ns1-red" style="margin-top: 1rem;">*To confirm, type the amount of agents to be reset.</p>
+      <div *ngIf="agent" class="agent-info">
+        <span>{{ agent.name }} &nbsp;&nbsp;</span>
+        <span class="orb-service-{{ agent.state }}" style="font-weight: 600;"> {{ agent.state | titlecase }} </span>
+      </div>
+      <p *ngIf="!agent" class="ns1-red" style="margin-top: 1rem;">*To confirm, type the amount of Agents to be reset.</p>
       <input type="text"
              #autoInput
+             *ngIf="!agent"
              [nbAutocomplete]="auto"
              nbInput
              fullWidth
@@ -40,7 +46,8 @@
               class="orb-sink-delete-warning-button"
               [disabled]="!isEnabled()"
               (click)="onDelete()"
-              data-orb-qa-id="button#delete">Reset All Agents
+              data-orb-qa-id="button#delete">
+              {{ agent ? 'Reset Agent' : 'Reset All Agents'}}
       </button>
     </nb-card-footer>
   </nb-card>
\ No newline at end of file
diff --git a/ui/src/app/pages/fleet/agents/reset/agent.reset.component.scss b/ui/src/app/pages/fleet/agents/reset/agent.reset.component.scss
index 8c53dbf85..2b866327a 100644
--- a/ui/src/app/pages/fleet/agents/reset/agent.reset.component.scss
+++ b/ui/src/app/pages/fleet/agents/reset/agent.reset.component.scss
@@ -90,3 +90,8 @@ nb-card {
     text-overflow: ellipsis !important;
     max-width: 350px !important;
   }
+  .agent-info {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
\ No newline at end of file
diff --git a/ui/src/app/pages/fleet/agents/reset/agent.reset.component.ts b/ui/src/app/pages/fleet/agents/reset/agent.reset.component.ts
index 5f8180a4f..da2ca6b13 100644
--- a/ui/src/app/pages/fleet/agents/reset/agent.reset.component.ts
+++ b/ui/src/app/pages/fleet/agents/reset/agent.reset.component.ts
@@ -1,5 +1,6 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { NbDialogRef } from '@nebular/theme';
+import { Agent } from 'app/common/interfaces/orb/agent.interface';
 import { STRINGS } from 'assets/text/strings';
 
 @Component({
@@ -8,17 +9,25 @@ import { STRINGS } from 'assets/text/strings';
   styleUrls: ['./agent.reset.component.scss'],
 })
 
-export class AgentResetComponent {
+export class AgentResetComponent implements OnInit {
   strings = STRINGS.agents;
   @Input() selected: any[] = [];
+  @Input() agent: Agent;
+
+  validationInput: any;
 
-  validationInput: Number;
 
   constructor(
     protected dialogRef: NbDialogRef<AgentResetComponent>,
   ) {
   }
 
+  ngOnInit(): void {
+    if (this.agent) {
+      this.selected = [this.agent];
+    }
+  }
+
   onDelete() {
     this.dialogRef.close(true);
   }
@@ -28,6 +37,10 @@ export class AgentResetComponent {
   }
 
   isEnabled(): boolean {
-    return this.validationInput === this.selected.length;
+    if (this.agent) {
+      return true;
+    } else {
+      return this.validationInput === this.selected.length;
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/ui/src/app/pages/fleet/agents/view/agent.view.component.html b/ui/src/app/pages/fleet/agents/view/agent.view.component.html
index fc0f162e8..9b3371e25 100644
--- a/ui/src/app/pages/fleet/agents/view/agent.view.component.html
+++ b/ui/src/app/pages/fleet/agents/view/agent.view.component.html
@@ -4,36 +4,41 @@
     </xng-breadcrumb>
     <div><h4>Agent View</h4></div>
   </div>
-  <div class="right-content" style="margin-right: 15px;">
-    <ngx-poll-control></ngx-poll-control>
-  </div>
-  <div *ngIf="!isLoading" style="margin: 0 20px 0 10px;">
-    <button (click)="openDeleteModal()" class="card-button delete-button" data-orb-qa-id="button#reset" nbButton shape="round" style="color: #df316f !important;">
-      <nb-icon icon="trash-2-outline"></nb-icon>
-      Delete Agent
-    </button>
-  </div>
-  <div *ngIf="!isLoading" style="margin-bottom: 23px;">
-    <div style="float: right;">
-      <span class="orb-service-{{ agent?.state }} state">
-        <i aria-hidden="true" *ngIf="agent?.state !== agentStates.offline" class="fa fa-circle orb-service-{{ agent?.state }}"></i>
-        <i aria-hidden="true" *ngIf="agent?.state === agentStates.offline" class="fa offline-circle"></i>
-        {{ agent?.state | ngxCapitalize }}
-      </span>
-    </div>
-    <div style="font-size: 14px; font-weight: 400; margin-top: 23px;">
-      <span *ngIf="agent?.state !== agentStates.new">
-        Last activity
-        <span *ngIf="isToday()">
-          today, at {{ agent?.ts_last_hb | date: 'HH:mm z' }}
+  <div class="right-content">
+    <ngx-poll-control style="margin-top: 3px;"></ngx-poll-control>
+    <div *ngIf="!isLoading">
+      <button 
+        (click)="openDeleteModal()" 
+        class="card-button delete-button" 
+        nbButton 
+        shape="round" 
+        style="color: #df316f !important; margin: 0 20px;">
+        <nb-icon icon="trash-2-outline"></nb-icon>
+        Delete Agent
+      </button>
+    </div>
+    <div *ngIf="!isLoading" class="state-div">
+      <div style="float: right;">
+        <span class="orb-service-{{ agent?.state }} state">
+          <i aria-hidden="true" *ngIf="agent?.state !== agentStates.offline" class="fa state-circle orb-service-background-{{ agent?.state }}"></i>
+          <i aria-hidden="true" *ngIf="agent?.state === agentStates.offline" class="fa offline-circle"></i>
+          {{ agent?.state | ngxCapitalize }}
         </span>
-        <span *ngIf="!isToday()">
-          on {{ agent?.ts_last_hb | date: 'M/d/yy, HH:mm z' }}
+      </div>
+      <div class="date">
+        <span *ngIf="agent?.state !== agentStates.new">
+          Last activity
+          <span *ngIf="isToday()">
+            today, at {{ agent?.ts_last_hb | date: 'HH:mm z' }}
+          </span>
+          <span *ngIf="!isToday()">
+            on {{ agent?.ts_last_hb | date: 'M/d/yy, HH:mm z' }}
+          </span>
         </span>
-      </span>
-      <span *ngIf="agent?.state === agentStates.new">
-        This Agent has been provisioned but never connected.
-      </span>
+        <span *ngIf="agent?.state === agentStates.new">
+          This Agent has been provisioned but never connected.
+        </span>
+      </div>
     </div>
   </div>
 </header>
@@ -42,21 +47,39 @@
   <div class="loading-spinner"></div>
 </div>
 
-<div *ngIf="!isLoading" class="row">
-  <div class="card-col col-5" style="padding-right: 10px !important;">
-    <ngx-agent-information [agent]="agent"></ngx-agent-information>
-    <ngx-agent-backends [agent]="agent"></ngx-agent-backends>
+<div *ngIf="!isLoading">
+  <div class="tabs">
+    <button *ngFor="let tab of tabs" (click)="onTabChange(tab)" class="tab-button" [ngClass]="{'active': tab.active}">
+      {{ tab.title }}
+    </button>
   </div>
-
-  <div class="card-col col-7" style="padding-left: 10px !important;">
-    <ngx-agent-policies-datasets
+  <div class="row" *ngIf="tabs[0].active">
+    <div class="card-col col-5">
+      <ngx-agent-information [agent]="agent"></ngx-agent-information>
+    </div>
+    <div class="card-col col-7" style="padding-left: 0;">
+      <ngx-agent-backends [agent]="agent"></ngx-agent-backends>
+      <ngx-agent-capabilities [agent]="agent"></ngx-agent-capabilities>
+    </div>
+  </div>
+  <div class="row" *ngIf="tabs[1].active">
+    <div class="card-col col-7">
+      <ngx-agent-policies-datasets
       [agent]="agent"
       [datasets]="datasets"
-      (refreshAgent)="retrieveAgent()"
-    >
-    </ngx-agent-policies-datasets>
-    <ngx-agent-groups [agent]="agent" [groups]="groups"></ngx-agent-groups>
-    <ngx-agent-provisioning [agent]="agent"></ngx-agent-provisioning>
-    <ngx-agent-capabilities [agent]="agent"></ngx-agent-capabilities>
+      (refreshAgent)="retrieveAgent()">
+      </ngx-agent-policies-datasets>
+    </div>
+    <div class="card-col col-5" style="padding-left: 0;">
+      <ngx-agent-groups [agent]="agent" [groups]="groups"></ngx-agent-groups>
+    </div>
+  </div>
+  <div class="row" *ngIf="tabs[2].active">
+    <div class="card-col col-6">
+      <ngx-agent-provisioning [agent]="agent" [provisioningType]="default"></ngx-agent-provisioning>
+    </div>
+    <div class="card-col col-6" style="padding-left: 0;">
+      <ngx-agent-provisioning [agent]="agent" [provisioningType]="configFile"></ngx-agent-provisioning>
+    </div>
   </div>
 </div>
diff --git a/ui/src/app/pages/fleet/agents/view/agent.view.component.scss b/ui/src/app/pages/fleet/agents/view/agent.view.component.scss
index e219f88b4..c55721cf2 100644
--- a/ui/src/app/pages/fleet/agents/view/agent.view.component.scss
+++ b/ui/src/app/pages/fleet/agents/view/agent.view.component.scss
@@ -21,7 +21,10 @@ h4 {
   line-height: 2rem;
   margin-bottom: 1.5rem;
 }
-
+nb-tab {
+  padding: 0 !important;
+  overflow: hidden !important;
+}
 nb-card {
   border: transparent;
   border-radius: 0.5rem;
@@ -199,18 +202,55 @@ nb-card {
   color: #969fb9;
   font-size: 14px;
 }
+
+.state-circle {
+  width: 9px;
+  height: 9px;
+  border-radius: 50%;
+}
+.offline-circle {
+  width: 9px;
+  height: 9px;
+  border: 2px solid #969fb9;
+  border-radius: 50%;
+  background-color: transparent;
+}
 .state {
   font-size: 15px;
   font-weight: 700;
+  font-family: 'Montserrat';
 }
-.fa.fa-circle {
-  font-size: 11px;
+.state-div {
+  margin-bottom: 23px;
 }
-.offline-circle {
-  width: 10px;
-  height: 10px;
-  border: 2px solid #969fb9;
-  border-radius: 50%;
+.date {
+  font-size: 14px;
+  font-weight: 400;
+  margin-top: 23px;
+  line-height: 1.25rem;
+} 
+.tab-button {
+  padding: 16px 32px;
   background-color: transparent;
+  border: none;
+  outline: none;
+  font-family: Open Sans,sans-serif;
+  font-size: .875rem;
+  font-weight: 700;
+  line-height: 1rem;
+  text-transform: uppercase;
+  color: #969fb9;
+  border: none;
+  border-bottom: solid 2px transparent;
+  &:hover {
+    color: #5aa1ff;
+    border-color: #5aa1ff;
+  }
+}
+.active {
+  color: #3089fc;
+  border-color: #3089fc;
+  &:hover {
+    border-color: #3089fc !important;
+  }
 }
-
diff --git a/ui/src/app/pages/fleet/agents/view/agent.view.component.ts b/ui/src/app/pages/fleet/agents/view/agent.view.component.ts
index ca6091fa6..8ccedc3e6 100644
--- a/ui/src/app/pages/fleet/agents/view/agent.view.component.ts
+++ b/ui/src/app/pages/fleet/agents/view/agent.view.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectorRef, Component, HostListener, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { AgentGroup } from 'app/common/interfaces/orb/agent.group.interface';
 import { Agent, AgentStates } from 'app/common/interfaces/orb/agent.interface';
@@ -6,8 +6,7 @@ import { Dataset } from 'app/common/interfaces/orb/dataset.policy.interface';
 import { AgentsService } from 'app/common/services/agents/agents.service';
 import { OrbService } from 'app/common/services/orb.service';
 import { STRINGS } from 'assets/text/strings';
-import { Observable, Subscription } from 'rxjs';
-import { shareReplay } from 'rxjs/operators';
+import { Subscription } from 'rxjs';
 import { updateMenuItems } from 'app/pages/pages-menu';
 import { NotificationsService } from 'app/common/services/notifications/notifications.service';
 import { NbDialogService } from '@nebular/theme';
@@ -38,6 +37,29 @@ export class AgentViewComponent implements OnInit, OnDestroy {
 
   agentSubscription: Subscription;
 
+  configFile = 'configFile';
+  default = 'default';
+
+  tabs = [
+    {
+      title: 'Agent Information',
+      urlState: 'agent-information',
+      active: false,
+    },
+    {
+      title: 'Policies & Datasets',
+      urlState: 'policies-datasets',
+      active: false,
+    },
+    {
+      title: 'Provisioning Commands',
+      urlState: 'provisioning-commands',
+      active: false,
+    },
+  ];
+
+  private popstateListener: () => void;
+
   constructor(
     protected agentsService: AgentsService,
     protected route: ActivatedRoute,
@@ -51,12 +73,14 @@ export class AgentViewComponent implements OnInit, OnDestroy {
     this.datasets = {};
     this.groups = [];
     this.isLoading = true;
+    this.popstateListener = this.onPopState.bind(this);
   }
 
   ngOnInit() {
     this.agentID = this.route.snapshot.paramMap.get('id');
     this.retrieveAgent();
     updateMenuItems('Agents');
+    this.getUrlState();
   }
 
   retrieveAgent() {
@@ -91,6 +115,7 @@ export class AgentViewComponent implements OnInit, OnDestroy {
     this.agentSubscription?.unsubscribe();
     this.orb.isPollingPaused ? this.orb.startPolling() : null;
     this.orb.killPolling.next();
+    window.removeEventListener('popstate', this.popstateListener);
   }
 
   openDeleteModal() {
@@ -113,4 +138,48 @@ export class AgentViewComponent implements OnInit, OnDestroy {
   goBack() {
     this.router.navigateByUrl('/pages/fleet/agents');
   }
+
+  @HostListener('window:popstate', ['$event'])
+  onPopState(event) {
+    if (event.target.location.search) {
+      this.getUrlState();
+    } else if (event.target.location.pathname.includes('view')) {
+      window.history.back();
+    }
+  }
+
+  getUrlState() {
+    this.route.queryParams.subscribe(queryParams => {
+      this.tabs.forEach(tab => {
+        if (tab.urlState === queryParams.tab) {
+          tab.active = true;
+          this.pageState(tab.urlState);
+        } else {
+          tab.active = false;
+        }
+      });
+    });
+    if (this.tabs.filter(tab => tab.active === true).length === 0) {
+      this.pageState('agent-information');
+    }
+  }
+  onTabChange(selectedTab) {
+    this.tabs.forEach(tab => {
+      if (tab.urlState === selectedTab.urlState) {
+        tab.active = true;
+        this.pageState(tab.urlState);
+      } else {
+        tab.active = false;
+      }
+    });
+  }
+  pageState(option: string) {
+    this.router.navigate(
+      [],
+      {
+        queryParams: { tab: option },
+        queryParamsHandling: 'merge',
+      },
+    );
+  }
 }
diff --git a/ui/src/app/pages/fleet/groups/add/agent.group.add.component.html b/ui/src/app/pages/fleet/groups/add/agent.group.add.component.html
index b1fca8438..65b677822 100644
--- a/ui/src/app/pages/fleet/groups/add/agent.group.add.component.html
+++ b/ui/src/app/pages/fleet/groups/add/agent.group.add.component.html
@@ -101,9 +101,11 @@ <h4>{{strings[isEdit ? 'edit' : 'add']['header']}}</h4>
             </div>
           </ng-template>
           <div class="d-flex row flex-column">
+            <label class="input-label">Tags<span class="required">*</span></label>
             <ngx-tag-control
               (tagsChange)="updateMatches()"
-              [(tags)]="selectedTags"></ngx-tag-control>
+              [(tags)]="selectedTags">
+            </ngx-tag-control>
           </div>
           <div class="d-flex row" style="margin-top: 30px;">
             <p *ngIf="tagMatch?.total && tagMatch.total > 0" class="summary-accent">
@@ -173,7 +175,6 @@ <h4>{{strings[isEdit ? 'edit' : 'add']['header']}}</h4>
                 <p>{{firstFormGroup.controls.name.value}}</p>
               </div>
             </div>
-            <hr/>
             <div class="col-md-12 col-xl-6">
               <div class="max-width-vw">
                 <label class="review-label">Description</label>
@@ -181,7 +182,6 @@ <h4>{{strings[isEdit ? 'edit' : 'add']['header']}}</h4>
                 <p *ngIf="!firstFormGroup.controls.description.value" style="font-style: italic; font-size: 14px;">No description added</p>
               </div>
             </div>
-            <hr/>
           </div>
           <div class="d-flex row">
             <div class="col-8">
@@ -271,7 +271,7 @@ <h4>{{strings[isEdit ? 'edit' : 'add']['header']}}</h4>
     let-i="index"
     let-row="row"
     let-value="value">
-<mat-chip-list nbTooltip="{{ value | json }}">
+<mat-chip-list nbTooltip="{{ value | jsonlist }}">
     <mat-chip
       *ngFor="let tag of value | keyvalue"
       style="background-color: #2B3148;"
diff --git a/ui/src/app/pages/fleet/groups/add/agent.group.add.component.scss b/ui/src/app/pages/fleet/groups/add/agent.group.add.component.scss
index 89db8a024..da0e9c99d 100644
--- a/ui/src/app/pages/fleet/groups/add/agent.group.add.component.scss
+++ b/ui/src/app/pages/fleet/groups/add/agent.group.add.component.scss
@@ -44,10 +44,6 @@ mat-chip nb-icon {
     }
   }
 
-  nb-layout-column {
-    padding: 1rem 1rem 0.75rem !important;
-  }
-
   .step {
     flex-direction: row-reverse !important;
     align-items: start !important;
@@ -136,7 +132,7 @@ mat-chip nb-icon {
   color: #969fb9 !important;
 }
 label {
-  color: #969FB9;
+  color: #969fb9;
 }
 ::ng-deep .orb-breadcrumb {
   align-items: center;
@@ -279,6 +275,6 @@ mat-chip-list {
 .review-label {
   font-family: 'Montserrat';
   font-size: 13px;
-  font-weight: 400 !important; 
+  font-weight: 400 !important;
   margin: 0;
 }
diff --git a/ui/src/app/pages/fleet/groups/details/agent.group.details.component.html b/ui/src/app/pages/fleet/groups/details/agent.group.details.component.html
index 7c1c89d1c..abe5c0bc1 100644
--- a/ui/src/app/pages/fleet/groups/details/agent.group.details.component.html
+++ b/ui/src/app/pages/fleet/groups/details/agent.group.details.component.html
@@ -1,9 +1,7 @@
-<nb-card size="large" class="nb-card-medium">
+<nb-card>
   <nb-card-header>
     {{strings.details.header}}
-
-
-    <button nbButton ghost="true" size="small" class="orb-close-dialog"
+    <button nbButton ghost="true" class="orb-close-dialog"
             (click)="onClose()"><span class="nb-close"></span>
     </button>
   </nb-card-header>
@@ -11,21 +9,26 @@
     <div class="row">
       <div class="col-6 d-flex flex-column align-items-start">
         <p class="detail-title">{{strings.propNames.name}}</p>
-        <p>{{ agentGroup.name }}</p>
+        <p class="overflow-ellipsis" nbTooltip="{{agentGroup.name}}">{{ agentGroup.name }}</p>
       </div>
-      <div class="col-6 d-flex flex-column align-items-start" *ngIf="agentGroup?.description">
+      <div class="col-6 d-flex flex-column align-items-start" >
         <p class="detail-title">{{strings.propNames.description}}</p>
-        <p>{{ agentGroup.description }}</p>
+        <p *ngIf="agentGroup?.description">{{ agentGroup.description }}</p>
+        <p *ngIf="!agentGroup?.description" style="font-size: 14px; font-style: italic; "> No description Provided </p>
       </div>
     </div>
     <div class="row">
       <div class="col-6 d-flex flex-column align-items-start">
         <p class="detail-title">{{strings.propNames.matches}}</p>
-        <p>{{ agentGroup.matching_agents.total }} {{strings.match.agents}}</p>
+        <button class="match-agents-button" (click)="onMatchingAgentsModal()">{{ agentGroup.matching_agents.total }} {{strings.match.agents}}</button>
+      </div>
+      <div class="col-6 d-flex flex-column align-items-start">
+        <p class="detail-title">Date Created</p>
+        <p>{{ agentGroup?.ts_created | date:'MM-dd-yy h:mm a' }}</p>
       </div>
     </div>
     <div class="row">
-      <div class="col-6 d-flex flex-column align-items-start">
+      <div class="col-12 d-flex flex-column align-items-start">
         <p class="detail-title">{{strings.propNames.tags}}</p>
         <div class="background">
           <mat-chip-list>
@@ -53,6 +56,6 @@
   </nb-card-body>
 
   <nb-card-footer>
-    <button nbButton status="primary" class="sink-edit-button" (click)="onOpenEdit(agentGroup)">Edit</button>
+    <button status="primary" class="group-edit-button" (click)="onOpenEdit(agentGroup)">Edit</button>
   </nb-card-footer>
 </nb-card>
diff --git a/ui/src/app/pages/fleet/groups/details/agent.group.details.component.scss b/ui/src/app/pages/fleet/groups/details/agent.group.details.component.scss
index f28cb3381..4c542fc4d 100644
--- a/ui/src/app/pages/fleet/groups/details/agent.group.details.component.scss
+++ b/ui/src/app/pages/fleet/groups/details/agent.group.details.component.scss
@@ -1,11 +1,59 @@
 nb-icon {
   vertical-align: middle;
 }
+nb-card {
+  padding: 0 !important;
+  width: 650px;
+  height: fit-content;
+  min-height: 400px;
+  nb-card-header {
+    background: #232940 !important;
+    color: #969fb9 !important;
+  }
+  
+  nb-card-body {
+    overflow: hidden !important;
+    margin: 2rem 3rem 0 3rem !important;
+    padding: 0 !important;
+  }
+}
 
 .detail-title {
   color: #969fb9;
+  font-weight: 500;
+  font-size: 14px;
 }
 
+.overflow-ellipsis {
+  white-space: nowrap !important;
+  overflow: hidden !important;
+  text-overflow: ellipsis !important;
+  max-width: 250px !important;
+}
+.match-agents-button {
+  color: #3089fc;
+  background-color: transparent;
+  border: none;
+  padding: 0;
+  text-decoration: underline;
+  outline: none;
+
+  &:hover {
+    color: #569fff;
+  }
+}
+.group-edit-button {
+  padding: 8px 24px 8px 24px;
+  border-radius: 16px;
+  border: none;
+  background-color: #3089fc;
+  color: white;
+  font-weight: 600;
+  font-size: 14px;
+  cursor: pointer;
+  outline: none;
+  font-family: 'Montserrat';
+}
 .p {
   color: #ffffff;
   text-align: left;
@@ -48,7 +96,7 @@ nb-tabset {
   > span {
     float: right;
     padding-top: 0.3rem;
-    font-size: large;
+    font-size: 20px;
     color: #3089fc;
     font-weight: 900;
   }
diff --git a/ui/src/app/pages/fleet/groups/details/agent.group.details.component.ts b/ui/src/app/pages/fleet/groups/details/agent.group.details.component.ts
index fc7889ee3..8cb017ec4 100644
--- a/ui/src/app/pages/fleet/groups/details/agent.group.details.component.ts
+++ b/ui/src/app/pages/fleet/groups/details/agent.group.details.component.ts
@@ -1,8 +1,9 @@
 import { Component, Input } from '@angular/core';
-import { NbDialogRef } from '@nebular/theme';
+import { NbDialogRef, NbDialogService } from '@nebular/theme';
 import { STRINGS } from 'assets/text/strings';
 import { ActivatedRoute, Router } from '@angular/router';
 import { AgentGroup } from 'app/common/interfaces/orb/agent.group.interface';
+import { AgentMatchComponent } from '../../agents/match/agent.match.component';
 
 @Component({
   selector: 'ngx-agent-group-details-component',
@@ -18,9 +19,17 @@ export class AgentGroupDetailsComponent {
     protected dialogRef: NbDialogRef<AgentGroupDetailsComponent>,
     protected route: ActivatedRoute,
     protected router: Router,
+    private dialogService: NbDialogService,
   ) {
   }
 
+  onMatchingAgentsModal() {
+    this.dialogService.open(AgentMatchComponent, {
+      context: { agentGroup: this.agentGroup },
+      autoFocus: true,
+      closeOnEsc: true,
+    });
+  }
 
   onOpenEdit(agentGroup: any) {
     this.dialogRef.close(true);
diff --git a/ui/src/app/pages/fleet/groups/list/agent.group.list.component.html b/ui/src/app/pages/fleet/groups/list/agent.group.list.component.html
index 56c817877..ab88eeccd 100644
--- a/ui/src/app/pages/fleet/groups/list/agent.group.list.component.html
+++ b/ui/src/app/pages/fleet/groups/list/agent.group.list.component.html
@@ -1,4 +1,4 @@
-<div>
+<div (click)="handleContextClick()">
   <header>
     <xng-breadcrumb class="orb-breadcrumb"> </xng-breadcrumb>
     <div
@@ -53,8 +53,16 @@ <h4>{{ strings.list.header }}</h4>
       class="orb orb-table"
       [selected]="selected"
       [selectionType]="'checkbox'"
+      (tableContextmenu)="onTableContextMenu($event)"
     >
     </ngx-datatable>
+    <ngx-table-context-menu 
+      *ngIf="showContextMenu" 
+      [items]="agentGroupContextMenu" 
+      [left]="menuPositionLeft" 
+      [top]="menuPositionTop" 
+      [rowObject]="contextMenuRow">
+    </ngx-table-context-menu>
   </div>
 </div>
 
@@ -79,7 +87,7 @@ <h4>{{ strings.list.header }}</h4>
   <span
     (click)="onMatchingAgentsModal(row)"
     class="matching-agents"
-    nbTooltip="{{ row.matching_agents | json }}"
+    nbTooltip="{{ row.matching_agents | jsonlist }}"
   >
     {{ row.matching_agents.total }}
   </span>
@@ -91,7 +99,7 @@ <h4>{{ strings.list.header }}</h4>
   let-row="row"
   let-value="value"
 >
-  <mat-chip-list nbTooltip="{{ value | json }}">
+  <mat-chip-list nbTooltip="{{ value | jsonlist }}">
     <mat-chip
       *ngFor="let tag of value | keyvalue"
       style="background-color: #2B3148;"
diff --git a/ui/src/app/pages/fleet/groups/list/agent.group.list.component.scss b/ui/src/app/pages/fleet/groups/list/agent.group.list.component.scss
index 538c825d8..0a3be371c 100644
--- a/ui/src/app/pages/fleet/groups/list/agent.group.list.component.scss
+++ b/ui/src/app/pages/fleet/groups/list/agent.group.list.component.scss
@@ -49,23 +49,6 @@ span {
   box-sizing: content-box;
 }
 
-.tableWrapper {
-  display: flex;
-  margin-top: 1em;
-  flex-direction: column;
-  flex-wrap: nowrap;
-  align-content: flex-start;
-  justify-content: flex-start;
-  align-items: stretch;
-  overflow-x: auto;
-  min-width: 800px;
-}
-
-.orb-table {
-  min-height: calc(61vh);
-  min-width: 800px;
-}
-
 ::ng-deep {
   header p {
     font-family: 'Montserrat', sans-serif;
@@ -183,9 +166,8 @@ mat-chip-list {
 }
 .options {
   display: flex;
-  flex-direction: row;
   align-items: center;
-  gap: 10px;
+  gap: 160px;
 }
 input[type=checkbox] {
   margin-left: 10px;
diff --git a/ui/src/app/pages/fleet/groups/list/agent.group.list.component.ts b/ui/src/app/pages/fleet/groups/list/agent.group.list.component.ts
index 4e20d6b83..f2d0e4357 100644
--- a/ui/src/app/pages/fleet/groups/list/agent.group.list.component.ts
+++ b/ui/src/app/pages/fleet/groups/list/agent.group.list.component.ts
@@ -17,6 +17,8 @@ import {
 
 import { AgentGroup } from 'app/common/interfaces/orb/agent.group.interface';
 import {
+  filterMultiSelect,
+  filterMultiTags,
   FilterOption, filterString,
   filterTags,
   FilterTypes,
@@ -90,6 +92,18 @@ export class AgentGroupListComponent
   filters$!: Observable<FilterOption[]>;
   filteredGroups$: Observable<AgentGroup[]>;
 
+  contextMenuRow: any;
+
+  showContextMenu = false;
+  menuPositionLeft: number;
+  menuPositionTop: number;
+
+  agentGroupContextMenu = [
+    {icon: 'search-outline', action: 'openview'},
+    {icon: 'edit-outline', action: 'openedit'},
+    {icon: 'trash-2-outline', action: 'opendelete'},
+  ];
+
   constructor(
     private cdr: ChangeDetectorRef,
     private dialogService: NbDialogService,
@@ -118,21 +132,21 @@ export class AgentGroupListComponent
         prop: 'tags',
         filter: filterTags,
         autoSuggestion: orb.getGroupsTags(),
-        type: FilterTypes.AutoComplete,
+        type: FilterTypes.Tags,
+      },
+      {
+        name: 'MultiTags',
+        prop: 'tags',
+        filter: filterMultiTags,
+        autoSuggestion: orb.getAgentsTags(),
+        type: FilterTypes.MultiSelect,
       },
       {
         name: 'Description',
         prop: 'description',
-        filter: filterString,
-        type: FilterTypes.Input,
+        filter: filterMultiSelect,
+        type: FilterTypes.MultiSelect,
       },
-      // {
-      //   name: 'Status',
-      //   prop: 'state',
-      //   filter: filterMultiSelect,
-      //   type: FilterTypes.MultiSelect,
-      //   options: Object.values(AgentStates).map((value) => value as string),
-      // },
     ];
 
     this.filteredGroups$ = this.filters.createFilteredList()(
@@ -142,6 +156,25 @@ export class AgentGroupListComponent
     );
   }
 
+  onTableContextMenu(event) {
+    event.event.preventDefault();
+    event.event.stopPropagation();
+    if (event.type === 'body') {
+      this.contextMenuRow = {
+        objectType: 'group',
+        ...event.content,
+      };
+      this.menuPositionLeft = event.event.clientX;
+      this.menuPositionTop = event.event.clientY;
+      this.showContextMenu = true;
+    }
+  }
+  handleContextClick() {
+    if (this.showContextMenu) {
+      this.showContextMenu = false;
+    }
+  }
+
   ngOnDestroy(): void {
     if (this.groupsSubscription) {
       this.groupsSubscription.unsubscribe();
@@ -167,9 +200,10 @@ export class AgentGroupListComponent
       {
         name: '',
         prop: 'checkbox',
-        width: 1,
+        width: 62,
         minWidth: 62,
-        canAutoResize: true,
+        canAutoResize: false,
+        resizeable: false,
         sortable: false,
         cellTemplate: this.checkboxTemplateCell,
         headerTemplate: this.checkboxTemplateHeader,
@@ -177,34 +211,36 @@ export class AgentGroupListComponent
       {
         prop: 'name',
         name: 'Name',
-        width: 230,
+        width: 240,
+        minWidth: 220,
         canAutoResize: true,
         resizeable: true,
-        minWidth: 150,
         cellTemplate: this.agentGroupNameTemplateCell,
       },
       {
         prop: 'matching_agents',
         name: 'Agents',
-        width: 150,
+        width: 100,
+        minWidth: 100,
+        maxWidth: 130,
         canAutoResize: true,
         resizeable: true,
-        minWidth: 80,
         comparator: (a, b) => a.total - b.total,
         cellTemplate: this.agentGroupsTemplateCell,
       },
       {
         prop: 'description',
         name: 'Description',
-        width: 350,
+        width: 190,
+        minWidth: 220,
         canAutoResize: true,
         resizeable: true,
-        minWidth: 180,
         cellTemplate: this.agentGroupNameTemplateCell,
       },
       {
         prop: 'tags',
-        width: 450,
+        width: 300,
+        minWidth: 280,
         canAutoResize: true,
         resizeable: true,
         cellTemplate: this.agentGroupTagsTemplateCell,
@@ -224,6 +260,7 @@ export class AgentGroupListComponent
         width: 150,
         resizeable: true,
         minWidth: 150,
+        maxWidth: 160,
         sortable: false,
         cellTemplate: this.actionsTemplateCell,
       },
@@ -265,7 +302,7 @@ export class AgentGroupListComponent
   }
   onOpenDeleteSelected() {
     const selected = this.selected;
-    const elementName = "Agent Groups"
+    const elementName = 'Agent Groups';
     this.dialogService
       .open(DeleteSelectedComponent, {
         context: { selected, elementName },
@@ -284,7 +321,7 @@ export class AgentGroupListComponent
   deleteSelectedAgentGroups() {
     this.selected.forEach((group) => {
       this.agentGroupsService.deleteAgentGroup(group.id).subscribe();
-    })
+    });
     this.notificationsService.success('All selected Groups delete requests succeeded', '');
   }
   openDetailsModal(row: any) {
@@ -308,11 +345,10 @@ export class AgentGroupListComponent
       closeOnEsc: true,
     });
   }
-  public onCheckboxChange(event: any, row: any): void { 
+  public onCheckboxChange(event: any, row: any): void {
     if (this.getChecked(row) === false) {
       this.selected.push(row);
-    } 
-    else {
+    } else {
       for (let i = 0; i < this.selected.length; i++) {
         if (this.selected[i].id === row.id) {
           this.selected.splice(i, 1);
diff --git a/ui/src/app/pages/pages-menu.ts b/ui/src/app/pages/pages-menu.ts
index be3ab77b0..ca4f376f5 100644
--- a/ui/src/app/pages/pages-menu.ts
+++ b/ui/src/app/pages/pages-menu.ts
@@ -52,5 +52,5 @@ export const MENU_ITEMS = [
 export function updateMenuItems(pageName: string) {
   MENU_ITEMS.forEach(item => {
     item.selected = item.title === pageName;
-  })
+  });
 }
diff --git a/ui/src/app/pages/pages.module.ts b/ui/src/app/pages/pages.module.ts
index eb3d31a38..2fa021823 100644
--- a/ui/src/app/pages/pages.module.ts
+++ b/ui/src/app/pages/pages.module.ts
@@ -14,6 +14,7 @@ import {
   NbButtonModule,
   NbCardModule,
   NbCheckboxModule,
+  NbContextMenuModule,
   NbDialogService,
   NbFormFieldModule,
   NbInputModule,
@@ -73,6 +74,7 @@ import { PagesComponent } from './pages.component';
 import { SinkViewComponent } from './sinks/view/sink.view.component';
 import { DeleteSelectedComponent } from 'app/shared/components/delete/delete.selected.component';
 import { PolicyDuplicateComponent } from './datasets/policies.agent/duplicate/agent.policy.duplicate.confirmation';
+import { DragDropModule } from '@angular/cdk/drag-drop';
 
 @NgModule({
   imports: [
@@ -108,6 +110,8 @@ import { PolicyDuplicateComponent } from './datasets/policies.agent/duplicate/ag
     A11yModule,
     NbAutocompleteModule,
     SharedModule,
+    NbContextMenuModule,
+    DragDropModule,
   ],
   exports: [
     SharedModule,
diff --git a/ui/src/app/pages/profile/profile.component.scss b/ui/src/app/pages/profile/profile.component.scss
index 3e435b593..7112e9ff1 100644
--- a/ui/src/app/pages/profile/profile.component.scss
+++ b/ui/src/app/pages/profile/profile.component.scss
@@ -1,5 +1,6 @@
 button {
   float: right;
+  font-family: 'Montserrat';
 }
 
 .card-row {
@@ -58,58 +59,58 @@ h4 {
   }
 }
 .header-subtitle {
-  color: #969FB9;
+  color: #969fb9;
   font-family: Montserrat;
   font-size: 14px;
   font-style: normal;
-  font-weight: 400; 
+  font-weight: 400;
   margin: 0;
 }
 .account-information-card {
   width: 500px !important;
   height: fit-content;
 }
-.circle { 
+.circle {
   width: 42px;
-  height: 42px; 
-  border-radius: 50%; 
+  height: 42px;
+  border-radius: 50%;
 }
-.info-container { 
+.info-container {
   display: flex;
-  align-items: center; 
+  align-items: center;
   position: relative;
 }
 .user-name-title {
-  color: var(--Lilac-gray, #969FB9);
+  color: var(--Lilac-gray, #969fb9);
   font-size: 14px;
   font-style: normal;
   font-weight: 500;
   line-height: 18px;
-  letter-spacing: -0.5px; 
+  letter-spacing: -0.5px;
   margin-bottom: 5px;
 }
 .user-name {
-  color: var(--White, #FFF);
+  color: var(--White, #fff);
   font-size: 14px;
   font-weight: 500;
   line-height: 18px;
-  letter-spacing: -0.5px; 
+  letter-spacing: -0.5px;
 }
 .edit-button {
-  color: #3089FC;
+  color: #3089fc;
   background-color: transparent;
   border: none;
   outline: none;
   font-size: 14px;
   font-style: normal;
-  font-weight: 600; 
+  font-weight: 600;
   transition: background-color 0.3s ease !important;
   transition: color 0.3s ease !important;
   border-radius: 16px;
   padding: 5px 10px;
 }
 .edit-button:disabled {
-  color: #969FB9
+  color: #969fb9;
 }
 .edit-button-work {
   @extend .edit-button;
@@ -135,19 +136,18 @@ nb-card {
     border-radius: 8px !important;
     color: #969fb9 !important;
     padding: 0.5rem 1rem !important;
-    font-weight: 600 !important; 
-    font-size: 15px !important; 
-    
+    font-weight: 600 !important;
+    font-size: 15px !important;
   }
   nb-card-body {
     margin: 0 !important;
-    background-color: #2B3148 !important;
+    background-color: #2b3148 !important;
     border-bottom-left-radius: 8px !important;
     border-bottom-right-radius: 8px !important;
   }
 }
 label {
-  color: #969FB9;
+  color: #969fb9;
 }
 .float-right {
   float: right;
@@ -157,7 +157,7 @@ input {
 }
 .input-password {
   margin-bottom: 20px;
-  background-color: #313E5D !important;
+  background-color: #313e5d !important;
   border: none;
   border-radius: 2px;
 }
diff --git a/ui/src/app/pages/profile/profile.component.ts b/ui/src/app/pages/profile/profile.component.ts
index b69e0e366..0516ea4a5 100644
--- a/ui/src/app/pages/profile/profile.component.ts
+++ b/ui/src/app/pages/profile/profile.component.ts
@@ -31,14 +31,14 @@ export class ProfileComponent implements OnInit {
   showPassword2 = false;
   showPassword3 = false;
 
-  availableTimers = [15, 30, 60]
+  availableTimers = [15, 30, 60];
   selectedTimer: Number;
 
   editMode = {
     work: false,
     profileName: false,
     password: false,
-  }
+  };
 
   isPasswordValidSize: boolean;
   isPasswordValidMatch: boolean;
@@ -49,13 +49,13 @@ export class ProfileComponent implements OnInit {
     private usersService: UsersService,
     private notificationsService: NotificationsService,
     private orb: OrbService,
-  ) { 
+  ) {
     this.oldPasswordInput = '';
     this.newPasswordInput = '';
     this.confirmPasswordInput = '';
     this.selectedTimer = this.getPollInterval();
   }
-  
+
   ngOnInit(): void {
     this.retrieveUserInfo();
   }
@@ -86,7 +86,7 @@ export class ProfileComponent implements OnInit {
         company: company,
       },
     };
-  
+
     this.usersService.editUser(userReq).subscribe(
       resp => {
         this.notificationsService.success('User successfully edited', '');
@@ -96,10 +96,10 @@ export class ProfileComponent implements OnInit {
       },
       error => {
         this.isRequesting = false;
-      }
+      },
     );
   }
-  
+
   canChangePassword(): boolean {
     this.isPasswordValidSize = this.newPasswordInput.length >= this.ngxAdminMinPasswordSize;
     this.isPasswordValidMatch = this.newPasswordInput === this.confirmPasswordInput;
@@ -125,7 +125,7 @@ export class ProfileComponent implements OnInit {
       },
       error => {
         this.isRequesting = false;
-      }
+      },
     );
   }
 toggleEdit(name: string) {
diff --git a/ui/src/app/pages/sinks/add/sink-add.component.html b/ui/src/app/pages/sinks/add/sink-add.component.html
index 8ce2016f7..de0cf4b59 100644
--- a/ui/src/app/pages/sinks/add/sink-add.component.html
+++ b/ui/src/app/pages/sinks/add/sink-add.component.html
@@ -4,14 +4,14 @@
         <ng-container
           *xngBreadcrumbItem="let breadcrumb; let info = info; let first = first"
         >
-          <ng-container [ngClass]="{ my_class: first === '' }">{{
+          <ng-container>{{
             breadcrumb
           }}</ng-container>
         </ng-container>
       </xng-breadcrumb>
-      <h4>{{ strings.sink.add.header }}</h4>
+      <h4>Create Sink</h4>
     </div>
-    <div class="col-4">
+    <div class="col-4" *ngIf="!isLoading">
       <div style="float: right; margin-top: 20px;">
         <button
         (click)="goBack()"
@@ -31,18 +31,26 @@ <h4>{{ strings.sink.add.header }}</h4>
         </button> 
       </div>
     </div>
-      
 </header>
-<div class="row">
+
+<div *ngIf="isLoading">
+  <div class="loading-spinner"></div>
+</div>
+
+<div class="row" *ngIf="!isLoading">
   <div class="card-col col-4">
     <ngx-sink-details 
     [(createMode)]="createMode"
     (sinkBackend)="getBackendEmit($event)"
+    [sinkTypesList]="sinkTypesList"
     >
     </ngx-sink-details>
   </div>
-  <div class="card-col col-8">
-    <ngx-sink-config [(createMode)]="createMode" [(sinkBackend)]="sinkBackend">
+  <div class="card-col col-8" style="padding-left: 0;">
+    <ngx-sink-config 
+    [(createMode)]="createMode" 
+    [(sinkBackend)]="sinkBackend" 
+    [errorConfigMessage]="errorConfigMessage">
     </ngx-sink-config>
   </div>
 </div>
diff --git a/ui/src/app/pages/sinks/add/sink-add.component.scss b/ui/src/app/pages/sinks/add/sink-add.component.scss
index d988b3e98..74ba37b65 100644
--- a/ui/src/app/pages/sinks/add/sink-add.component.scss
+++ b/ui/src/app/pages/sinks/add/sink-add.component.scss
@@ -3,7 +3,7 @@ button {
   margin: 0 3px;
   float: left;
   color: #fff !important;
-  font-family: "Montserrat", sans-serif;
+  font-family: 'Montserrat', sans-serif;
   font-weight: 500;
   text-transform: none !important;
 }
@@ -18,7 +18,7 @@ button {
 }
 
 .sink-cancel {
-  background-color: #3089fc !important; 
+  background-color: #3089fc !important;
 }
 
 
@@ -64,4 +64,4 @@ button {
       }
     }
   }
-  
\ No newline at end of file
+
diff --git a/ui/src/app/pages/sinks/add/sink-add.component.ts b/ui/src/app/pages/sinks/add/sink-add.component.ts
index 82c088f50..71ac47e5f 100644
--- a/ui/src/app/pages/sinks/add/sink-add.component.ts
+++ b/ui/src/app/pages/sinks/add/sink-add.component.ts
@@ -8,6 +8,7 @@ import { SinkDetailsComponent } from 'app/shared/components/orb/sink/sink-detail
 import { STRINGS } from 'assets/text/strings';
 import * as YAML from 'yaml';
 import { CodeEditorService } from 'app/common/services/code.editor.service';
+import { SinkFeature } from 'app/common/interfaces/orb/sink/sink.feature.interface';
 
 @Component({
     selector: 'ngx-sink-add-component',
@@ -23,12 +24,18 @@ export class SinkAddComponent {
 
     strings = STRINGS;
 
-    createMode: boolean;
+    createMode: boolean = true;
 
     sinkBackend: any;
 
-    isRequesting: boolean;  
-    
+    isRequesting: boolean;
+
+    errorConfigMessage: string = '';
+
+    isLoading = true;
+
+    sinkTypesList = [];
+
     constructor(
         private sinksService: SinksService,
         private notificationsService: NotificationsService,
@@ -37,25 +44,43 @@ export class SinkAddComponent {
     ) {
         this.createMode = true;
         this.isRequesting = false;
+        this.errorConfigMessage = '';
+        Promise.all([this.getSinkBackends()]).then((responses) => {
+            const backends = responses[0];
+            this.sinkTypesList = backends.map(entry => entry.backend);
+            this.isLoading = false;
+        });
+    }
+    getSinkBackends() {
+        return new Promise<SinkFeature[]>(resolve => {
+          this.sinksService.getSinkBackends().subscribe(backends => {
+            resolve(backends);
+          });
+        });
     }
 
     canCreate() {
         const detailsValid = this.createMode
         ? this.detailsComponent?.formGroup?.status === 'VALID'
         : true;
-    
+
         const configSink = this.configComponent?.code;
         let config;
-        
+
         if (this.editor.isJson(configSink)) {
             config = JSON.parse(configSink);
         } else if (this.editor.isYaml(configSink)) {
             config = YAML.parse(configSink);
+            this.errorConfigMessage = '';
         } else {
+            this.errorConfigMessage = 'Invalid YAML configuration, check syntax errors.';
             return false;
         }
-        
-        return !this.editor.checkEmpty(config.authentication) && !this.editor.checkEmpty(config.exporter) && detailsValid && !this.checkString(config);
+
+        return !this.editor.checkEmpty(config.authentication)
+        && !this.editor.checkEmpty(config.exporter)
+        && detailsValid
+        && !this.checkString(config);
     }
     checkString(config: any): boolean {
         if (typeof config.authentication.password !== 'string' || typeof config.authentication.username !== 'string') {
@@ -71,7 +96,7 @@ export class SinkAddComponent {
         const configSink = this.configComponent.code;
 
         const details = { ...sinkDetails };
-        
+
         let payload = {};
 
         const config = YAML.parse(configSink);
@@ -82,23 +107,6 @@ export class SinkAddComponent {
             config,
         } as Sink;
 
-        // if (this.editor.isJson(configSink)) {
-        //     const config = JSON.parse(configSink);
-        //     payload = {
-        //         ...details,
-        //         tags,
-        //         config,
-        //     } as Sink;
-        // }
-        // else {
-        //     payload = {
-        //         ...details,
-        //         tags,
-        //         format: 'yaml',
-        //         config_data: configSink,
-        //     } as Sink;
-        // }
-
         this.sinksService.addSink(payload).subscribe(() => {
             this.notificationsService.success('Sink successfully created', '');
             this.goBack();
diff --git a/ui/src/app/pages/sinks/details/sink.details.component.html b/ui/src/app/pages/sinks/details/sink.details.component.html
index b545e8b33..a2012223c 100644
--- a/ui/src/app/pages/sinks/details/sink.details.component.html
+++ b/ui/src/app/pages/sinks/details/sink.details.component.html
@@ -1,4 +1,4 @@
-<nb-card size="large" class="nb-card-large">
+<nb-card>
   <nb-card-header>
     {{strings.details.header}}
     <button nbButton
@@ -13,12 +13,12 @@
     <div class="row">
       <div class="col-6 d-flex flex-column align-items-start">
         <p class="detail-title">{{strings.propNames.name}}</p>
-        <p>{{ sink.name }}</p>
+        <p class="overflow-ellipsis" nbTooltip="{{sink.name}}">{{ sink.name }}</p>
       </div>
       <div class="col-6 d-flex flex-column align-items-start" *ngIf="!sink.description">
         <p class="detail-title">{{strings.propNames.description}}</p>
-        <p>{{ sink.description }}</p>
-        <p *ngIf="!sink.description">No Description Added</p>
+        <p *ngIf="sink.description">{{ sink.description }}</p>
+        <p *ngIf="!sink.description" style="font-style: italic; font-size: 14px;">No description Provided</p>
       </div>
     </div>
     <div class="row">
@@ -27,42 +27,49 @@
         <p>{{ sink.backend }}</p>
       </div>
       <div class="col-6 d-flex flex-column align-items-start">
-        <p class="detail-title">{{ exporterField }}</p>
-        <p *ngIf="sink.config.exporter.remote_host">{{ sink.config.exporter.remote_host }} </p>
-        <p *ngIf="sink.config.exporter.endpoint">{{ sink.config.exporter.endpoint }} </p>
+        <p class="detail-title">{{strings.propNames.config_username}}</p>
+        <p>{{ sink.config.authentication.username }}</p>
       </div>
     </div>
     <div class="row">
-      <div class="col-6 d-flex flex-column align-items-start">
-        <p class="detail-title">{{strings.propNames.config_username}}</p>
-        <p>{{ sink.config.authentication.username }}</p>
+      <div class="col-12 d-flex flex-column align-items-start">
+        <p class="detail-title">{{ exporterField }}</p>
+        <p *ngIf="sink.config.exporter.remote_host">{{ sink.config.exporter.remote_host }} </p>
+        <p *ngIf="sink.config.exporter.endpoint">{{ sink.config.exporter.endpoint }} </p>
       </div>
     </div>
     <div class="row">
-      <div class="col-6 d-flex flex-column align-items-start">
+      <div class="col-12 d-flex flex-column align-items-start">
         <p class="detail-title">{{strings.propNames.tags}}</p>
-        <div>
-          <mat-chip-list style="min-width: 0.2pc; min-height: 0.2pc;">
+        <div class="background">
+          <mat-chip-list>
+            <mat-chip
+              *ngFor="let tag of sink.tags | keyvalue"
+              style="background-color: #2B3148;"
+              class="orb-tag-chip"
+            >
+              <span [style.color]="tag.key | tagcolor">{{ tag.key }}</span><span style="color: #969FB9;">:</span>&nbsp;
+              <span [style.color]="tag.value | tagcolor">{{ tag.value }}</span>
+            </mat-chip>
             <mat-chip
-                class="orb-tag-chip "
-                *ngFor="let tag of sink.tags | keyvalue"
-                [style.background-color]="tag | tagcolor">
-                {{tag | tagchip}}
+              *ngIf="!sink.tags"
+              style="background-color: #2B3148;"
+              class="orb-tag-chip"
+            >
+              <span style="color: #df316f;">No tag were added</span>
             </mat-chip>
           </mat-chip-list>
         </div>
-        <p *ngIf="!sink.tags">No tags Added</p>
       </div>
     </div>
-    <div class="row" *ngIf="sink?.state === _sinkStates.error">
+    <div class="row" *ngIf="sink?.state === _sinkStates.error || sink?.state === _sinkStates.warning">
       <div class="col-12 d-flex flex-column align-items-start">
-        <p class="ns1red">Error</p>
-        <p>{{sink.error}}</p>
+        <p class="orb-service-{{sink.state}}"> {{sink?.error | titlecase}}</p>
       </div>
     </div>
   </nb-card-body>
 
   <nb-card-footer>
-    <button nbButton status="primary" class="sink-edit-button" (click)="onOpenView(sink)">View Sink</button>
+    <button status="primary" class="sink-edit-button" (click)="onOpenView(sink)">Edit</button>
   </nb-card-footer>
 </nb-card>
diff --git a/ui/src/app/pages/sinks/details/sink.details.component.scss b/ui/src/app/pages/sinks/details/sink.details.component.scss
index 399a04a8c..bea4c1408 100644
--- a/ui/src/app/pages/sinks/details/sink.details.component.scss
+++ b/ui/src/app/pages/sinks/details/sink.details.component.scss
@@ -2,6 +2,30 @@ nb-icon {
   vertical-align: middle;
 }
 
+nb-card {
+  padding: 0 !important;
+  width: 650px;
+  height: fit-content;
+  min-height: 400px;
+  nb-card-header {
+    background: #232940 !important;
+    color: #969fb9 !important;
+  }
+  
+  nb-card-body {
+    overflow: hidden !important;
+    margin: 2rem 3rem 0 3rem !important;
+    padding: 0 !important;
+  }
+}
+.orb-service- {
+  &error {
+    color: #df316f;
+  }
+  &warning {
+    color: #f2c94c;
+  }
+}
 .form-key {
   color: #969fb9;
 }
@@ -47,11 +71,17 @@ nb-tabset {
   > span {
     float: right;
     padding-top: 0.3rem;
-    font-size: large;
+    font-size: 20px;
     color: #3089fc;
     font-weight: 900;
   }
 }
+.background {
+  background-color: #232940;
+  padding: 10px;
+  border-radius: 8px;
+  margin-bottom: 20px;
+}
 
 .row {
   display: flex;
@@ -71,7 +101,26 @@ p {
   overflow-wrap: anywhere !important;
   white-space: normal !important;
 }
-
+.overflow-ellipsis {
+  white-space: nowrap !important;
+  overflow: hidden !important;
+  text-overflow: ellipsis !important;
+  max-width: 250px !important;
+}
 .detail-title {
   color: #969fb9;
+  font-weight: 500;
+  font-size: 14px;
+}
+.sink-edit-button {
+  padding: 8px 24px 8px 24px;
+  border-radius: 16px;
+  border: none;
+  background-color: #3089fc;
+  color: white;
+  font-weight: 600;
+  font-size: 14px;
+  cursor: pointer;
+  outline: none;
+  font-family: 'Montserrat';
 }
diff --git a/ui/src/app/pages/sinks/details/sink.details.component.ts b/ui/src/app/pages/sinks/details/sink.details.component.ts
index 28c66ed29..272a4d159 100644
--- a/ui/src/app/pages/sinks/details/sink.details.component.ts
+++ b/ui/src/app/pages/sinks/details/sink.details.component.ts
@@ -27,7 +27,7 @@ export class SinkDetailsComponent implements OnInit {
     protected router: Router,
   ) {
     !this.sink.tags ? this.sink.tags = {} : null;
-    this.exporterField = "";
+    this.exporterField = '';
   }
 
   onOpenEdit(sink: any) {
@@ -45,6 +45,6 @@ export class SinkDetailsComponent implements OnInit {
   }
   ngOnInit() {
     const exporter = this.sink.config.exporter;
-    this.exporterField = exporter.remote_host !== undefined ? "Remote Host URL" : "Endpoint URL";
+    this.exporterField = exporter.remote_host !== undefined ? 'Remote Host URL' : 'Endpoint URL';
   }
 }
diff --git a/ui/src/app/pages/sinks/list/sink.list.component.html b/ui/src/app/pages/sinks/list/sink.list.component.html
index 8c7284176..eed36dfe8 100644
--- a/ui/src/app/pages/sinks/list/sink.list.component.html
+++ b/ui/src/app/pages/sinks/list/sink.list.component.html
@@ -1,4 +1,4 @@
-<div>
+<div (click)="handleContextClick()">
   <header>
     <xng-breadcrumb class="orb-breadcrumb"> </xng-breadcrumb>
     <div
@@ -50,12 +50,19 @@ <h4>{{ strings.list.header }}</h4>
       [scrollbarV]="true"
       [scrollbarH]="true"
       [sorts]="tableSorts"
-      class="orb"
-      style="height: calc(62vh);"
+      class="orb orb-table"
       [selected]="selected"
       [selectionType]="'checkbox'"
+      (tableContextmenu)="onTableContextMenu($event)"
     >
     </ngx-datatable>
+    <ngx-table-context-menu 
+      *ngIf="showContextMenu" 
+      [items]="sinkContextMenu" 
+      [left]="menuPositionLeft" 
+      [top]="menuPositionTop" 
+      [rowObject]="contextMenuRow">
+    </ngx-table-context-menu>
   </div>
 </div>
 
@@ -86,7 +93,7 @@ <h4>{{ strings.list.header }}</h4>
 
 <ng-template #sinkTagsTemplateCell let-i="index" let-row="row" let-value="value">
   <div class="d-block">
-    <mat-chip-list nbTooltip="{{ value | json }}">
+    <mat-chip-list nbTooltip="{{ !row?.tags ? 'No tag were created' : value | jsonlist }}">
       <mat-chip
         *ngFor="let tag of value | keyvalue"
         style="background-color: #2B3148;"
diff --git a/ui/src/app/pages/sinks/list/sink.list.component.scss b/ui/src/app/pages/sinks/list/sink.list.component.scss
index 25a0c8de2..806bb9bcd 100644
--- a/ui/src/app/pages/sinks/list/sink.list.component.scss
+++ b/ui/src/app/pages/sinks/list/sink.list.component.scss
@@ -149,7 +149,16 @@ tr div p {
     color: #df316f;
   }
   &idle {
-    color: #f2994a; 
+    color: #f2994a;
+  }
+  &provisioning {
+    color: #3089fc;
+  }
+  &provioning_error {
+    color: #df316f;
+  }
+  &warning {
+    color: #f2c94c;
   }
 }
 
@@ -204,9 +213,8 @@ mat-chip-list {
 }
 .options {
   display: flex;
-  flex-direction: row;
   align-items: center;
-  gap: 10px;
+  gap: 160px;
 }
 input[type=checkbox] {
   margin-left: 10px;
diff --git a/ui/src/app/pages/sinks/list/sink.list.component.ts b/ui/src/app/pages/sinks/list/sink.list.component.ts
index 2d122f679..5868089c5 100644
--- a/ui/src/app/pages/sinks/list/sink.list.component.ts
+++ b/ui/src/app/pages/sinks/list/sink.list.component.ts
@@ -17,6 +17,7 @@ import {
 } from '@swimlane/ngx-datatable';
 import {
   filterMultiSelect,
+  filterMultiTags,
   FilterOption, filterString,
   filterTags,
   FilterTypes,
@@ -85,6 +86,18 @@ export class SinkListComponent implements AfterViewInit, AfterViewChecked, OnDes
   filters$!: Observable<FilterOption[]>;
   filteredSinks$: Observable<Sink[]>;
 
+  contextMenuRow: any;
+
+  showContextMenu: boolean;
+  menuPositionLeft: number;
+  menuPositionTop: number;
+
+  sinkContextMenu = [
+    {icon: 'search-outline', action: 'openview'},
+    {icon: 'edit-outline', action: 'openview'},
+    {icon: 'trash-2-outline', action: 'opendelete'},
+  ];
+
   constructor(
     private cdr: ChangeDetectorRef,
     private dialogService: NbDialogService,
@@ -111,7 +124,14 @@ export class SinkListComponent implements AfterViewInit, AfterViewChecked, OnDes
         prop: 'tags',
         filter: filterTags,
         autoSuggestion: orb.getSinksTags(),
-        type: FilterTypes.AutoComplete,
+        type: FilterTypes.Tags,
+      },
+      {
+        name: 'MultiTags',
+        prop: 'tags',
+        filter: filterMultiTags,
+        autoSuggestion: orb.getAgentsTags(),
+        type: FilterTypes.MultiSelect,
       },
       {
         name: 'Status',
@@ -119,6 +139,7 @@ export class SinkListComponent implements AfterViewInit, AfterViewChecked, OnDes
         filter: filterMultiSelect,
         type: FilterTypes.MultiSelect,
         options: Object.values(SinkStates).map((value) => value as string),
+        exact: true,
       },
       {
         name: 'Backend',
@@ -126,12 +147,13 @@ export class SinkListComponent implements AfterViewInit, AfterViewChecked, OnDes
         filter: filterMultiSelect,
         type: FilterTypes.MultiSelect,
         options: Object.values(SinkBackends).map((value) => value as string),
+        exact: true,
       },
       {
         name: 'Description',
         prop: 'description',
-        filter: filterString,
-        type: FilterTypes.Input,
+        filter: filterMultiSelect,
+        type: FilterTypes.MultiSelect,
       },
     ];
 
@@ -140,6 +162,7 @@ export class SinkListComponent implements AfterViewInit, AfterViewChecked, OnDes
       this.filters$,
       this.filterOptions,
     );
+    this.showContextMenu = false;
   }
 
   ngOnDestroy(): void {
@@ -167,9 +190,10 @@ export class SinkListComponent implements AfterViewInit, AfterViewChecked, OnDes
       {
         name: '',
         prop: 'checkbox',
-        width: 1,
+        width: 62,
         minWidth: 62,
-        canAutoResize: true,
+        canAutoResize: false,
+        resizeable: false,
         sortable: false,
         cellTemplate: this.checkboxTemplateCell,
         headerTemplate: this.checkboxTemplateHeader,
@@ -179,37 +203,41 @@ export class SinkListComponent implements AfterViewInit, AfterViewChecked, OnDes
         name: 'Name',
         canAutoResize: true,
         resizeable: true,
-        width: 220,
-        minWidth: 150,
+        width: 250,
+        minWidth: 250,
         cellTemplate: this.sinkNameTemplateCell,
       },
       {
         prop: 'state',
         name: 'Status',
         resizeable: true,
-        width: 150,
+        width: 140,
+        minWidth: 140,
+        maxWidth: 150,
         cellTemplate: this.sinkStateTemplateCell,
       },
       {
         prop: 'backend',
         name: 'Backend',
         resizeable: true,
-        minWidth: 120,
-        width: 150,
+        minWidth: 140,
+        width: 140,
+        maxWidth: 150,
         cellTemplate: this.sinkNameTemplateCell,
       },
       {
         prop: 'description',
         name: 'Description',
         resizeable: true,
-        minWidth: 150,
-        width: 350,
+        width: 240,
+        minWidth: 230,
         cellTemplate: this.sinkNameTemplateCell,
       },
       {
         prop: 'tags',
         name: 'Tags',
-        width: 350,
+        width: 250,
+        minWidth: 200,
         resizeable: true,
         cellTemplate: this.sinkTagsTemplateCell,
         comparator: (a, b) =>
@@ -225,15 +253,35 @@ export class SinkListComponent implements AfterViewInit, AfterViewChecked, OnDes
       {
         name: '',
         prop: 'actions',
+        width: 150,
         minWidth: 150,
+        maxWidth: 150,
         resizeable: true,
         sortable: false,
-        width: 150,
         cellTemplate: this.actionsTemplateCell,
       },
     ];
   }
 
+  onTableContextMenu(event) {
+    event.event.preventDefault();
+    event.event.stopPropagation();
+    if (event.type === 'body') {
+      this.contextMenuRow = {
+        objectType: 'sink',
+        ...event.content,
+      };
+      this.menuPositionLeft = event.event.clientX;
+      this.menuPositionTop = event.event.clientY;
+      this.showContextMenu = true;
+    }
+  }
+  handleContextClick() {
+    if (this.showContextMenu) {
+      this.showContextMenu = false;
+    }
+  }
+
   onOpenAdd() {
     this.router.navigate(['add'], { relativeTo: this.route });
   }
@@ -271,7 +319,7 @@ export class SinkListComponent implements AfterViewInit, AfterViewChecked, OnDes
   }
   onOpenDeleteSelected() {
     const selected = this.selected;
-    const elementName = "Sinks"
+    const elementName = 'Sinks';
     this.dialogService
       .open(DeleteSelectedComponent, {
         context: { selected, elementName },
@@ -290,7 +338,7 @@ export class SinkListComponent implements AfterViewInit, AfterViewChecked, OnDes
   deleteSelectedSinks() {
     this.selected.forEach((sink) => {
       this.sinkService.deleteSink(sink.id).subscribe();
-    })
+    });
     this.notificationsService.success('All selected Sinks delete requests succeeded', '');
   }
   openDetailsModal(row: any) {
@@ -309,16 +357,15 @@ export class SinkListComponent implements AfterViewInit, AfterViewChecked, OnDes
 
   filterByInactive = (sink) => sink.state === 'inactive';
 
-  public onCheckboxChange(event: any, row: any): void { 
+  public onCheckboxChange(event: any, row: any): void {
     const sinkSelected = {
       id: row.id,
       name: row.name,
       state: row.state,
-    }
+    };
     if (this.getChecked(row) === false) {
       this.selected.push(sinkSelected);
-    } 
-    else {
+    } else {
       for (let i = 0; i < this.selected.length; i++) {
         if (this.selected[i].id === row.id) {
           this.selected.splice(i, 1);
@@ -341,7 +388,7 @@ export class SinkListComponent implements AfterViewInit, AfterViewChecked, OnDes
             id: row.id,
             name: row.name,
             state: row.state,
-          }
+          };
           this.selected.push(sinkSelected);
         });
       });
diff --git a/ui/src/app/pages/sinks/view/sink.view.component.html b/ui/src/app/pages/sinks/view/sink.view.component.html
index 51b3822f5..5a43fa250 100644
--- a/ui/src/app/pages/sinks/view/sink.view.component.html
+++ b/ui/src/app/pages/sinks/view/sink.view.component.html
@@ -12,53 +12,51 @@
     <h4>{{ strings.sink.view.header }}</h4>
   </div>
   <div class="right-content">
-    <ngx-poll-control></ngx-poll-control>
-  </div>
-  <div *ngIf="!isLoading" style="margin: 0 20px;">
-    <button 
-    (click)="openDeleteModal()" 
-    class="card-button  delete-button" 
-    nbButton shape="round" 
-    *ngIf="!isEditMode()"
-    style="color: #df316f !important; float: none !important;">
-      <nb-icon icon="trash-2-outline"></nb-icon>
-      Delete Sink
-    </button>
-    <button
-    (click)="save()"
-    [disabled]="!canSave() || isRequesting || !hasChanges()"
-    class="policy-save"
-    nbButton
-    *ngIf="isEditMode()"
-    shape="round"
-    >
-    <nb-icon icon="save-outline"></nb-icon>
-    Save
-    </button>
-    <button
-      (click)="discard()"
-      class="policy-discard"
-      nbButton
-      shape="round"
-      *ngIf="isEditMode()"
-    >
-      Discard
-    </button>
-  </div>
-  <div style="margin-bottom: 23px;" *ngIf="!isLoading && !isEditMode()">
-    <div style="float: right;">
-      <span class="orb-service-{{ sink?.state }} state" style="margin-left: 10px;">
-        <i aria-hidden="true" class="fa fa-circle orb-service-{{ sink?.state }}"></i>
-        {{ sink?.state | ngxCapitalize }}
-      </span>
+    <ngx-poll-control style="margin-top: 3px;"></ngx-poll-control>
+    <div *ngIf="!isLoading">
+      <button 
+        (click)="openDeleteModal()" 
+        class="card-button  delete-button" 
+        nbButton shape="round" 
+        *ngIf="!isEditMode()"
+        style="color: #df316f !important; float: none !important; margin: 0 20px;">
+        <nb-icon icon="trash-2-outline"></nb-icon>
+        Delete Sink
+      </button>
+      <button
+        (click)="save()"
+        [disabled]="!canSave() || isRequesting || !hasChanges()"
+        class="policy-save"
+        nbButton
+        *ngIf="isEditMode()"
+        shape="round"
+        style="margin-left: 20px;">
+        <nb-icon icon="save-outline"></nb-icon>
+        Save
+      </button>
+      <button
+        (click)="discard()"
+        class="policy-discard"
+        nbButton
+        shape="round"
+        *ngIf="isEditMode()">
+        Discard
+      </button>
     </div>
-    <div style="font-size: 14px; font-weight: 400; margin-top: 23px;">
-      <span>
-        Created on {{ sink?.ts_created | date: 'M/d/yy, HH:mm z' }}
-      </span>
+    <div class="state-div" *ngIf="!isLoading && !isEditMode()">
+      <div style="float: right;">
+        <span class="orb-service-{{ sink?.state }} state" style="margin-left: 10px;">
+          <i aria-hidden="true" class="fa state-circle orb-service-background-{{ sink?.state }}"></i>
+          {{ sink?.state | ngxCapitalize }}
+        </span>
+      </div>
+      <div class="date">
+        <span>
+          Created on {{ sink?.ts_created | date: 'M/d/yy, HH:mm z' }}
+        </span>
+      </div>
     </div>
   </div>
-
 </header>
 
 <div *ngIf="isLoading">
@@ -70,8 +68,8 @@ <h4>{{ strings.sink.view.header }}</h4>
     <ngx-sink-details [(editMode)]="editMode.details" [sink]="sink" [configEditMode]="editMode.config">
     </ngx-sink-details>
   </div>
-  <div class="card-col col-8">
-    <ngx-sink-config [(editMode)]="editMode.config" [sink]="sink" [detailsEditMode]="editMode.details">
+  <div class="card-col col-8" style="padding-left: 0;">
+    <ngx-sink-config [(editMode)]="editMode.config" [sink]="sink" [detailsEditMode]="editMode.details" [errorConfigMessage]="errorConfigMessage">
     </ngx-sink-config>
   </div>
 </div>
diff --git a/ui/src/app/pages/sinks/view/sink.view.component.scss b/ui/src/app/pages/sinks/view/sink.view.component.scss
index c4a64214a..6074d883e 100644
--- a/ui/src/app/pages/sinks/view/sink.view.component.scss
+++ b/ui/src/app/pages/sinks/view/sink.view.component.scss
@@ -3,7 +3,7 @@ button {
 
   &.policy-duplicate {
     color: #fff !important;
-    font-family: "Montserrat", sans-serif;
+    font-family: 'Montserrat', sans-serif;
     font-weight: 700;
     text-transform: none !important;
 
@@ -18,7 +18,7 @@ button {
 
   &.policy-save {
     color: #fff !important;
-    font-family: "Montserrat", sans-serif;
+    font-family: 'Montserrat', sans-serif;
     font-weight: 700;
     text-transform: none !important;
 
@@ -33,7 +33,7 @@ button {
 
   &.policy-discard {
     color: #fff !important;
-    font-family: "Montserrat", sans-serif;
+    font-family: 'Montserrat', sans-serif;
     font-weight: 700;
     text-transform: none !important;
 
@@ -96,12 +96,15 @@ h4 {
     }
   }
 }
-.fa.fa-circle {
-  font-size: 11px;
+.state-circle {
+  width: 9px;
+  height: 9px;
+  border-radius: 50%;
 }
 .state {
-  font-size: 16px;
+  font-size: 15px;
   font-weight: 700;
+  font-family: 'Montserrat';
 }
 .orb-service- {
   &active {
@@ -114,7 +117,16 @@ h4 {
     color: #df316f;
   }
   &idle {
-    color: #f2994a; 
+    color: #f2994a;
+  }
+  &provisioning {
+    color: #3089fc;
+  }
+  &provioning_error {
+    color: #df316f;
+  }
+  &warning {
+    color: #f2c94c;
   }
 }
 
@@ -122,4 +134,13 @@ h4 {
   color: #969fb9;
   font-size: 14px;
 }
+.state-div {
+  margin-bottom: 23px;
+}
+.date {
+  font-size: 14px;
+  font-weight: 400;
+  margin-top: 23px;
+  line-height: 1.25rem;
+} 
 
diff --git a/ui/src/app/pages/sinks/view/sink.view.component.spec.ts b/ui/src/app/pages/sinks/view/sink.view.component.spec.ts
index b1b7437e0..e4c6bad9e 100644
--- a/ui/src/app/pages/sinks/view/sink.view.component.spec.ts
+++ b/ui/src/app/pages/sinks/view/sink.view.component.spec.ts
@@ -8,7 +8,7 @@ describe('SinkViewComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ SinkViewComponent ]
+      declarations: [ SinkViewComponent ],
     })
     .compileComponents();
   }));
diff --git a/ui/src/app/pages/sinks/view/sink.view.component.ts b/ui/src/app/pages/sinks/view/sink.view.component.ts
index 490876744..0b7688a76 100644
--- a/ui/src/app/pages/sinks/view/sink.view.component.ts
+++ b/ui/src/app/pages/sinks/view/sink.view.component.ts
@@ -17,11 +17,11 @@ import { OrbService } from 'app/common/services/orb.service';
 @Component({
   selector: 'ngx-sink-view',
   templateUrl: './sink.view.component.html',
-  styleUrls: ['./sink.view.component.scss']
+  styleUrls: ['./sink.view.component.scss'],
 })
 export class SinkViewComponent implements OnInit, OnChanges, OnDestroy {
   strings = STRINGS;
-  
+
   isLoading = false;
 
   sink: Sink;
@@ -33,14 +33,18 @@ export class SinkViewComponent implements OnInit, OnChanges, OnDestroy {
   lastUpdate: Date | null = null;
 
   sinkStates = SinkStates;
-  
+
   editMode = {
     details: false,
     config: false,
-  }
+  };
 
   isRequesting: boolean;
 
+  errorConfigMessage: string;
+
+  sinkTags: any;
+
   @ViewChild(SinkDetailsComponent) detailsComponent: SinkDetailsComponent;
 
   @ViewChild(SinkConfigComponent)
@@ -54,8 +58,9 @@ export class SinkViewComponent implements OnInit, OnChanges, OnDestroy {
     private dialogService: NbDialogService,
     private router: Router,
     private orb: OrbService,
-    ) { 
+    ) {
       this.isRequesting = false;
+      this.errorConfigMessage = '';
     }
 
   ngOnInit(): void {
@@ -74,10 +79,14 @@ export class SinkViewComponent implements OnInit, OnChanges, OnDestroy {
   }
 
   isEditMode() {
-    return Object.values(this.editMode).reduce(
+    const resp = Object.values(this.editMode).reduce(
       (prev, cur) => prev || cur,
       false,
     );
+    if (!resp) {
+      this.errorConfigMessage = '';
+    }
+    return resp;
   }
 
   canSave() {
@@ -93,7 +102,9 @@ export class SinkViewComponent implements OnInit, OnChanges, OnDestroy {
       config = JSON.parse(configSink);
     } else if (this.editor.isYaml(configSink)) {
       config = YAML.parse(configSink);
+      this.errorConfigMessage = '';
     } else {
+        this.errorConfigMessage = 'Invalid YAML configuration, check syntax errors.';
         return false;
     }
 
@@ -121,19 +132,24 @@ export class SinkViewComponent implements OnInit, OnChanges, OnDestroy {
     const sinkDetails = this.detailsComponent.formGroup?.value;
     const tags = this.detailsComponent.selectedTags;
     const configSink = this.configComponent.code;
-  
+
     const details = { ...sinkDetails, tags };
-  
-    let payload = { id, backend, config: {}};
-  
+
     try {
-      const config = YAML.parse(configSink);
-      payload.config = config;
-  
-      if (this.editMode.details) {
-        payload = { ...payload, ...details };
+      let payload: any;
+      if (this.editMode.config && !this.editMode.details) {
+        payload = { id, backend, config: {}};
+        const config = YAML.parse(configSink);
+        payload.config = config;
+      }
+      if (this.editMode.details && !this.editMode.config) {
+        payload = { id, backend, ...details };
+      }
+      if (this.editMode.details && this.editMode.config) {
+        payload = { id, backend, ...details, config: {}};
+        const config = YAML.parse(configSink);
+        payload.config = config;
       }
-  
       this.sinks.editSink(payload as Sink).subscribe(
         (resp) => {
           this.discard();
@@ -153,10 +169,11 @@ export class SinkViewComponent implements OnInit, OnChanges, OnDestroy {
   retrieveSink() {
     this.sinkSubscription = this.orb.getSinkView(this.sinkId).subscribe(sink => {
       this.sink = sink;
+      this.sinkTags = sink?.tags ? Object.assign({}, sink.tags) : {};
       this.isLoading = false;
       this.cdr.markForCheck();
       this.lastUpdate = new Date();
-    }) 
+    });
   }
 
   ngOnDestroy(): void {
@@ -187,8 +204,8 @@ export class SinkViewComponent implements OnInit, OnChanges, OnDestroy {
   hasChanges() {
     const sinkDetails = this.detailsComponent.formGroup?.value;
     const tags = this.detailsComponent.selectedTags;
-    let selectedTags = JSON.stringify(tags);
-    let orb_tags = this.sink.tags ? JSON.stringify(this.sink.tags) : "{}";
+    const selectedTags = JSON.stringify(tags);
+    const orb_tags = JSON.stringify(this.sinkTags);
 
     if (sinkDetails.name !== this.sink.name || sinkDetails?.description !== this.sink?.description || selectedTags !== orb_tags) {
       return true;
diff --git a/ui/src/app/shared/components/delete/delete.selected.component.html b/ui/src/app/shared/components/delete/delete.selected.component.html
index 01db8514b..56d69f1e4 100644
--- a/ui/src/app/shared/components/delete/delete.selected.component.html
+++ b/ui/src/app/shared/components/delete/delete.selected.component.html
@@ -28,7 +28,7 @@
       </div>
     </div>
     <div>
-      <p class style="color: #df316f !important; margin-top: 15px !important;">*To confirm, type the amount of {{ elementName }} to be delete.</p>
+      <p class style="color: #df316f !important; margin-top: 15px !important;">*To confirm, type the amount of {{ elementName }} to be deleted.</p>
       <input type="text"
             #autoInput
             [nbAutocomplete]="auto"
diff --git a/ui/src/app/shared/components/delete/delete.selected.component.scss b/ui/src/app/shared/components/delete/delete.selected.component.scss
index 021637002..f72099d2f 100644
--- a/ui/src/app/shared/components/delete/delete.selected.component.scss
+++ b/ui/src/app/shared/components/delete/delete.selected.component.scss
@@ -59,14 +59,17 @@ nb-card {
     &stale, &none, &not, &idle {
       color: #f2994a;
     }
-    &error, &failure {
+    &error, &failure, &provioning_error {
       color: #df316f;
     }
     &offline {
       color: #969fb9;
     }
+    &provisioning {
+      color: #3089fc;
+    }
     &warning {
-      color: #f2dc4a; 
+      color: #f2c94c;
     }
   }
   .element-list {
diff --git a/ui/src/app/shared/components/filter/filter.component.html b/ui/src/app/shared/components/filter/filter.component.html
index 808411de4..fb3c11c2a 100644
--- a/ui/src/app/shared/components/filter/filter.component.html
+++ b/ui/src/app/shared/components/filter/filter.component.html
@@ -1,41 +1,85 @@
-<nb-select #master [(ngModel)]="selectedFilter" placeholder="Filter by">
-  <nb-option *ngFor="let option of availableFilters" [value]="option">
-    {{ option.name }}
-  </nb-option>
-</nb-select>
+<div class="filter-div"> 
+  <div
+    class="filter-button" 
+    (click)="onFilterClick()"
+  >
+    <span>Filter by</span>
+    <nb-icon icon="chevron-down-outline" class="icon"></nb-icon>
+  </div>
 
-<ng-container *ngIf="selectedFilter">
-  <ng-container [ngSwitch]="selectedFilter?.type">
-    <ng-container *ngSwitchCase="type.Input">
-      <ng-container [ngTemplateOutlet]="input"></ng-container>
-    </ng-container>
-    <ng-container *ngSwitchCase="type.AutoComplete">
-      <ng-container [ngTemplateOutlet]="auto"></ng-container>
-    </ng-container>
-    <ng-container *ngSwitchCase="type.Select">
-      <ng-container [ngTemplateOutlet]="select"></ng-container>
-    </ng-container>
-    <ng-container *ngSwitchCase="type.MultiSelect">
-      <ng-container [ngTemplateOutlet]="multi"></ng-container>
-    </ng-container>
-    <ng-container *ngSwitchCase="type.Checkbox">
-      <ng-container [ngTemplateOutlet]="checkbox"></ng-container>
-    </ng-container>
-    <ng-container *ngSwitchCase="type.Number">
-      <ng-container [ngTemplateOutlet]="number"></ng-container>
-    </ng-container>
-    <button
-      (click)="addFilter()"
-      [disabled]="!filterParam || filterParam === ''"
-      nbButton
-      ghost
-      style="margin-right: 5px;"
-      status="primary"
+  <div id="filterMenu" class="filter-menu" *ngIf="showMenu">
+    <button 
+      id="filterMenu"
+      class="filter-menu-item" 
+      *ngFor="let option of availableFilters"
+      (click)="handleFilterOptionClick(option)"
     >
-      <nb-icon icon="plus-outline"></nb-icon>  
+      <span>{{ option.name }}</span>
     </button>
-  </ng-container>
-</ng-container>
+  </div>
+</div>
+
+<div class="apply-filter-div" *ngIf="currentFilter !== null">
+  <input type="text"
+    id="filterInput"
+    class="apply-filter-input"
+    nbInput
+    placeholder="{{ currentFilter.name === 'MultiTags' ? 'Tags' : currentFilter.name}}"
+    [readonly]="currentFilter?.options"
+    [(ngModel)]="filterText"
+    (click)="showOptions = true"
+    [class.pointer-cursor]="currentFilter?.options"
+    autofocus
+  >
+  <button 
+    *ngIf="!currentFilter?.options"
+    class="add-filter-button"
+    [disabled]="!filterText"
+    nbTooltip="Add Filter"
+    (click)="onAddFilterButton(filterText)"
+  >
+    <nb-icon icon="plus-outline"></nb-icon>
+  </button>
+  <div class="filter-menu" *ngIf="optionsMenuType === 'multiselectsync' && showOptions">
+    <div 
+      *ngFor="let option of currentFilter?.options" 
+      class="apply-filter-option"
+      (click)="handleClickMultiSelect($event, option)"
+    >
+      <input type="checkbox" 
+        (click)="onCheckboxMultiSelect($event, option)"
+        [checked]="isOptionSelected(option) | async"             
+      >
+      <span>{{ option | titlecase }}</span>
+    </div>
+  </div>
+  <div class="filter-menu" *ngIf="optionsMenuType === 'multiselectasync' && showOptions">
+    <div 
+      *ngFor="let option of currentFilter?.autoSuggestion | async" 
+      class="apply-filter-option"
+      (click)="handleClickMultiSelect($event, option)"
+    >
+      <input type="checkbox" 
+        (click)="onCheckboxMultiSelect($event, option)"
+        [checked]="isOptionSelected(option) | async"             
+      >
+      <span>{{ option | titlecase }}</span>
+    </div>
+  </div>
+  <div class="filter-menu" *ngIf="optionsMenuType === 'tags' && showOptions">
+    <div 
+      *ngFor="let option of currentFilter?.autoSuggestion | async" 
+      class="apply-filter-option"
+      (click)="handleClickTags($event, option)"
+    > 
+      <input type="checkbox" 
+        (click)="onCheckboxTags($event, option)"
+        [checked]="isOptionSelected(option) | async"            
+      >
+      <span>{{ option }}</span>
+    </div>
+  </div>
+</div>
 
 <div class="search-input-wrapper">
   <nb-icon icon="search-outline" class="search-icon"></nb-icon>
@@ -43,114 +87,40 @@
     placeholder="Search by name" 
     [(ngModel)]="searchText"
     nbInput
-    class="search-input custom-input"
+    class="search-input"
     (ngModelChange)="onSearchTextChange()">
 </div>
-
-<mat-chip-list>
-  <ng-container *ngFor="let filter of activeFilters$ | async; let index = index">
-    <mat-chip *ngIf="filter.name !== 'Name'" class="filter-chip">
-      {{ filter?.exact ? filter.name + ": '" + filter?.param + "'" : filter.name + ': ' + filter?.param }}
-      <button class="remove-tag-button" (click)="removeFilter(index)" nbButton shape="round">
-        <i class="fa fa-window-close" style="color: #3089fc;">&nbsp;</i>
-      </button>
-    </mat-chip>
-  </ng-container>
-</mat-chip-list>
-
-<ng-template #input>
-  <nb-form-field>
-  <input
-    [(ngModel)]="filterParam"
-    nbInput
-    required
-    type="text"
-    placeholder="{{ selectedFilter?.name }}"
-    style="max-width: 150px;"
-  />
-  <button nbSuffix nbButton ghost class="exact-match-button"
-          [class]="selectedFilter.exact ? 'exact-match' : 'partial-match'"
-          (click)="toggleExactMatch()">
-    <nb-icon [icon]="selectedFilter?.exact ? 'lock-outline' : 'unlock-outline'"
-             [nbTooltip]="selectedFilter.exact ? 'Toggle Partial Match' : 'Toggle Exact Match'"
-             pack="eva"
-             [attr.aria-label]="selectedFilter.exact ? 'Toggle Partial Match' : 'Toggle Exact Match'">
-    </nb-icon>
+<button
+  *ngIf="optionsMenuType === 'tags' && currentFilter"
+  class="multi-tags-button"
+  (click)="toggleMultiTags()"
+>
+  Use <span style="color: #3089fc;" nbTooltip="Multiple filters will be added using {{ isMultiTags ? 'OR' : 'AND' }} condition. Click to toggle.">
+    {{ isMultiTags ? 'OR' : 'AND' }}
+  </span> 
+  Condition
+</button>
+<div *ngIf="(hasActiveFilters() | async)" class="list-div">
+  <div class="filters-list">
+    <div class="filter-list-display">
+      <ng-container *ngFor="let filter of activeFilters$ | async; let index = index" >
+        <div class="filter-item" *ngIf="filter.name !== 'Name'">
+          <div class="filter-name">
+            <span>{{ filter.name === 'MultiTags' ? 'Tags' : filter.name }}</span>
+          </div>
+          <div class="filter-param">
+            <span>{{ filter?.param | paramformatter}}</span>
+          </div>
+          <div class="filter-remove" id="remove-button">
+            <button class="remove-tag-button" (click)="removeFilter(index, filter)">
+              <nb-icon icon="close-outline"></nb-icon>
+            </button>
+          </div>
+        </div>
+      </ng-container>
+    </div>
+  </div>
+  <button class="clear-filters-button" (click)="clearAllFilters()">
+    <span>Clear filters</span>
   </button>
-  </nb-form-field>
-</ng-template>
-<ng-template #select>
-  <nb-select [(selected)]="filterParam" placeholder="--select--" required>
-    <nb-option *ngFor="let option of selectedFilter?.options" [value]="option">
-      {{ option }}
-    </nb-option>
-  </nb-select>
-</ng-template>
-
-<ng-template #number>
-  <nb-form-field>
-    <input
-      [(ngModel)]="filterParam"
-      nbInput
-      required
-      placeholder="{{ selectedFilter?.name }}"
-      style="max-width: 150px;"
-    />
-  </nb-form-field>
-</ng-template>
-
-<ng-template #auto>
-
-  <nb-autocomplete #auto>
-    <nb-option
-      *ngFor="let option of selectedFilter?.autoSuggestion | async"
-      [value]="option"
-    >
-      {{ option }}
-    </nb-option>
-  </nb-autocomplete>
-  <nb-form-field>
-  <input
-    #autoInput
-    [(ngModel)]="filterParam"
-    [nbAutocomplete]="auto"
-    nbInput
-    required
-    type="text"
-    style="max-width: 150px;"
-  />
-  <button nbSuffix nbButton ghost class="exact-match-button"
-          [class]="selectedFilter.exact ? 'exact-match' : 'partial-match'"
-          (click)="toggleExactMatch()">
-    <nb-icon [icon]="selectedFilter?.exact ? 'lock-outline' : 'unlock-outline'"
-             pack="eva"
-             [attr.aria-label]="exact ? 'Toggle Partial Match' : 'Toggle Exact Match'">
-    </nb-icon>
-  </button>
-  </nb-form-field>
-</ng-template>
-<ng-template #select>
-  <nb-select [(selected)]="filterParam" placeholder="--select--" required>
-    <nb-option *ngFor="let option of selectedFilter?.options" [value]="option">
-      {{ option }}
-    </nb-option>
-  </nb-select>
-</ng-template>
-
-<ng-template #multi>
-  <nb-select [(selected)]="filterParam" multiple required>
-    <nb-option
-      *ngFor="let option of selectedFilter?.options"
-      [ngClass]="option"
-      [value]="option"
-    >
-      {{ option | ngxCapitalize }}
-    </nb-option>
-  </nb-select>
-</ng-template>
-
-<ng-template #checkbox>
-  <mat-checkbox [(ngModel)]="filterParam">{{
-    selectedFilter?.name
-  }}</mat-checkbox>
-</ng-template>
+</div>
diff --git a/ui/src/app/shared/components/filter/filter.component.scss b/ui/src/app/shared/components/filter/filter.component.scss
index 3ea7c590f..042794355 100644
--- a/ui/src/app/shared/components/filter/filter.component.scss
+++ b/ui/src/app/shared/components/filter/filter.component.scss
@@ -1,9 +1,9 @@
 :host {
   display: flex !important;
-  width: 100% !important;
+  width: calc(100% - 270px) !important;
   min-height: 32px !important;
   max-height: 100% !important;
-  gap: 5px !important;
+  gap: 0px !important;
   margin-bottom: 8px !important;
   flex-direction: row !important;
   flex-wrap: wrap !important;
@@ -12,13 +12,6 @@
   align-items: center !important;
 }
 
-nb-select,
-nb-select.select-button,
-.select-button {
-  min-width: 150px !important;
-  max-width: 100% !important;
-}
-
 .exact-match-button {
   box-shadow: none !important;
   box-sizing: border-box;
@@ -35,31 +28,6 @@ nb-select.select-button,
 .partial-match {
   color: #0c5dc5 !important;
 }
-.section-controls {
-  //display: contents;
-
-  //  display: inline-block;
-  //  display: flex;
-  //  flex-direction: row;
-  //  flex-wrap: nowrap;
-  //  align-content: stretch;
-  //  align-items: center;,
-  //  justify-content: flex-start;
-  //  width: 100%;
-}
-
-//
-.section-display {
-  //display: contents;
-  //display: flex;
-  //  display: inline-flex;
-  //  flex-direction: row;
-  //  align-content: center;
-  //  align-items: center;
-  //  justify-content: flex-end;
-  //  flex-wrap: wrap;
-  //  width: 100%;
-}
 
 .small-button {
   padding: 0 !important;
@@ -70,20 +38,81 @@ nb-select.select-button,
   padding-right: 4px;
   color: #8f9bb3;
 }
-
-mat-chip-list {
-  width: 100%;
-  align-self: center;
+.list-div {
+  display: flex;
+  width: 100%; 
+  gap: 5px; 
+  height: fit-content; 
+  align-items: center; 
+  margin-top: 8px;
+}
+.filters-list {
+  width: fit-content;
+  max-width: calc(100% - 100px);
+  white-space: nowrap;
+  overflow-x: auto;
+  overflow-y: hidden;
+  box-sizing: content-box;
+  padding-bottom: 0 !important;
+  scrollbar-width: thin;
+  scrollbar-color: #969fb9 transparent;
+}
+::-webkit-scrollbar {
+  width: 3px;
+  height: 3px;
+  background: transparent;
+}
+::-webkit-scrollbar-thumb {
+  background: #969fb9;
+  border-radius: 16px;
 }
 
-.filter-chip {
+.filter-list-display {
+  position: relative !important;
+  display: flex;
+  width: fit-content !important;
+  gap: 7px;
+}
+.filter-item {
+  display: flex;
+  height: 22px;
+  color: #969fb9;
+  font-weight: 500;
+  font-size: 12px;
+  span {
+    padding: 8px 5px 5px 5px;
+  }
+}
+.filter-name {
+  margin-right: 1px;
+  background-color: #262c46;
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
   color: #3089fc;
-  border: solid;
-  border-width: 1px;
+  span {
+    padding-left: 6px !important;
+  }
+}
+.filter-param {
+  margin-right: 1px;
+  background-color: #262c46;
+}
+.filter-remove {
+  background-color: #262c46;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+.clear-filters-button {
   background-color: transparent;
-  //padding-left: 2px;
+  color: #969FB9;
+  outline: none;
+  height: 22px;
+  border-radius: 4px;
+  font-weight: 500;
+  font-size: 12px;
+  border: none !important;
+  align-self: center;
 }
-
 .not-applied {
   color: #8f9bb3 !important;
 }
@@ -93,25 +122,22 @@ mat-chip-list {
 }
 
 .remove-tag-button {
-  background: none !important;
-  margin: 0 0 0 10px !important;
-  padding: 0 6px 0 10px !important;
-  align-self: end;
-  width: 0;
-}
-
-.clear-all {
-  color: #8f9bb3 !important;
-  margin-left: auto;
+  background-color: transparent;
+  color: #969fb9;
+  outline: none;
+  border: none;
+  align-content: center;
+  nb-icon {
+    font-size: 16px;
+    margin-top: 2px;
+  }
 }
 
-.clear-filter {
-  margin-left: 1rem;
-}
 .search-input {
-  width: 300px !important;
-  height: 38px !important;
+  width: 280px !important;
+  height: 32px !important;
   padding-left: 35px !important;
+  border-radius: 0px 2px 2px 0px !important;
 }
 .filter-search-container {
   display: flex;
@@ -129,4 +155,143 @@ mat-chip-list {
   pointer-events: none;
   color: #8f9bb3;
 }
+.add-filter-button {
+  position: absolute;
+  right: 6px;
+  top: 6px;
+  width: 20px;
+  height: 20px;
+  padding: 2px;
+  border: none;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  outline: none;
+  background-color: transparent;
+  transition: color 0.3s ease;
+  color: #3089fc;
+  &:disabled {
+    color: #969fb9;
+  }
+}
+.apply-filter-input {
+  width: 100%;
+  height: 100%;
+  border-right: none;
+  padding-right: 32px !important;
+  &:hover {
+    border-color: #969fb9 !important;
+  }
+}
 
+.filter-div {
+  width: 114px;
+  height: 32px;
+  position: relative;
+}
+.filter-button {
+  background-color: #232940;
+  border: solid 1px #969FB9 !important;
+  border-radius: 4px 0px 0px 4px !important;
+  color: #969FB9;
+  width: 100%;
+  height: 100%;
+  padding: 0;
+  border-right: none;
+  cursor: pointer;
+  transition: background-color 0.3s ease;
+  nb-icon {
+    margin-top: 5px;
+    margin-left: 6px;
+  }
+  span {
+    float: left;
+    margin-left: 16px;
+    font-family: Montserrat;
+    font-size: 14px;
+    font-weight: 500;
+    line-height: 18px;
+    text-align: left;
+    padding-top: 1px;
+    margin-top: 5px;
+  }
+  &:hover {
+    background-color: transparent;
+  }
+}
+.icon {
+  transition: transform 0.3s ease;
+}
+.flipped {
+  transform: rotateX(180deg);
+}
+.filter-menu {
+  position: absolute;
+  transform: translate(0, 4px);
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.5);
+  z-index: 9999;
+  width: 100%;
+  padding: 0;
+  margin: 0;
+  max-height: 50vh;
+  overflow-y: scroll;
+  overflow-x: hidden;
+}
+.filter-menu-item {
+  width: 114px;
+  height: 37px;
+  background-color: rgba(35, 41, 64, 0.96);
+  border: none;
+  color: #fff;
+  outline: none;
+  &:hover {
+    background-color: rgba(55,64,86, 0.96);
+  }
+  span {
+    font-family: Montserrat;
+    float: left;
+    padding-left: 12px;
+    font-size: 13px;
+    font-weight: 500;
+  }
+}
+.apply-filter-div {
+  width: 150px;
+  height: 32px;
+  position: relative;
+}
+.apply-filter-option {
+  display: flex;
+  align-items: center;
+  width: 160px;
+  height: 37px;
+  background-color: rgba(35, 41, 64, 0.96);
+  border: none;
+  color: #fff;
+  outline: none;
+  cursor: pointer;
+  &:hover {
+    background-color: rgba(55,64,86, 0.96);
+  }
+  span {
+    font-family: Montserrat;
+    float: left;
+    padding-left: 15px;
+    font-size: 13px;
+    font-weight: 500;
+  }
+  input {
+    margin-left: 10px;
+  }
+}
+.pointer-cursor {
+  cursor: pointer;
+}
+.multi-tags-button {
+  color: #969FB9;
+  background-color: transparent;
+  border: none;
+  outline: none;
+  font-size: 13px;
+  margin-left: 5px;
+}
diff --git a/ui/src/app/shared/components/filter/filter.component.ts b/ui/src/app/shared/components/filter/filter.component.ts
index 6956a127e..422b31e86 100644
--- a/ui/src/app/shared/components/filter/filter.component.ts
+++ b/ui/src/app/shared/components/filter/filter.component.ts
@@ -1,4 +1,4 @@
-import { Component, HostListener, Input } from '@angular/core';
+import { ChangeDetectorRef, Component, ElementRef, HostListener, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { MatSelectChange } from '@angular/material/select';
 import {
   FilterOption,
@@ -7,44 +7,116 @@ import {
 } from 'app/common/interfaces/orb/filter-option';
 import { FilterService } from 'app/common/services/filter.service';
 import { Observable } from 'rxjs';
-import { map, tap } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 
 @Component({
   selector: 'ngx-filter',
   templateUrl: './filter.component.html',
   styleUrls: ['./filter.component.scss'],
 })
-export class FilterComponent {
+export class FilterComponent implements OnInit, OnDestroy {
   @Input()
   availableFilters!: FilterOption[];
 
   activeFilters$: Observable<FilterOption[]>;
 
-  type = FilterTypes;
-
   selectedFilter!: FilterOption | null;
 
-  filterParam: any;
-
   exact: boolean;
 
   searchText: string;
 
   lastSearchText: string;
 
-  constructor(private filter: FilterService) {
+  loadedSearchText: string;
+
+  optionsMenuType = '';
+
+  showMenu = false;
+
+  currentFilter: FilterOption | null = null;
+
+  filterText: string = '';
+
+  showOptions = true;
+
+  selectedFilterParams = [];
+
+  isMultiTags = false;
+
+  @ViewChild('filtersDisplay') filtersDisplay!: ElementRef;
+
+  @ViewChild('filterList') filterList!: ElementRef;
+
+  @ViewChild('filterMenu') filterMenu!: ElementRef;
+
+  private observer: MutationObserver | null = null;
+
+  constructor(
+    private filter: FilterService,
+    private elRef: ElementRef,
+    private cdr: ChangeDetectorRef,
+    ) {
     this.exact = false;
     this.availableFilters = [];
     this.activeFilters$ = filter.getFilters().pipe(map((filters) => filters));
-    this.searchText = '';
   }
-  
+  @HostListener('document:keydown.enter', ['$event'])
+  addFilterEnter(event: KeyboardEvent) {
+    if (this.filterText && !this.currentFilter?.options) {
+      this.onAddFilterButton(this.filterText);
+    }
+  }
+
+
+  @HostListener('document:click', ['$event'])
+  handleOutsideClick(event: Event) {
+    const target = event.target as HTMLElement;
+    const parentId = (target?.parentNode as HTMLElement)?.id;
+
+    if (!this.elRef.nativeElement.contains(event.target) && parentId !== 'filterMenu' && !target.closest('#remove-button')) {
+      if (this.currentFilter) {
+        if (this.showOptions) {
+          this.showOptions = false;
+        } else {
+          this.currentFilter = null;
+          this.selectedFilterParams = [];
+          this.filterText = '';
+        }
+      }
+      if (this.showMenu) {
+        const icon = document.querySelector('.icon');
+        icon.classList.toggle('flipped');
+      }
+      this.showMenu = false;
+    }
+  }
+
   ngOnInit() {
-    this.availableFilters = this.availableFilters.filter(filter => filter.name !== 'Name');
+    this.availableFilters = this.availableFilters.filter(filter => filter.name !== 'Name' && filter.name !== 'MultiTags');
+    this.searchText = this.filter.searchName || '';
+    if (this.filter.searchName) {
+      this.searchText = this.filter.searchName;
+      this.loadedSearchText = this.searchText;
+    } else {
+      this.searchText = '';
+    }
   }
+
+  ngOnDestroy() {
+    if (this.observer) {
+      this.observer.disconnect();
+      this.observer = null;
+    }
+  }
+
   onSearchTextChange() {
+    if (this.loadedSearchText) {
+      this.filter.findAndRemove(this.loadedSearchText, 'Name');
+      this.loadedSearchText = undefined;
+    }
     if (this.lastSearchText !== '') {
-      this.filter.removeFilterByParam(this.lastSearchText);
+      this.filter.findAndRemove(this.lastSearchText, 'Name');
     }
     if (this.searchText !== '') {
       const filterOptions: FilterOption = {
@@ -53,28 +125,16 @@ export class FilterComponent {
         param: this.searchText,
         type: FilterTypes.Input,
         filter: filterString,
-      }
+      };
       this.filter.addFilter(filterOptions);
     }
     this.lastSearchText = this.searchText;
   }
-  addFilter(): void {
-    if (!this.selectedFilter) return;
-
-    this.filter.addFilter({ ...this.selectedFilter, param: this.filterParam });
-
-    this.selectedFilter = null;
-    this.filterParam = null;
-  }
 
-  @HostListener('window:keydown.enter', ['$event'])
-  handleKeyDown(event: KeyboardEvent) {
-    if (event.key === 'Enter' && this.filterParam) {
-      this.addFilter();
+  removeFilter(index: number, filter: any) {
+    if (filter.param === this.selectedFilterParams && filter.name === this.currentFilter?.name) {
+      this.selectedFilterParams = [];
     }
-  }
-
-  removeFilter(index: number) {
     this.filter.removeFilter(index);
   }
 
@@ -84,9 +144,155 @@ export class FilterComponent {
 
   clearAllFilters() {
     this.filter.cleanFilters();
+    this.selectedFilterParams = [];
   }
 
   toggleExactMatch() {
     this.selectedFilter.exact = !this.selectedFilter.exact;
   }
+
+  onFilterClick() {
+    this.showMenu = !this.showMenu;
+    this.currentFilter = null;
+    this.filterText = '';
+    this.selectedFilterParams = [];
+    const icon = document.querySelector('.icon');
+    icon.classList.toggle('flipped');
+    this.showOptions = true;
+  }
+  handleFilterOptionClick(option: any) {
+    this.showMenu = false;
+    this.currentFilter = Object.assign({}, option);
+    const icon = document.querySelector('.icon');
+    icon.classList.toggle('flipped');
+
+    if (this.currentFilter.type === FilterTypes.MultiSelect) {
+      this.selectedFilterParams = this.filter.getMultiAppliedParams(this.currentFilter.name);
+      this.optionsMenuType = 'multiselectsync';
+    } else if (this.currentFilter.type === FilterTypes.MultiSelectAsync) {
+      this.selectedFilterParams = this.filter.getMultiAppliedParams(this.currentFilter.name);
+      this.optionsMenuType = 'multiselectasync';
+    } else if (this.currentFilter.type === FilterTypes.Tags) {
+      this.optionsMenuType = 'tags';
+      this.isMultiTags = false;
+    }
+  }
+
+  handleClickMultiSelect(event: any, param: any) {
+    if (event.target.type !== 'checkbox') {
+      if (!this.selectedFilterParams.find(f => f === param)) {
+        this.filter.findAndRemove(this.selectedFilterParams, this.currentFilter.name);
+        this.selectedFilterParams.push(param);
+        this.filter.addFilter({ ...this.currentFilter, param: this.selectedFilterParams });
+      }
+      this.currentFilter = null;
+      this.selectedFilterParams = [];
+      this.filterText = '';
+    }
+  }
+
+  onCheckboxMultiSelect(event: Event, param: any) {
+    const checkbox = event.target as HTMLInputElement;
+    const isChecked = checkbox.checked;
+    const oldParamList = this.selectedFilterParams;
+
+    if (isChecked) {
+      this.selectedFilterParams.push(param);
+    } else {
+      this.selectedFilterParams = this.selectedFilterParams.filter((f) => f !== param);
+    }
+
+    this.filter.findAndRemove(oldParamList, this.currentFilter.name);
+    if (this.selectedFilterParams.length > 0) {
+      this.filter.addFilter({ ...this.currentFilter, param: this.selectedFilterParams });
+    }
+  }
+  toggleMultiTags() {
+    this.isMultiTags = !this.isMultiTags;
+    if (this.isMultiTags) {
+      this.currentFilter.name = 'MultiTags';
+      this.selectedFilterParams = this.filter.getMultiAppliedParams(this.currentFilter.name);
+    } else {
+      this.currentFilter.name = 'Tags';
+      this.selectedFilterParams = [];
+    }
+  }
+  handleClickTags(event: any, param: any) {
+    if (event.target.type !== 'checkbox') {
+      if (this.isMultiTags) {
+        if (!this.selectedFilterParams.find(f => f === param)) {
+          this.filter.findAndRemove(this.selectedFilterParams, this.currentFilter.name);
+          this.selectedFilterParams.push(param);
+          this.filter.addFilter({ ...this.currentFilter, param: this.selectedFilterParams });
+        }
+        this.currentFilter = null;
+        this.selectedFilterParams = [];
+        this.filterText = '';
+      } else {
+        if (this.filter.findFilter(param, this.currentFilter.name) === -1) {
+          this.filter.addFilter({ ...this.currentFilter, param: param });
+        }
+        this.currentFilter = null;
+        this.filterText = '';
+      }
+    }
+  }
+  onCheckboxTags(event: Event, param: any) {
+    const checkbox = event.target as HTMLInputElement;
+    const isChecked = checkbox.checked;
+    const oldParamList = this.selectedFilterParams;
+
+    if (this.isMultiTags) {
+      if (isChecked) {
+        this.selectedFilterParams.push(param);
+      } else {
+        this.selectedFilterParams = this.selectedFilterParams.filter((f) => f !== param);
+      }
+      this.filter.findAndRemove(oldParamList, this.currentFilter.name);
+      if (this.selectedFilterParams.length > 0) {
+        this.filter.addFilter({ ...this.currentFilter, param: this.selectedFilterParams });
+      }
+    } else {
+      if (isChecked) {
+        this.filter.addFilter({ ...this.currentFilter, param: param });
+      } else {
+        this.filter.findAndRemove(param, this.currentFilter.name);
+      }
+    }
+  }
+
+  onAddFilterButton(param: any) {
+    const isTags = this.currentFilter.name === 'Tags';
+    if (!isTags || (isTags  && this.isMultiTags)) {
+      if (this.selectedFilterParams.length > 0) {
+        this.filter.findAndRemove(this.selectedFilterParams, this.currentFilter.name);
+        this.selectedFilterParams.push(param);
+        this.filter.addFilter({ ...this.currentFilter, param: this.selectedFilterParams });
+      } else {
+        this.selectedFilterParams.push(param);
+        this.filter.addFilter({ ...this.currentFilter, param: this.selectedFilterParams });
+      }
+    } else {
+      this.filter.addFilter({ ...this.currentFilter, param: param });
+    }
+    this.filterText = '';
+  }
+  isOptionSelected(option: any) {
+    return this.activeFilters$.pipe(
+      map(filters => {
+        return filters.some(filter => {
+          const isArray = Array.isArray(filter.param);
+          if (isArray) {
+            return filter.param.includes(option) && this.currentFilter.name === filter.name;
+          }
+          return filter.param === option && this.currentFilter.name === filter.name;
+        });
+      }),
+    );
+  }
+  hasActiveFilters(): Observable<boolean> {
+    return this.activeFilters$.pipe(
+      map(filters => filters && (filters.filter((f) => f.name !== 'Name')).length > 0),
+    );
+  }
 }
diff --git a/ui/src/app/shared/components/orb/agent/agent-backends/agent-backends.component.html b/ui/src/app/shared/components/orb/agent/agent-backends/agent-backends.component.html
index a02c69369..43ce8deda 100644
--- a/ui/src/app/shared/components/orb/agent/agent-backends/agent-backends.component.html
+++ b/ui/src/app/shared/components/orb/agent/agent-backends/agent-backends.component.html
@@ -2,7 +2,7 @@
   <nb-card-header>Agent Backends</nb-card-header>
   <nb-card-body>    
     <nb-tabset *ngIf="agent?.state !== agentStates.new">
-      <nb-tab *ngFor="let backend of agent?.agent_metadata?.backends | keyvalue"
+      <nb-tab *ngFor="let backend of agent?.agent_metadata?.backends | keyvalue; trackBy: identify"
           tabTitle="{{backend.key}}">
           <p><label>Version:</label> {{backend.value.version}}</p>
           <ng-container *ngIf="agent?.last_hb_data?.backend_state">
@@ -17,8 +17,8 @@
           </ng-container>
       </nb-tab>
     </nb-tabset>
-    <span *ngIf="agent?.state === agentStates.new" class="summary-accent">
+    <p *ngIf="agent?.state === agentStates.new" class="summary-accent">
       Agent needs to be connected to have a backend.
-    </span>
+    </p>
   </nb-card-body>
 </nb-card>
diff --git a/ui/src/app/shared/components/orb/agent/agent-backends/agent-backends.component.scss b/ui/src/app/shared/components/orb/agent/agent-backends/agent-backends.component.scss
index 29b385537..4c627b4e0 100644
--- a/ui/src/app/shared/components/orb/agent/agent-backends/agent-backends.component.scss
+++ b/ui/src/app/shared/components/orb/agent/agent-backends/agent-backends.component.scss
@@ -8,13 +8,15 @@ h4 {
 }
 
 nb-tab {
-  padding: 1rem 0.5rem !important;
+  padding-bottom: 0 !important;
+  padding-left: 1rem !important;
 }
 
 nb-card {
   border: transparent;
   border-radius: 0.5rem;
   padding: 0 !important;
+  margin-bottom: 15px !important;
 
   nb-card-header {
     background-color: #232940;
@@ -25,6 +27,9 @@ nb-card {
   }
 
   nb-card-body {
+    padding-top: 0;
+    padding-bottom: 0 !important;
+    margin: 0 !important;
     label {
       color: #969fb9;
     }
@@ -32,7 +37,12 @@ nb-card {
     span {
       text-align: end;
     }
-
+    p {
+      margin-top: 1rem;
+      margin-bottom: 1rem;
+      font-family: Open Sans, sans-serif !important;
+      color: #969fb9 !important;
+    }
     .active-dataset {
       list-style-type: none;
       margin: 0;
@@ -151,7 +161,3 @@ nb-card {
     background-color: #3089fc !important;
   }
 }
-
-.summary-accent {
-  color: #969fb9 !important;
-}
\ No newline at end of file
diff --git a/ui/src/app/shared/components/orb/agent/agent-backends/agent-backends.component.ts b/ui/src/app/shared/components/orb/agent/agent-backends/agent-backends.component.ts
index 9e344fd2b..0a8d71800 100644
--- a/ui/src/app/shared/components/orb/agent/agent-backends/agent-backends.component.ts
+++ b/ui/src/app/shared/components/orb/agent/agent-backends/agent-backends.component.ts
@@ -11,7 +11,11 @@ export class AgentBackendsComponent implements OnInit {
   @Input() agent: Agent;
 
   agentStates = AgentStates;
-  
+
+  identify(index, item) {
+    return item.id;
+  }
+
   constructor(
     protected notificationService: NotificationsService,
   ) {
diff --git a/ui/src/app/shared/components/orb/agent/agent-capabilities/agent-capabilities.component.scss b/ui/src/app/shared/components/orb/agent/agent-capabilities/agent-capabilities.component.scss
index 1e7dbf07d..341daf52d 100644
--- a/ui/src/app/shared/components/orb/agent/agent-capabilities/agent-capabilities.component.scss
+++ b/ui/src/app/shared/components/orb/agent/agent-capabilities/agent-capabilities.component.scss
@@ -11,6 +11,7 @@ nb-card {
   border: transparent;
   border-radius: 0.5rem;
   padding: 0 !important;
+  margin: 0 !important;
 
   nb-card-header {
     background-color: #232940;
@@ -21,6 +22,8 @@ nb-card {
   }
 
   nb-card-body {
+    padding-bottom: 0.5rem;
+    margin: 0 !important;
     label {
       color: #969fb9;
     }
diff --git a/ui/src/app/shared/components/orb/agent/agent-groups/agent-groups.component.html b/ui/src/app/shared/components/orb/agent/agent-groups/agent-groups.component.html
index 46af2e40c..d22a9ff53 100644
--- a/ui/src/app/shared/components/orb/agent/agent-groups/agent-groups.component.html
+++ b/ui/src/app/shared/components/orb/agent/agent-groups/agent-groups.component.html
@@ -1,18 +1,34 @@
 <nb-card>
   <nb-card-header>Active Groups</nb-card-header>
   <nb-card-body>
-    <span class="error-accent" *ngIf="errors?.nogroup">{{ errors.nogroup }}</span>
+    <span class="summary-accent" *ngIf="errors?.nogroup">{{ errors.nogroup }}</span>
 
-    <ng-container *ngFor="let group of groups; last as isLast" >
-      <button class='agent-group-button'
-      *ngIf="!group.statusText"
-      (click)="showAgentGroupMatches(group)">
-        <span matTooltip="{{group?.matching_agents?.online}} online out of {{group?.matching_agents?.total}} agent(s)"
-        class="agent-group-accent">{{ group?.name }} ( {{ group?.matching_agents?.online}}
-                                                    / {{ group?.matching_agents?.total }} )</span>
-        <span *ngIf="!isLast">,</span>
-      </button>
-      <span *ngIf="group.statusText" class="error-accent">{{ group.id + ': ' + group.status + ' ' + group.statusText }}</span>
-    </ng-container>
+    <nb-accordion *ngFor="let group of groups; trackBy: identify">
+      <nb-accordion-item>
+        <nb-accordion-item-header> 
+          <span class="summary-accent">Group:</span>&nbsp;{{ group?.name }} 
+        </nb-accordion-item-header>
+        <nb-accordion-item-body> 
+          <button *ngIf="group?.matching_agents?.online !== 0"
+          (click)="showAgentGroupMatches(group)"
+          class="agent-group-button">
+            <span>
+              {{ group?.matching_agents?.online }} out of {{ group?.matching_agents?.total }} agents are <span style="color: #6fcf97">online</span>
+            </span>
+          </button>
+          <button *ngIf="group?.matching_agents?.online === 0 && group?.matching_agents?.total !== 0"
+          (click)="showAgentGroupMatches(group)"
+          class="agent-group-button">
+            <span>
+              None of {{ group?.matching_agents?.total }} agents are online.
+            </span>
+          </button>
+          <span *ngIf="group?.matching_agents?.total === 0"  class="agent-group-button">
+            Group don't have any agents.
+          </span>
+
+        </nb-accordion-item-body>
+      </nb-accordion-item>
+    </nb-accordion>
   </nb-card-body>
 </nb-card>
\ No newline at end of file
diff --git a/ui/src/app/shared/components/orb/agent/agent-groups/agent-groups.component.scss b/ui/src/app/shared/components/orb/agent/agent-groups/agent-groups.component.scss
index e4e1ba59a..e35545976 100644
--- a/ui/src/app/shared/components/orb/agent/agent-groups/agent-groups.component.scss
+++ b/ui/src/app/shared/components/orb/agent/agent-groups/agent-groups.component.scss
@@ -118,23 +118,67 @@ nb-card {
   }
 }
 
-::ng-deep .agent-group-button {
+.agent-group-button {
   background-color: transparent !important;
   background-repeat: no-repeat !important;
-  border: solid #ffffff !important;
-  border-radius: 15px !important;
-  border-width: thin !important;
+  border: none !important;
   cursor: pointer !important;
   outline: none !important;
   overflow: hidden !important;
+  color: #fff;
+  font-family: 'Montserrat', sans-serif;
+  font-size: 13px;
+  font-weight: 600;
+  line-height: 1.5rem;
+  margin: 0 !important;
+  padding: 0 !important;
+}
+::ng-deep nb-accordion {
+  border: none !important;
+  border-radius: 8px !important;
+  display: grid;
+  padding: -0.1rem !important;
+  margin: -0.1rem !important;
+  text-subtitle-line-height: 1rem;
+  box-shadow: none !important;
+
+  > nb-accordion-item {
+    border: none !important;
+    border-radius: 8px !important;
+    padding: -0.1rem !important;
+    margin: -0.1rem !important;
+
+    > nb-accordion-item-header {
+      border: none !important;
+      border-radius: 8px !important;
+      padding: 0.1rem 0 !important;
+      background-color: transparent !important;
+    }
+
+    > nb-accordion-item-body {
+      border: none !important;
+      border-radius: 8px !important;
+      display: grid;
+      padding: 0 10px;
+      background-color: #1c2339;
+
+      .item-body {
+        padding: 0.1em !important;
+      }
+    }
+  }
 }
 
 .agent-group-accent {
   color: #ffffff !important;
   font-weight: 500;
+
 }
 
 .error-accent {
   color: #df316f !important;
   font-weight: 500;
 }
+.summary-accent {
+  color: #969fb9 !important;
+}
diff --git a/ui/src/app/shared/components/orb/agent/agent-groups/agent-groups.component.ts b/ui/src/app/shared/components/orb/agent/agent-groups/agent-groups.component.ts
index 49a58fefa..10342baa6 100644
--- a/ui/src/app/shared/components/orb/agent/agent-groups/agent-groups.component.ts
+++ b/ui/src/app/shared/components/orb/agent/agent-groups/agent-groups.component.ts
@@ -54,4 +54,7 @@ export class AgentGroupsComponent implements OnInit, OnChanges {
       relativeTo: this.route,
     });
   }
+  identify(index, item) {
+    return item.id;
+  }
 }
diff --git a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.html b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.html
index d45e69237..588017d84 100644
--- a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.html
+++ b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.html
@@ -66,7 +66,7 @@
   <ngx-combined-tag [agent]="agent"></ngx-combined-tag>
   
   <div class="block">
-    <button (click)="resetAgent()"
+    <button (click)="onOpenResetAgents()"
             [disabled]="isResetting || agent?.state === 'new' || agent?.state === 'offline'"
             class="agent-reset"
             data-orb-qa-id="button#reset"
diff --git a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.scss b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.scss
index c0192bb19..d90233258 100644
--- a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.scss
+++ b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.scss
@@ -21,6 +21,7 @@ nb-card {
   }
 
   nb-card-body {
+    margin: 0 !important;
     label {
       color: #969fb9;
     }
@@ -142,6 +143,7 @@ nb-form-field {
   font-family: 'Montserrat', sans-serif;
   font-weight: 500;
   text-transform: none !important;
+  margin-top: 14px;
 
   &.btn-disabled {
     background: #2b3148;
diff --git a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.ts b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.ts
index 5189d0412..6260b55a1 100644
--- a/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.ts
+++ b/ui/src/app/shared/components/orb/agent/agent-information/agent-information.component.ts
@@ -1,17 +1,19 @@
-import { Component, EventEmitter, Input, OnInit, Output, SimpleChanges } from '@angular/core';
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { NbDialogService } from '@nebular/theme';
 import { Agent, AgentStates } from 'app/common/interfaces/orb/agent.interface';
 import { Tags } from 'app/common/interfaces/orb/tag';
 import { AgentsService } from 'app/common/services/agents/agents.service';
 import { NotificationsService } from 'app/common/services/notifications/notifications.service';
 import { OrbService } from 'app/common/services/orb.service';
+import { AgentResetComponent } from 'app/pages/fleet/agents/reset/agent.reset.component';
 
 @Component({
   selector: 'ngx-agent-information',
   templateUrl: './agent-information.component.html',
   styleUrls: ['./agent-information.component.scss'],
 })
-export class AgentInformationComponent implements OnInit {
+export class AgentInformationComponent implements OnInit, OnChanges {
   @Input() agent: Agent;
 
   isResetting: boolean;
@@ -33,7 +35,8 @@ export class AgentInformationComponent implements OnInit {
     protected agentsService: AgentsService,
     protected notificationService: NotificationsService,
     private fb: FormBuilder,
-    private orb: OrbService
+    private orb: OrbService,
+    private dialogService: NbDialogService,
   ) {
     this.isResetting = false;
     this.isRequesting = false;
@@ -74,7 +77,7 @@ export class AgentInformationComponent implements OnInit {
       this.selectedTags = this.agent?.orb_tags || {};
     }
   }
-  
+
   resetAgent() {
     if (!this.isResetting) {
       this.isResetting = true;
@@ -99,8 +102,7 @@ export class AgentInformationComponent implements OnInit {
     this.editMode = value;
     if (this.editMode) {
       this.orb.pausePolling();
-    }
-    else {
+    } else {
       this.orb.startPolling();
     }
     this.updateForm();
@@ -117,7 +119,7 @@ export class AgentInformationComponent implements OnInit {
     const payload = {
       name: name,
       orb_tags: { ...this.selectedTags },
-    }
+    };
     this.agentsService.editAgent({ ...payload, id: this.agent.id }).subscribe(() => {
       this.notificationService.success('Agent successfully updated', '');
       this.orb.refreshNow();
@@ -132,12 +134,27 @@ export class AgentInformationComponent implements OnInit {
   hasChanges() {
     const name = this.formGroup.controls.name.value;
 
-    let selectedTags = JSON.stringify(this.selectedTags);
-    let orb_tags = JSON.stringify(this.agent.orb_tags);
+    const selectedTags = JSON.stringify(this.selectedTags);
+    const orb_tags = JSON.stringify(this.agent.orb_tags);
 
     if (this.agent.name !== name || selectedTags !== orb_tags) {
       return true;
     }
     return false;
   }
+  onOpenResetAgents() {
+    const agent = this.agent;
+    this.dialogService
+      .open(AgentResetComponent, {
+        context: { agent },
+        autoFocus: true,
+        closeOnEsc: true,
+      })
+      .onClose.subscribe((confirm) => {
+        if (confirm) {
+          this.resetAgent();
+          this.orb.refreshNow();
+        }
+      });
+  }
 }
diff --git a/ui/src/app/shared/components/orb/agent/agent-policies-datasets/agent-policies-datasets.component.html b/ui/src/app/shared/components/orb/agent/agent-policies-datasets/agent-policies-datasets.component.html
index 04a2a26cc..405a0ca06 100644
--- a/ui/src/app/shared/components/orb/agent/agent-policies-datasets/agent-policies-datasets.component.html
+++ b/ui/src/app/shared/components/orb/agent/agent-policies-datasets/agent-policies-datasets.component.html
@@ -6,7 +6,7 @@
       policies are running.
     </label>
     <div class="scroll">
-      <nb-accordion *ngFor="let policy of policies">
+      <nb-accordion *ngFor="let policy of policies; trackBy: identify">
         <nb-accordion-item>
           <nb-accordion-item-header>
             <span class="summary-accent">Policy:&nbsp;</span>
@@ -14,12 +14,12 @@
             nbTooltip="{{policy?.name}}">
               {{ policy?.name }}
             </button>
-            <span class="summary-accent">&nbsp;Status:&nbsp;</span>
+            <span class="summary-accent">&nbsp;&nbsp;Status:&nbsp;</span>
             <span class="policy-{{ policy?.state }} field"
             nbTooltip="{{policy?.state}}">{{ policy?.state }}</span>
-            <span class="summary-accent">&nbsp;&nbsp;Version:&nbsp;</span>
+            <span class="summary-accent">&nbsp;&nbsp;&nbsp;Version:&nbsp;</span>
             <span class="">{{ policy?.version }}</span>
-            <span class="summary-accent">&nbsp;&nbsp;Backend:&nbsp;</span>
+            <span class="summary-accent">&nbsp;&nbsp;&nbsp;Backend:&nbsp;</span>
             <span class="field" nbTooltip="{{ policy?.backend }}"> 
               {{ policy?.backend }}</span>
           </nb-accordion-item-header>
@@ -52,7 +52,7 @@
         </nb-accordion-item>
       </nb-accordion>
     </div>
-    <span *ngIf="errors?.nodatasets" class="error-accent">{{
+    <span *ngIf="errors?.nodatasets" class="summary-accent">{{
       errors.nodatasets
     }}</span>
   </nb-card-body>
diff --git a/ui/src/app/shared/components/orb/agent/agent-policies-datasets/agent-policies-datasets.component.scss b/ui/src/app/shared/components/orb/agent/agent-policies-datasets/agent-policies-datasets.component.scss
index f7e5733f8..09f569765 100644
--- a/ui/src/app/shared/components/orb/agent/agent-policies-datasets/agent-policies-datasets.component.scss
+++ b/ui/src/app/shared/components/orb/agent/agent-policies-datasets/agent-policies-datasets.component.scss
@@ -176,10 +176,6 @@ nb-list-item {
   padding: 0.5em !important;
 }
 
-.error-accent {
-  color: #df316f !important;
-  font-weight: 500;
-}
 
 .agent-policy-button {
   color: #ffffff;
@@ -192,7 +188,6 @@ nb-list-item {
   line-height: 1;
   max-width: 360px !important;
   white-space: nowrap;
-  overflow: hidden;
   text-overflow: ellipsis;
 }
 // nb-accordion-item-header {
@@ -201,9 +196,8 @@ nb-list-item {
 .scroll {
   max-height: 20em;
 }
-.field{ 
+.field {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  min-width: 5ch;
 }
diff --git a/ui/src/app/shared/components/orb/agent/agent-policies-datasets/agent-policies-datasets.component.ts b/ui/src/app/shared/components/orb/agent/agent-policies-datasets/agent-policies-datasets.component.ts
index 45f7f651c..6c7f5bb98 100644
--- a/ui/src/app/shared/components/orb/agent/agent-policies-datasets/agent-policies-datasets.component.ts
+++ b/ui/src/app/shared/components/orb/agent/agent-policies-datasets/agent-policies-datasets.component.ts
@@ -51,18 +51,22 @@ export class AgentPoliciesDatasetsComponent implements OnInit, OnChanges {
     this.amountRunningPolicies = 0;
   }
 
-  ngOnInit(): void { 
+  identify(index, item) {
+    return item.id;
+  }
+
+  ngOnInit(): void {
     this.getAmountRunningPolicies();
   }
-  
+
   getAmountRunningPolicies() {
     this.policies.forEach(element => {
-      if (element.state == 'running') {
+      if (element.state === 'running') {
         this.amountRunningPolicies++;
       }
-    }); 
+    });
   }
-  
+
   ngOnChanges(changes: SimpleChanges): void {
     if (changes.agent) {
       const policiesStates = this.agent?.last_hb_data?.policy_state;
diff --git a/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.html b/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.html
index 54f375229..cd4d2008f 100644
--- a/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.html
+++ b/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.html
@@ -1,89 +1,42 @@
-<nb-card style="max-height: 500px;">
+<nb-card *ngIf="provisioningTypeMode.default">
   <nb-card-header>
-    Provisioning Commands
-    <nb-select [(selected)]="selectedOS"
-               appearance="filled"
-               class="float-right"
-               data-orb-qa-id="selected_OS">
-      <nb-option *ngFor="let option of availableOS"
-                 [value]="option">
-        {{ option | titlecase }}
-      </nb-option>
-    </nb-select>
-    <button
-      style="color: #3089fc; float: none;"
-      ghost="true"
-      nbButton
-      (click)="toggleProvisioningCommand('hideCommand')">
-      <nb-icon [icon]="hideCommand ? 'plus-outline': 'minus-outline'"
-               pack="eva">
-      </nb-icon>
-    </button>
+    Default Provisioning Command
   </nb-card-header>
-  <nb-card-body [hidden]="hideCommand">
-    <nb-card style="  border: transparent;
-    border-radius: 0.5rem;">
-      <nb-card-header>
-        Default Provisioning Command
-        <button
-        style="color: #3089fc"
-        ghost="true"
-        nbButton
-        (click)="toggleProvisioningCommand('hideCommand2')">
-        <nb-icon [icon]="hideCommand2 ? 'plus-outline': 'minus-outline'"
-                 pack="eva">
-        </nb-icon>
-      </button>
-      </nb-card-header>
-      <nb-card-body [hidden]="hideCommand2"  style="margin: 0 !important; background-color: #1c2339 !important;">
-        <pre>
-          <button [cdkCopyToClipboard]="defaultCommandCopy" class="copy"
-            nbTooltip="Copy Provisioning Command">
-            <nb-icon (click)="toggleIcon('command')" [icon]="copyCommandIcon" pack="eva">
-            </nb-icon>
-          </button>
-          <code [innerHtml]="defaultCommandShow">
-            {{ defaultCommandShow }}
-          </code>
-        </pre>
-      </nb-card-body>    
-    </nb-card>
-    <nb-card style="  border: transparent;
-    border-radius: 0.5rem;">
-      <nb-card-header>
-        Provisioning Command with Configuration File
-        <button
-        style="color: #3089fc"
-        ghost="true"
-        nbButton
-        (click)="toggleProvisioningCommand('hideCommand3')">
-        <nb-icon [icon]="hideCommand3 ? 'plus-outline': 'minus-outline'"
-                 pack="eva">
+  <nb-card-body>
+    <pre>
+      <button [cdkCopyToClipboard]="defaultCommandCopy" 
+        nbTooltip="Copy Provisioning Command">
+        <nb-icon (click)="toggleIcon('command')" [icon]="copyCommandIcon" pack="eva">
         </nb-icon>
       </button>
-      <nb-icon icon="info-outline" style="margin-top: 10px; margin-right: 10px;" 
-      nbTooltip="This command requires that a configuration file named &quot;agent.yaml&quot; exist in your current working directory">
-      </nb-icon>
-      </nb-card-header>
-      <nb-card-body [hidden]="hideCommand3"  style="margin: 0 !important; background-color: #1c2339 !important;">
-        <pre>
-          <button [cdkCopyToClipboard]="fileConfigCommandCopy" class="copy"
-          nbTooltip="Copy Provisioning Command">
-          <nb-icon (click)="toggleIcon('command')" [icon]="copyCommandIcon" pack="eva">
-          </nb-icon>
-          </button>
-          <code [innerHtml]="fileConfigCommandShow">
-            {{ fileConfigCommandShow }}
-          </code>
-        </pre>
-      </nb-card-body>  
-    </nb-card> 
-    <p style="margin-left: 1rem;" *ngIf="!hideCommand3">
-      <a href="https://orb.community/documentation/running_orb_agent/#configuration-files"
-        target="_blank"
-        style="background-color: #ff9f05 !important;">Click here 
-      </a>
-      &nbsp; <span style="color: #ff9f05 !important;">to learn more about how create and apply configuration files.</span>
-    </p> 
-  </nb-card-body>
+      <code [innerHtml]="defaultCommandShow">
+        {{ defaultCommandShow }}
+      </code>
+    </pre>
+  </nb-card-body>    
 </nb-card>
+
+<nb-card *ngIf="provisioningTypeMode.configFile">
+  <nb-card-header>
+    Provisioning Command with Configuration File
+  <a href="https://orb.community/documentation/running_orb_agent/#configuration-files" target="_blank">
+    <nb-icon icon="info-outline" style="margin-top: 3px; margin-right: 10px;" 
+    nbTooltip="Requires a configuration file named &quot;agent.yaml&quot; exist in your current working directory. PWD should be replaced with the path of your configuration file. Click to go to documentation.">
+    </nb-icon>
+  </a>
+
+  </nb-card-header>
+  <nb-card-body>
+    <pre>
+      <button [cdkCopyToClipboard]="fileConfigCommandCopy" 
+      nbTooltip="Copy Provisioning Command">
+      <nb-icon (click)="toggleIcon('command')" [icon]="copyCommandIcon" pack="eva">
+      </nb-icon>
+      </button>
+      <code [innerHtml]="fileConfigCommandShow">
+        {{ fileConfigCommandShow }}
+      </code>
+    </pre>
+  </nb-card-body> 
+</nb-card> 
+
diff --git a/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.scss b/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.scss
index 15a2ff7c6..ef6ca5c9a 100644
--- a/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.scss
+++ b/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.scss
@@ -11,6 +11,7 @@ nb-card {
   border: transparent;
   border-radius: 0.5rem;
   padding: 0 !important;
+  height: calc(100% - 40px) !important;
 
   nb-card-header {
     background-color: #232940;
@@ -23,15 +24,16 @@ nb-card {
       margin: 0;
     }
     nb-icon {
-      float: right  ;
+      float: right;
     }
   }
 
   nb-card-body {
     border-bottom-left-radius: 0.5rem;
     border-bottom-right-radius: 0.5rem;
-    margin: 0 2rem 0 2rem;
-    padding: 0;
+    margin: 0 !important;
+    padding: 0 1rem;
+    background-color: #1c2339 !important;
 
     label {
       color: #969fb9;
@@ -49,12 +51,9 @@ nb-card {
 
     pre {
       display: flex;
-      flex-direction: row-reverse;
-      flex-wrap: wrap;
-      align-content: space-between;
-      align-items: flex-start;
-      justify-content: space-between;
+
       margin: 0;
+      height: fit-content !important;
 
       background: transparent;
       padding: 0.75rem;
@@ -65,15 +64,23 @@ nb-card {
         background: transparent;
         border: 0 transparent;
         color: #969fb9;
-        top: -0.25rem;
-        float: right;
-        right: -0.5rem;
         outline: none;
+        position: absolute;
+        top: 0;
+        right: 1.3rem;
       }
 
       code {
         color: #ffffff;
-        line-height: 2.5 !important;
+        line-height: 2.25 !important;
+        font-size: 14px !important;
+        float: left;
+        @media (max-width: 1610px) {
+          font-size: 13px !important;
+        }
+        @media (max-width: 1530px) {
+          font-size: 12px !important;
+        }
       }
     }
   }
@@ -121,15 +128,5 @@ nb-card {
 button {
   box-shadow: none !important;
   outline: none !important;
-  margin-right: 15px;
-}
-a {
-  white-space: nowrap !important;
-  padding: 0 0.3rem !important;
-  background-color: #ff9f05 !important;
-  font-weight: 700 !important;
-  text-decoration: none !important;
-  color: #ffffff !important;
-  border-radius: 10px;
-  fill: #3089fc !important;
 }
+
diff --git a/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.ts b/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.ts
index d3eead01b..f99757889 100644
--- a/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.ts
+++ b/ui/src/app/shared/components/orb/agent/agent-provisioning/agent-provisioning.component.ts
@@ -1,14 +1,16 @@
-import { Component, Input, OnInit } from "@angular/core";
-import { AvailableOS } from "app/common/services/agents/agents.service";
-import { Agent, AgentStates } from "app/common/interfaces/orb/agent.interface";
+import { Component, Input, OnInit } from '@angular/core';
+import { AvailableOS } from 'app/common/services/agents/agents.service';
+import { Agent, AgentStates } from 'app/common/interfaces/orb/agent.interface';
 
 @Component({
-  selector: "ngx-agent-provisioning",
-  templateUrl: "./agent-provisioning.component.html",
-  styleUrls: ["./agent-provisioning.component.scss"],
+  selector: 'ngx-agent-provisioning',
+  templateUrl: './agent-provisioning.component.html',
+  styleUrls: ['./agent-provisioning.component.scss'],
 })
 export class AgentProvisioningComponent implements OnInit {
+
   @Input() agent: Agent;
+  @Input() provisioningType: string;
 
   agentStates = AgentStates;
 
@@ -23,26 +25,30 @@ export class AgentProvisioningComponent implements OnInit {
   fileConfigCommandCopy: string;
   fileConfigCommandShow: string;
 
-  hideCommand: boolean;
-  hideCommand2: boolean;
-  hideCommand3: boolean;
+  provisioningTypeMode = {
+    default: false,
+    configFile: false,
+  };
 
   constructor() {
-    this.copyCommandIcon = "copy-outline";
+    this.copyCommandIcon = 'copy-outline';
   }
 
   ngOnInit(): void {
-    this.hideCommand2 = false;
-    this.hideCommand3 = true;
-    this.hideCommand = this.agent?.state !== this.agentStates.new;
+    if (this.provisioningType === 'default') {
+      this.provisioningTypeMode.default = true;
+    } else if (this.provisioningType === 'configFile') {
+      this.provisioningTypeMode.configFile = true;
+
+    }
     this.makeCommand2Copy();
   }
 
   toggleIcon(target) {
-    if (target === "command") {
-      this.copyCommandIcon = "checkmark-outline";
+    if (target === 'command') {
+      this.copyCommandIcon = 'checkmark-outline';
       setTimeout(() => {
-        this.copyCommandIcon = "copy-outline";
+        this.copyCommandIcon = 'copy-outline';
       }, 2000);
     }
   }
@@ -69,31 +75,15 @@ orbcommunity/orb-agent`;
 -e ORB_CLOUD_MQTT_ID=${ this.agent.id } \\
 -e ORB_CLOUD_MQTT_CHANNEL_ID=${ this.agent.channel_id } \\
 -e ORB_CLOUD_MQTT_KEY="AGENT_KEY" \\
--e PKTVISOR_PCAP_IFACE_DEFAULT=auto \\
--v \${PWD}/:/usr/local/orb/ \\
-orbcommunity/orb-agent run -c /usr/local/orb/agent.yaml`;
+-v \${PWD}/:/opt/orb/ \\
+orbcommunity/orb-agent run -c /opt/orb/agent.yaml`;
 
   this.fileConfigCommandShow = `docker run -d --restart=always --net=host \\
 -e ORB_CLOUD_ADDRESS=${ document.location.hostname } \\
 -e ORB_CLOUD_MQTT_ID=${ this.agent.id } \\
 -e ORB_CLOUD_MQTT_CHANNEL_ID=${ this.agent.channel_id } \\
 -e ORB_CLOUD_MQTT_KEY=<mark>AGENT_KEY</mark> \\
--e PKTVISOR_PCAP_IFACE_DEFAULT=<mark>auto</mark> \\
--v \${PWD}/:/usr/local/orb/ \\
-orbcommunity/orb-agent run -c /usr/local/orb/agent.yaml`;
-  }
-
-toggleProvisioningCommand(command: string) {
-  switch (command) {
-    case 'hideCommand':
-      this.hideCommand = !this.hideCommand;
-      break;
-    case 'hideCommand2':
-      this.hideCommand2 = !this.hideCommand2;
-      break;
-    case 'hideCommand3':
-      this.hideCommand3 = !this.hideCommand3;
-      break;
+-v \${PWD}/:/opt/orb/ \\
+orbcommunity/orb-agent run -c /opt/orb/agent.yaml`;
   }
 }
-}
diff --git a/ui/src/app/shared/components/orb/policy/policy-datasets/policy-datasets.component.html b/ui/src/app/shared/components/orb/policy/policy-datasets/policy-datasets.component.html
index d475094ee..a74dccede 100644
--- a/ui/src/app/shared/components/orb/policy/policy-datasets/policy-datasets.component.html
+++ b/ui/src/app/shared/components/orb/policy/policy-datasets/policy-datasets.component.html
@@ -9,23 +9,21 @@
         </button>
     </nb-card-header>
     <nb-card-body>
-        <div class="col-12">
-            <div #tableWrapper class="tableWrapper">
-                <ngx-datatable
-                    #table
-                    [columnMode]="columnMode.force"
-                    [columns]="columns"
-                    [footerHeight]="0"
-                    [headerHeight]="50"
-                    [loadingIndicator]="isLoading"
-                    [rowHeight]="50"
-                    [rows]="datasets"
-                    [scrollbarV]="true"
-                    [sorts]="tableSorts"
-                    class="orb orb-table-small">
-                </ngx-datatable>
-            </div>
-
+        <div class="dataset-table-wrapper">
+            <ngx-datatable
+                #table
+                [columnMode]="'flex'"
+                [columns]="columns"
+                [footerHeight]="0"
+                [headerHeight]="50"
+                [loadingIndicator]="isLoading"
+                [rowHeight]="50"
+                [rows]="datasets"
+                [scrollbarV]="true"
+                [sorts]="tableSorts"
+                class="orb dataset-table"
+                [style.height]="getTableHeight()">
+            </ngx-datatable>
         </div>
     </nb-card-body>
 </nb-card>
@@ -64,7 +62,7 @@
 </ng-template>
 
 <ng-template #actionsTemplateCell let-i="index" let-row="row" let-value="value">
-  <div class="block">
+  <div class="button-template">
     <button
       (click)="onOpenEdit(row)"
       class="orb-action-hover edit-button"
diff --git a/ui/src/app/shared/components/orb/policy/policy-datasets/policy-datasets.component.scss b/ui/src/app/shared/components/orb/policy/policy-datasets/policy-datasets.component.scss
index 156370516..e827adef7 100644
--- a/ui/src/app/shared/components/orb/policy/policy-datasets/policy-datasets.component.scss
+++ b/ui/src/app/shared/components/orb/policy/policy-datasets/policy-datasets.component.scss
@@ -27,7 +27,14 @@ nb-card {
     }
   }
 }
+.dataset-table {
+  // min-width: 600px;
+  height: 200px;
+  max-height: 300px;
+  min-height: 100px;
 
+
+}
 .summary-accent {
   color: #969fb9 !important;
 }
@@ -84,7 +91,7 @@ nb-card {
   }
 }
 
-mat-nav-list{
+mat-nav-list {
   display: flex !important;
   flex-direction: row;
   flex-wrap: nowrap !important;
@@ -122,4 +129,7 @@ mat-nav-list{
   to {
     transform: translateX(-80%);
   }
-}
\ No newline at end of file
+}
+.dataset-table-wrapper {
+  margin: 1rem 1rem 0 1rem;
+}
diff --git a/ui/src/app/shared/components/orb/policy/policy-datasets/policy-datasets.component.ts b/ui/src/app/shared/components/orb/policy/policy-datasets/policy-datasets.component.ts
index 581214a66..a0e502011 100644
--- a/ui/src/app/shared/components/orb/policy/policy-datasets/policy-datasets.component.ts
+++ b/ui/src/app/shared/components/orb/policy/policy-datasets/policy-datasets.component.ts
@@ -38,7 +38,7 @@ import { OrbService } from 'app/common/services/orb.service';
   styleUrls: ['./policy-datasets.component.scss'],
 })
 export class PolicyDatasetsComponent
-  implements OnInit, OnDestroy, AfterViewInit, AfterViewChecked, OnChanges {
+  implements OnInit, OnDestroy, AfterViewInit, OnChanges {
   @Input()
   datasets: Dataset[];
 
@@ -71,8 +71,6 @@ export class PolicyDatasetsComponent
 
   @ViewChild('sinksTemplateCell') sinksTemplateCell: TemplateRef<any>;
 
-  @ViewChild('tableWrapper') tableWrapper;
-
   @ViewChild(DatatableComponent) table: DatatableComponent;
 
   private currentComponentWidth;
@@ -99,34 +97,37 @@ export class PolicyDatasetsComponent
       {
         prop: 'agent_group',
         name: 'Agent Group',
-        resizeable: true,
+        resizeable: false,
         canAutoResize: true,
-        width: 250,
+        flexGrow: 2,
         cellTemplate: this.groupTemplateCell,
       },
       {
         prop: 'valid',
         name: 'Valid',
-        resizeable: true,
+        resizeable: false,
         canAutoResize: true,
-        minWidth: 80,        
-        width: 80,
+        flexGrow: 0.5,
+        minWidth: 70,
         cellTemplate: this.validTemplateCell,
       },
       {
         prop: 'sinks',
         name: 'Sinks',
-        resizeable: true,
+        resizeable: false,
         canAutoResize: true,
-        width: 450,
+        flexGrow: 3,
         cellTemplate: this.sinksTemplateCell,
       },
       {
         name: '',
         prop: 'actions',
-        resizeable: true,
+        resizeable: false,
         sortable: false,
-        width: 200,
+        canAutoResize: true,
+        flexGrow: 1,
+        maxWidth: 130,
+        minWidth: 130,
         cellTemplate: this.actionsTemplateCell,
       },
     ];
@@ -134,19 +135,11 @@ export class PolicyDatasetsComponent
     this.cdr.detectChanges();
   }
 
-  ngAfterViewChecked() {
-    if (
-      this.table &&
-      this.table.recalculate &&
-      this.tableWrapper.nativeElement.clientWidth !== this.currentComponentWidth
-    ) {
-      this.currentComponentWidth = this.tableWrapper.nativeElement.clientWidth;
-      this.table.recalculate();
-      this.cdr.detectChanges();
-      window.dispatchEvent(new Event('resize'));
-    }
+  getTableHeight() {
+    const rowHeight = 50;
+    const headerHeight = 50;
+    return (this.datasets.length * rowHeight + 15) + headerHeight + 'px';
   }
-
   onCreateDataset() {
     this.dialogService
       .open(DatasetFromComponent, {
@@ -173,6 +166,7 @@ export class PolicyDatasetsComponent
         closeOnEsc: false,
         context: {
           dataset,
+          policy: this.policy,
         },
         hasScroll: false,
         closeOnBackdropClick: true,
@@ -246,5 +240,5 @@ export class PolicyDatasetsComponent
       closeOnEsc: true,
     });
   }
-  
+
 }
diff --git a/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.html b/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.html
index 228c1b505..42bd0b9f7 100644
--- a/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.html
+++ b/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.html
@@ -66,7 +66,8 @@
           fieldSize="medium"
           formControlName="name"
           fullWidth="true"
-          nbInput/>
+          nbInput
+          [status]="formGroup?.controls.name.dirty  ? (!formGroup.controls.name.valid  ? 'danger' : 'success') : 'basic'"/>
         <div
           *ngIf="formGroup.controls?.name.invalid
           && (formGroup.controls?.name.dirty || formGroup.controls?.name.touched)"
diff --git a/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.scss b/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.scss
index 970f42bad..0c14986b2 100644
--- a/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.scss
+++ b/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.scss
@@ -13,6 +13,8 @@ nb-card {
 
   nb-card-body {
     padding-bottom: 0 !important;
+    margin: 0 !important;
+
     label {
       color: #969fb9;
     }
@@ -30,8 +32,8 @@ nb-card {
   }
 }
 .italic {
-  font-style: italic; 
-  font-size: 0.9rem; 
+  font-style: italic;
+  font-size: 0.9rem;
   color: #d9deee;
 }
 .summary-accent {
diff --git a/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.ts b/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.ts
index bd96f3558..013d917aa 100644
--- a/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.ts
+++ b/ui/src/app/shared/components/orb/policy/policy-details/policy-details.component.ts
@@ -86,8 +86,7 @@ export class PolicyDetailsComponent implements OnInit, OnChanges {
     this.editMode = value;
     if (this.editMode || this.interfaceEditMode) {
       this.orb.pausePolling();
-    }
-    else {
+    } else {
       this.orb.startPolling();
     }
     this.updateForm();
diff --git a/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.html b/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.html
index cfdbd4b9a..0481ad1cb 100644
--- a/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.html
+++ b/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.html
@@ -1,8 +1,8 @@
 <nb-card>
-  <nb-card-header>Assigned Groups</nb-card-header>
+  <nb-card-header>Assigned Groups ({{ groups?.length }})</nb-card-header>
   <nb-card-body>
     <div *ngIf="!isLoading">
-      <nb-accordion *ngFor="let group of groups;">
+      <nb-accordion *ngFor="let group of groups; trackBy: identify">
         <nb-accordion-item>
           <nb-accordion-item-header> 
             <span class="summary-accent">Group:</span>&nbsp;{{ group?.name }} 
diff --git a/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.scss b/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.scss
index 752cd7091..05e9ede69 100644
--- a/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.scss
+++ b/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.scss
@@ -24,6 +24,7 @@ nb-card {
   }
 
   nb-card-body {
+    margin: 0 !important;
     label {
       color: #969fb9;
     }
@@ -139,6 +140,8 @@ nb-card {
   font-size: 13px;
   font-weight: 600;
   line-height: 1.5rem;
+  margin: 0 !important;
+  padding: 0 !important;
 }
 
 .agent-group-accent {
@@ -177,7 +180,7 @@ nb-card {
       border: none !important;
       border-radius: 8px !important;
       display: grid;
-      padding: 0 10px 0 10px;
+      padding: 0 10px;
       background-color: #1c2339;
 
       .item-body {
diff --git a/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.ts b/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.ts
index 5dae8b988..7b72c7395 100644
--- a/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.ts
+++ b/ui/src/app/shared/components/orb/policy/policy-groups/policy-groups.component.ts
@@ -56,4 +56,7 @@ export class PolicyGroupsComponent implements OnInit, OnChanges {
   unique(value, index, self) {
     return self.indexOf(value) === index;
   }
+  identify(index, item) {
+    return item.id;
+  }
 }
diff --git a/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.html b/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.html
index f66dd5180..bc651fb82 100644
--- a/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.html
+++ b/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.html
@@ -17,18 +17,28 @@
       style="color: #df316f !important;">
       Discard
     </button>
+    <button 
+      class="upload-button" 
+      (click)="fileInput.click()"
+      *ngIf="editMode">
+      <nb-icon icon="upload-outline" pack="eva">
+      </nb-icon>
+        Upload file
+    </button>
+    <input type="file" (change)="onFileSelected($event)" #fileInput style="display: none" class="upload-input">
+
   </nb-card-header>
   <nb-card-body>
     <!--    <div *ngIf="editMode; then updateView else readView"></div>-->
-    <div class="code-editor-wrapper">
-      <ngx-monaco-editor
-          #editorComponent
-          [(ngModel)]="code"
-          [options]="editorOptions"
-          class="code-editor"
-          ngDefaultControl>
-      </ngx-monaco-editor>
-    </div>
+    <ngx-monaco-editor
+      [style.height.px]="getCodeLineCount() * 21.6"
+      #editorComponent
+      [(ngModel)]="code"
+      [options]="editorOptions"
+      class="code-editor"
+      ngDefaultControl>
+    </ngx-monaco-editor>
+    <span *ngIf="errorConfigMessage !== ''" class="errorMessage">{{ errorConfigMessage }} </span>
   </nb-card-body>
 </nb-card>
 
diff --git a/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.scss b/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.scss
index e21374c8b..aa80deaae 100644
--- a/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.scss
+++ b/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.scss
@@ -12,6 +12,7 @@ nb-card {
 
   nb-card-body {
     padding: 0.25rem !important;
+    margin: 0 !important;
 
     label {
       color: #969fb9;
@@ -62,15 +63,34 @@ nb-card {
 }
 
 .code-editor {
-  height: calc(100%);
   width: calc(100%);
   padding: calc(1rem);
+  min-height: 367px;
+  max-height: 55vh;
+}
+.upload-button {
+  color: #3089fc;
+  background-color: transparent;
+  border: none;
+  font-weight: 600;
+  outline: none;
+  float: right;
+  border-radius: 15px;
+  padding: 6px 12px;
+  margin-right: 5px;
+  font-size: 0.875rem;
+  font-family: 'Montserrat';
+  transition: background-color 0.3s ease;
+}
+.upload-button:hover {
+  background-color: #171c30 !important;
 }
 
-.code-editor-wrapper {
-  min-height: 350px;
-  min-width: 200px;
-  height: 367px;
-  width: calc(100%);
-  display: block;
+.errorMessage {
+  position: absolute;
+  color: #df316f;
+  font-weight: 600;
+  font-size: 13px;
+  left: 20px;
+  bottom: 3px;
 }
diff --git a/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.ts b/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.ts
index 2599fbded..01a5c0f79 100644
--- a/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.ts
+++ b/ui/src/app/shared/components/orb/policy/policy-interface/policy-interface.component.ts
@@ -13,6 +13,8 @@ import { AgentPolicy } from 'app/common/interfaces/orb/agent.policy.interface';
 import { FormBuilder, FormControl, Validators } from '@angular/forms';
 import IStandaloneEditorConstructionOptions = monaco.editor.IStandaloneEditorConstructionOptions;
 import { OrbService } from 'app/common/services/orb.service';
+import { EditorComponent } from 'ngx-monaco-editor';
+
 
 @Component({
   selector: 'ngx-policy-interface',
@@ -32,8 +34,11 @@ export class PolicyInterfaceComponent implements OnInit, AfterViewInit, OnChange
   @Input()
   detailsEditMode: boolean;
 
-  @ViewChild('editorComponent')
-  editor;
+  @Input()
+  errorConfigMessage: string;
+
+  @ViewChild(EditorComponent, { static: true })
+  editorComponent: EditorComponent;
 
   editorOptions: IStandaloneEditorConstructionOptions = {
     theme: 'vs-dark',
@@ -42,10 +47,11 @@ export class PolicyInterfaceComponent implements OnInit, AfterViewInit, OnChange
     detectIndentation: true,
     tabSize: 2,
     autoIndent: 'full',
+    formatOnPaste: true,
     trimAutoWhitespace: true,
     formatOnType: true,
     matchBrackets: 'always',
-    language: 'yaml',
+    language: 'json',
     automaticLayout: true,
     glyphMargin: false,
     folding: true,
@@ -60,6 +66,8 @@ export class PolicyInterfaceComponent implements OnInit, AfterViewInit, OnChange
 
   formControl: FormControl;
 
+
+
   constructor(
     private fb: FormBuilder,
     private orb: OrbService,
@@ -70,10 +78,25 @@ export class PolicyInterfaceComponent implements OnInit, AfterViewInit, OnChange
     this.editModeChange = new EventEmitter<boolean>();
     this.updateForm();
     this.detailsEditMode = false;
+    this.errorConfigMessage = '';
+  }
+
+  getCodeLineCount() {
+    const editorInstance = this.editorComponent['_editor'];
+    if (editorInstance) {
+      const model = editorInstance.getModel();
+      editorInstance.layout();
+      return model ? model.getLineCount() : 0;
+
+    }
+    return 0;
   }
 
   ngOnInit(): void {
     this.code = this.policy.policy_data || JSON.stringify(this.policy.policy, null, 2);
+    if (this.policy.format === 'yaml') {
+      this.editorOptions = { ...this.editorOptions, language: 'yaml' };
+    }
   }
 
   ngAfterViewInit() {
@@ -100,12 +123,23 @@ export class PolicyInterfaceComponent implements OnInit, AfterViewInit, OnChange
     this.editMode = edit;
     if (this.editMode || this.detailsEditMode) {
       this.orb.pausePolling();
-    }
-    else {
+    } else {
       this.orb.startPolling();
     }
     this.editorOptions = { ...this.editorOptions, readOnly: !edit };
     this.updateForm();
     !!notify && this.editModeChange.emit(this.editMode);
   }
+
+  onFileSelected(event: any) {
+    const file: File = event.target.files[0];
+    const reader: FileReader = new FileReader();
+
+    reader.onload = (e: any) => {
+      const fileContent = e.target.result;
+      this.code = fileContent;
+    };
+
+    reader.readAsText(file);
+  }
 }
diff --git a/ui/src/app/shared/components/orb/sink-control/sink-control.component.scss b/ui/src/app/shared/components/orb/sink-control/sink-control.component.scss
index 37944713e..d86b6561e 100644
--- a/ui/src/app/shared/components/orb/sink-control/sink-control.component.scss
+++ b/ui/src/app/shared/components/orb/sink-control/sink-control.component.scss
@@ -1,3 +1,3 @@
 .sink-selector {
-  width: 560px;
+  width: 100%;
 }
diff --git a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.html b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.html
index 05d4d1e02..03ff915f2 100644
--- a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.html
+++ b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.html
@@ -27,22 +27,24 @@
       </div>
     </nb-card-header>
     <nb-card-body>
-      <!--    <div *ngIf="editMode; then updateView else readView"></div>-->
       <div class="code-editor-wrapper">
-        <ngx-monaco-editor
+        <!-- <ngx-monaco-editor
             #editorComponent
             [(ngModel)]="code"
             [options]="editorOptions"
-            class="code-editor"
+            class="code-editor editor-height-{{createMode}}"
             ngDefaultControl
             *ngIf="!isYaml">
-        </ngx-monaco-editor>
+        </ngx-monaco-editor> -->
         <ngx-monaco-editor
+          (click)="onEditorClick($event)"
           [(ngModel)]="code"
           [options]="editorOptionsYaml"
-          class="code-editor"
+          class="code-editor editor-height-{{createMode}}"
           ngDefaultControl>
         </ngx-monaco-editor>
+        <span *ngIf="errorConfigMessage !== ''" class="errorMessage">{{ errorConfigMessage }} </span>
+        <span *ngIf="selectBackendWarning" class="warning-message">Select a Sink Backend first.</span>
       </div>
     </nb-card-body>
   </nb-card>
diff --git a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.scss b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.scss
index cdd48cfd7..301141d47 100644
--- a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.scss
+++ b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.scss
@@ -1,5 +1,11 @@
-ngx-monaco-editor {
-    height: 25rem;
+
+.editor-height- {
+  &true {
+    height: 25.5rem;
+  }
+  &false {
+    height: 22.5rem;
+  }
 }
 .summary-accent {
     color: #969fb9 !important;
@@ -41,6 +47,7 @@ nb-card {
     }
   
     nb-card-body {
+      margin: 0 !important;
       label {
         color: #969fb9;
       }
@@ -50,3 +57,19 @@ nb-card {
       }
     }
   }
+  .errorMessage {
+    position: absolute;
+    color: #df316f;
+    font-weight: 600;
+    font-size: 13px;
+    left: 26px;
+    bottom: 2px;
+  }
+.warning-message {
+  position: absolute;
+  color: #ff9f05;
+  font-weight: 500;
+  font-size: 13px;
+  left: 26px;
+  bottom: 2px;
+}
\ No newline at end of file
diff --git a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.spec.ts b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.spec.ts
index 9ffa7cd11..9da64fdd6 100644
--- a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.spec.ts
+++ b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.spec.ts
@@ -8,7 +8,7 @@ describe('SinkConfigComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ SinkConfigComponent ]
+      declarations: [ SinkConfigComponent ],
     })
     .compileComponents();
   }));
diff --git a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.ts b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.ts
index ce30aa4b3..ef135dd5a 100644
--- a/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.ts
+++ b/ui/src/app/shared/components/orb/sink/sink-config/sink-config.component.ts
@@ -4,11 +4,12 @@ import { Sink, SinkBackends } from 'app/common/interfaces/orb/sink.interface';
 import * as YAML from 'yaml';
 import IStandaloneEditorConstructionOptions = monaco.editor.IStandaloneEditorConstructionOptions;
 import { OrbService } from 'app/common/services/orb.service';
+import { SINK_OTLP_CONFIG_YAML, SINK_PROMETHEUS_CONFIG_YAML } from 'app/shared/configurations/configurations_schemas';
 
 @Component({
   selector: 'ngx-sink-config',
   templateUrl: './sink-config.component.html',
-  styleUrls: ['./sink-config.component.scss']
+  styleUrls: ['./sink-config.component.scss'],
 })
 export class SinkConfigComponent implements OnInit, OnChanges {
 
@@ -16,44 +17,30 @@ export class SinkConfigComponent implements OnInit, OnChanges {
   sink: Sink;
 
   @Input()
-  editMode: boolean;
+  editMode: boolean = false;
 
   @Input()
-  createMode: boolean;
+  createMode: boolean = false;
 
   @Input()
   sinkBackend: string;
-  
+
   @Output()
   editModeChange: EventEmitter<boolean>;
 
   @Input()
   detailsEditMode: boolean;
 
+  @Input()
+  errorConfigMessage: string;
+
   @ViewChild('editorComponent')
   editor;
 
-  editorOptions: IStandaloneEditorConstructionOptions = {
-    theme: 'vs-dark',
-    dragAndDrop: true,
-    wordWrap: 'on',
-    detectIndentation: true,
-    tabSize: 2,
-    autoIndent: 'full',
-    formatOnPaste: true,
-    trimAutoWhitespace: true,
-    formatOnType: true,
-    matchBrackets: 'always',
-    language: 'json',
-    automaticLayout: true,
-    glyphMargin: false,
-    folding: true,
-    readOnly: true,
-    scrollBeyondLastLine: false,
-    // Undocumented see https://github.com/Microsoft/vscode/issues/30795#issuecomment-410998882
-    lineDecorationsWidth: 0,
-    lineNumbersMinChars: 0,
-  };
+  selectBackendWarning = false;
+  warningMessageTop = 0;
+  warningMessageLeft = 0;
+
   editorOptionsYaml = {
     theme: 'vs-dark',
     language: 'yaml',
@@ -66,10 +53,6 @@ export class SinkConfigComponent implements OnInit, OnChanges {
   };
   code = '';
 
-  sinkConfigSchemaPrometheus: any;
-
-  sinkConfigSchemaOtlp: any;
-
   formControl: FormControl;
 
   isYaml: boolean;
@@ -77,53 +60,23 @@ export class SinkConfigComponent implements OnInit, OnChanges {
   constructor(
     private fb: FormBuilder,
     private orb: OrbService,
-    ) { 
-    this.isYaml = true; 
+    ) {
+    this.isYaml = true;
     this.sink = {};
     this.editMode = false;
     this.editModeChange = new EventEmitter<boolean>();
     this.detailsEditMode = false;
     this.updateForm();
-    this.sinkConfigSchemaPrometheus = {
-      "authentication" : {
-        "type": "basicauth", 
-        "password": "",
-        "username": "",
-      },
-      "exporter" : {
-        "remote_host": "",
-      },
-      "opentelemetry": "enabled",
-    }
-    this.sinkConfigSchemaOtlp = {
-      "authentication" : {
-        "type": "basicauth", 
-        "password": "",
-        "username": "",
-      },
-      "exporter" : {
-        "endpoint": "",
-      },
-      "opentelemetry": "enabled",
-    }
+    this.errorConfigMessage = '';
   }
 
   ngOnInit(): void {
     if (this.createMode) {
-      this.toggleEdit(true);
-      this.code = YAML.stringify(this.sinkConfigSchemaOtlp);
-    }
-    else {
-      // if (this.sink.config_data && this.sink.format === 'yaml') {
-      // this.isYaml = true;
+      this.updateForm();
+      this.code = SINK_OTLP_CONFIG_YAML;
+    } else {
       const parsedCode = YAML.parse(JSON.stringify(this.sink.config));
       this.code = YAML.stringify(parsedCode);
-      // }
-      // else if (this.isJson(JSON.stringify(this.sink.config))) {
-      //   this.isYaml = false;
-      //   this.code = JSON.stringify(this.sink.config, null, 2);
-      // }
-
     }
   }
   isJson(str: string) {
@@ -140,14 +93,10 @@ ngOnChanges(changes: SimpleChanges) {
     this.toggleEdit(editMode.currentValue, false);
   }
   if (sinkBackend) {
-    const sinkConfigSchema = this.sinkBackend === SinkBackends.prometheus
-      ? this.sinkConfigSchemaPrometheus
-      : this.sinkConfigSchemaOtlp;
-      
-    this.code = this.isYaml
-      ? YAML.stringify(sinkConfigSchema, null)
-      : JSON.stringify(sinkConfigSchema, null, 2);
-    this.code = YAML.stringify(sinkConfigSchema, null);
+    this.code = this.sinkBackend === SinkBackends.prometheus ? SINK_PROMETHEUS_CONFIG_YAML : SINK_OTLP_CONFIG_YAML;
+    if (sinkBackend.currentValue) {
+      this.editorOptionsYaml = { ...this.editorOptionsYaml, readOnly: false };
+    }
   }
 }
 
@@ -173,11 +122,9 @@ updateForm() {
     this.editMode = edit;
     if ((this.editMode || this.detailsEditMode) && !this.createMode) {
       this.orb.pausePolling();
-    }
-    else {
+    } else {
       this.orb.startPolling();
     }
-    this.editorOptions = { ...this.editorOptions, readOnly: !edit };
     this.editorOptionsYaml = { ...this.editorOptionsYaml, readOnly: !edit };
     this.updateForm();
     !!notify && this.editModeChange.emit(this.editMode);
@@ -187,11 +134,19 @@ updateForm() {
     if (this.isYaml) {
       const parsedCode = YAML.parse(this.code);
       this.code = YAML.stringify(parsedCode);
-    }
-    else {
+    } else {
       const parsedConfig = YAML.parse(this.code);
       this.code = JSON.stringify(parsedConfig, null, 2);
     }
   }
-  
+  onEditorClick(event: any) {
+    if (this.createMode && this.sinkBackend === undefined && !this.selectBackendWarning) {
+      this.selectBackendWarning = true;
+      setTimeout(() => {
+        this.selectBackendWarning = false;
+      }, 2000);
+    }
+    this.warningMessageTop = event.target.clientY;
+    this.warningMessageLeft = event.target.clientX;
+  }
 }
diff --git a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.html b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.html
index 4057269f2..f3b62694f 100644
--- a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.html
+++ b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.html
@@ -30,9 +30,10 @@
             <label class="summary-accent">Name</label>
             <p>{{ sink?.name }}</p>
           </div>
-          <div class="flex-row" *ngIf="sink?.description">
+          <div class="flex-row" >
             <label class="summary-accent">Description</label>
-            <p>{{ sink?.description }}</p>
+            <p *ngIf="sink?.description">{{ sink?.description }}</p>
+            <p *ngIf="!sink?.description" class="italic">No description provided</p>
           </div>
           <div class="flex-row">
             <label class="summary-accent">Backend</label>
@@ -40,8 +41,9 @@
           </div> 
           <div class="flex-row">
             <label class="summary-accent">Status</label>
-            <p *ngIf="sink?.state !== sinkStates.error" class="orb-service-{{sink?.state}}"> {{ sink?.state | titlecase }} </p>
-            <p *ngIf="sink?.state === sinkStates.error" class="orb-service-{{sink?.state}}"> {{ sink?.state | titlecase }} {{ sink?.error | titlecase }} </p>
+            <p *ngIf="sink?.state !== sinkStates.error && sink?.state !== sinkStates.warning" class="orb-service-{{sink?.state}}"> {{ sink?.state | titlecase }} </p>
+            <p *ngIf="sink?.state === sinkStates.error" class="orb-service-{{sink?.state}}"> {{ sink?.state | titlecase }} {{ sink?.error }} </p>
+            <p *ngIf="sink?.state === sinkStates.warning" class="orb-service-{{sink?.state}}"> {{ sink?.state | titlecase }} {{ sink?.error }} </p>
           </div>
           <div class="flex-row">
             <label class="summary-accent">Tags</label>
@@ -78,6 +80,9 @@
                   <div *ngIf="formGroup.controls?.name.errors?.pattern">
                     Name must start with a letter or "_" and contain only letters, numbers, "-" or "_"
                   </div>
+                  <div *ngIf="formGroup.controls?.name.errors?.maxlength">
+                    Name must not exceed 64 characters.
+                  </div>
                 </div>
               </div>
             </nb-form-field>
@@ -112,9 +117,7 @@
                   data-orb-qa-id="name"
                   fieldSize="medium"
                   formControlName="name"
-                  fullWidth="true"
-                  required
-                  pattern="^[a-zA-Z_][a-zA-Z0-9_-]*$"          
+                  fullWidth="true"       
                   nbInput
                   [status]="formGroup?.controls.name.dirty  ? (!formGroup.controls.name.valid  ? 'danger' : 'success') : 'basic'"
                   placeholder="Sink Name"/>
@@ -128,6 +131,9 @@
                   <div *ngIf="formGroup.controls?.name.errors?.pattern">
                     Sink name must start with a letter or "_" and contain only letters, numbers, "-" or "_"
                   </div>
+                  <div *ngIf="formGroup.controls?.name.errors?.maxlength">
+                    Name must not exceed 64 characters.
+                  </div>
                 </div>
               </div>
             </nb-form-field>
diff --git a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.scss b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.scss
index 4cc2a27c4..5cc899200 100644
--- a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.scss
+++ b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.scss
@@ -24,7 +24,16 @@ input {
     color: #df316f;
   }
   &idle {
-    color: #f2994a; 
+    color: #f2994a;
+  }
+  &provisioning {
+    color: #3089fc;
+  }
+  &provioning_error {
+    color: #df316f;
+  }
+  &warning {
+    color: #f2c94c;
   }
 }
 .ns1red {
@@ -44,6 +53,7 @@ nb-card {
     padding: 0.5rem 1rem;
   }
   nb-card-body {
+    margin: 0 !important;
     label {
       color: #969fb9;
     }
@@ -52,4 +62,9 @@ nb-card {
       text-align: end;
     }
   }
-}
\ No newline at end of file
+}
+.italic {
+  font-style: italic;
+  font-size: 0.9rem;
+  color: #d9deee;
+}
diff --git a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.spec.ts b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.spec.ts
index a9ede211d..1de3f89a7 100644
--- a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.spec.ts
+++ b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.spec.ts
@@ -8,7 +8,7 @@ describe('SinkDetailsComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ SinkDetailsComponent ]
+      declarations: [ SinkDetailsComponent ],
     })
     .compileComponents();
   }));
diff --git a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.ts b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.ts
index f778e651c..9399d0ca6 100644
--- a/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.ts
+++ b/ui/src/app/shared/components/orb/sink/sink-details/sink-details.component.ts
@@ -10,7 +10,7 @@ import { SinksService } from 'app/common/services/sinks/sinks.service';
 @Component({
   selector: 'ngx-sink-details',
   templateUrl: './sink-details.component.html',
-  styleUrls: ['./sink-details.component.scss']
+  styleUrls: ['./sink-details.component.scss'],
 })
 
 export class SinkDetailsComponent implements OnInit, OnChanges {
@@ -33,21 +33,22 @@ export class SinkDetailsComponent implements OnInit, OnChanges {
   @Input()
   configEditMode: boolean;
 
+  @Input()
+  sinkTypesList = [];
+
   formGroup: FormGroup;
 
   selectedTags: Tags;
 
   mode: string;
 
-  sinkTypesList = [];
-
   sinkStates = SinkStates;
 
   constructor(
     private fb: FormBuilder,
     private sinksService: SinksService,
     private orb: OrbService,
-    ) { 
+    ) {
     this.sink = {};
     this.createMode = false;
     this.editMode = false;
@@ -56,13 +57,10 @@ export class SinkDetailsComponent implements OnInit, OnChanges {
     this.editModeChange = new EventEmitter<boolean>();
     this.configEditMode = false;
     this.updateForm();
-    Promise.all([this.getSinkBackends()]).then((responses) => {
-      const backends = responses[0];
-      this.sinkTypesList = backends.map(entry => entry.backend);
-    })
   }
 
   ngOnInit(): void {
+    this.updateForm();
     this.getMode();
     this.selectedTags = this.sink?.tags || {};
   }
@@ -92,20 +90,24 @@ export class SinkDetailsComponent implements OnInit, OnChanges {
         description: [description],
       });
       this.selectedTags = {...tags} || {};
-    }
-    else if (this.createMode) {
 
+    } else if (this.createMode) {
       const { name, description, backend, tags } = this.sink;
-      
       this.formGroup = this.fb.group({
-        name: [name, [Validators.required, Validators.pattern('^[a-zA-Z_][a-zA-Z0-9_-]*$'), Validators.maxLength(64)]],
+        name: [
+          name,
+          [
+            Validators.required,
+            Validators.pattern('^[a-zA-Z_][a-zA-Z0-9_-]*$'),
+            Validators.maxLength(64),
+          ],
+        ],
         description: [description, [Validators.maxLength(64)]],
         backend: [backend, Validators.required],
       });
-
       this.selectedTags = { ...tags };
-    } 
-    else {
+
+    } else {
       this.formGroup = this.fb.group({
         name: null,
         description: null,
@@ -118,8 +120,7 @@ export class SinkDetailsComponent implements OnInit, OnChanges {
     this.editMode = value;
     if (this.editMode || this.configEditMode) {
       this.orb.pausePolling();
-    }
-    else {
+    } else {
       this.orb.startPolling();
     }
     this.updateForm();
@@ -127,24 +128,14 @@ export class SinkDetailsComponent implements OnInit, OnChanges {
   }
 
   getMode() {
-    if(this.editMode == true) {
+    if (this.editMode === true) {
       this.mode = 'edit';
-    }
-    else if (this.createMode == true) {
+    } else if (this.createMode === true) {
       this.mode = 'create';
-    }
-    else {
+    } else {
       this.mode = 'read';
     }
   }
-  
-  getSinkBackends() {
-    return new Promise<SinkFeature[]>(resolve => {
-      this.sinksService.getSinkBackends().subscribe(backends => {
-        resolve(backends);
-      });
-    });
-  }
 
   onChangeConfigBackend(backend: any) {
     this.sinkBackend.emit(backend);
diff --git a/ui/src/app/shared/components/orb/tag-control/tag-control.component.html b/ui/src/app/shared/components/orb/tag-control/tag-control.component.html
index a399cfd4b..fd43e6f3d 100644
--- a/ui/src/app/shared/components/orb/tag-control/tag-control.component.html
+++ b/ui/src/app/shared/components/orb/tag-control/tag-control.component.html
@@ -29,7 +29,7 @@
     <div class="container d-flex row px-0 mx-0">
       <div class="d-flex flex-column col-5 px-0 mx-0">
         <div>
-          <label class="input-label">{{strings.key}}<span *ngIf="required" class="ns1red">*</span></label>
+          <label class="input-label">{{strings.key}}</label>
         </div>
         <div>
           <input #keyInput="ngModel"
@@ -52,7 +52,7 @@
       </div>
       <div class="d-flex flex-column col-5 px-0 mx-0">
         <div>
-          <label class="input-label">{{strings.value}}<span *ngIf="required" class="ns1red">*</span></label>
+          <label class="input-label">{{strings.value}}</label>
           
         </div>
         <div>
diff --git a/ui/src/app/shared/components/orb/tag-control/tag-control.component.scss b/ui/src/app/shared/components/orb/tag-control/tag-control.component.scss
index c55079c9b..19175b341 100644
--- a/ui/src/app/shared/components/orb/tag-control/tag-control.component.scss
+++ b/ui/src/app/shared/components/orb/tag-control/tag-control.component.scss
@@ -19,7 +19,7 @@ mat-chip nb-icon {
   border: none !important;
   background: #1e2941 !important;
 }
-.add-button:disabled{
+.add-button:disabled {
   background-color: transparent !important;
 }
 .two-dot {
diff --git a/ui/src/app/shared/components/tableContexMenu/table-context-menu-component.html b/ui/src/app/shared/components/tableContexMenu/table-context-menu-component.html
new file mode 100644
index 000000000..50d722f62
--- /dev/null
+++ b/ui/src/app/shared/components/tableContexMenu/table-context-menu-component.html
@@ -0,0 +1,6 @@
+<div class="floating-div" [style.left.px]="left" [style.top.px]="top">
+    <button *ngFor="let item of items" class="button-action {{item.action}}" (click)="handleClick(item)">
+        <nb-icon icon="{{item.icon}}">
+        </nb-icon>
+    </button>
+</div>
diff --git a/ui/src/app/shared/components/tableContexMenu/table-context-menu-component.scss b/ui/src/app/shared/components/tableContexMenu/table-context-menu-component.scss
new file mode 100644
index 000000000..9dba836ff
--- /dev/null
+++ b/ui/src/app/shared/components/tableContexMenu/table-context-menu-component.scss
@@ -0,0 +1,28 @@
+.floating-div {
+  position: absolute;
+  transform: translate(3%, -90%);
+  background-color: #171c30; 
+  padding: 7px 10px;
+  border-radius: 30px;
+  border-bottom-left-radius: 0;
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.5);
+  z-index: 9999;
+}
+.button-action {
+  border: none;
+  background-color: transparent;
+  color: #969fb9;
+  outline: none;
+}
+.openview, .openedit, .openduplicate {
+  transition: color 0.3s ease;
+  &:hover {
+    color: #3089fc;
+  }
+}
+.opendelete {
+  transition: color 0.3s ease;
+  &:hover {
+    color: #df316f;
+  }
+}
diff --git a/ui/src/app/shared/components/tableContexMenu/table-context-menu-component.ts b/ui/src/app/shared/components/tableContexMenu/table-context-menu-component.ts
new file mode 100644
index 000000000..f9db4d635
--- /dev/null
+++ b/ui/src/app/shared/components/tableContexMenu/table-context-menu-component.ts
@@ -0,0 +1,180 @@
+import { Component, Input } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { NbDialogService } from '@nebular/theme';
+import { AgentGroupsService } from 'app/common/services/agents/agent.groups.service';
+import { AgentPoliciesService } from 'app/common/services/agents/agent.policies.service';
+import { AgentsService } from 'app/common/services/agents/agents.service';
+import { NotificationsService } from 'app/common/services/notifications/notifications.service';
+import { OrbService } from 'app/common/services/orb.service';
+import { SinksService } from 'app/common/services/sinks/sinks.service';
+import { AgentPolicyDeleteComponent } from 'app/pages/datasets/policies.agent/delete/agent.policy.delete.component';
+import { PolicyDuplicateComponent } from 'app/pages/datasets/policies.agent/duplicate/agent.policy.duplicate.confirmation';
+import { AgentDeleteComponent } from 'app/pages/fleet/agents/delete/agent.delete.component';
+import { AgentGroupDeleteComponent } from 'app/pages/fleet/groups/delete/agent.group.delete.component';
+import { AgentGroupDetailsComponent } from 'app/pages/fleet/groups/details/agent.group.details.component';
+import { SinkDeleteComponent } from 'app/pages/sinks/delete/sink.delete.component';
+
+@Component({
+  selector: 'ngx-table-context-menu',
+  templateUrl: './table-context-menu-component.html',
+  styleUrls: ['./table-context-menu-component.scss'],
+})
+export class TableContextMenuComponent {
+
+  @Input()
+  items: any[];
+
+  @Input()
+  top: number;
+
+  @Input()
+  left: number;
+
+  @Input()
+  rowObject: any;
+
+  constructor(
+    private router: Router,
+    private route: ActivatedRoute,
+    private dialogService: NbDialogService,
+    private orb: OrbService,
+    protected agentService: AgentsService,
+    protected notificationsService: NotificationsService,
+    private agentGroupsService: AgentGroupsService,
+    private sinkService: SinksService,
+    private agentPoliciesService: AgentPoliciesService,
+  ) {
+
+  }
+  handleClick(item: any) {
+    const { action } = item;
+    if (action === 'openview') {
+      this.openView();
+    } else if (action === 'opendelete') {
+      this.openDelete();
+    } else if (action === 'openduplicate') {
+      this.openDuplicate();
+    } else if (action === 'openedit') {
+      this.openGroupEdit();
+    }
+  }
+
+  openGroupEdit() {
+    this.router.navigate([`edit/${this.rowObject.id}`], {
+      state: { agentGroup: this.rowObject, edit: true },
+      relativeTo: this.route,
+    });
+  }
+
+  openView() {
+    const { objectType, id } = this.rowObject;
+    if (objectType === 'group') {
+      this.dialogService
+      .open(AgentGroupDetailsComponent, {
+        context: { agentGroup: this.rowObject },
+        autoFocus: true,
+        closeOnEsc: true,
+      })
+      .onClose.subscribe((resp) => {
+        if (resp) {
+          this.openGroupEdit();
+        }
+      });
+    } else {
+      this.router.navigate([`view/${id}`], {
+        relativeTo: this.route,
+      });
+    }
+  }
+  openDelete() {
+    const { objectType, name, id } = this.rowObject;
+
+    const deleteCallback = () => {
+      this.notificationsService.success(
+        `${objectType.charAt(0).toUpperCase() + objectType.slice(1)} successfully deleted`,
+        '',
+      );
+      this.orb.refreshNow();
+    };
+
+    if (objectType === 'agent') {
+      this.dialogService
+        .open(AgentDeleteComponent, {
+          context: { name },
+          autoFocus: true,
+          closeOnEsc: true,
+        })
+        .onClose.subscribe((confirm) => {
+          if (confirm) {
+            this.agentService.deleteAgent(id).subscribe(deleteCallback);
+          }
+        });
+    } else if (objectType === 'group') {
+      this.dialogService
+        .open(AgentGroupDeleteComponent, {
+          context: { name },
+          autoFocus: true,
+          closeOnEsc: true,
+        })
+        .onClose.subscribe((confirm) => {
+          if (confirm) {
+            this.agentGroupsService.deleteAgentGroup(id).subscribe(deleteCallback);
+          }
+        });
+    } else if (objectType === 'policy') {
+      this.dialogService
+        .open(AgentPolicyDeleteComponent, {
+          context: { name },
+          autoFocus: true,
+          closeOnEsc: true,
+        })
+        .onClose.subscribe((confirm) => {
+          if (confirm) {
+            this.agentPoliciesService.deleteAgentPolicy(id).subscribe(deleteCallback);
+          }
+        });
+    } else if (objectType === 'sink') {
+      this.dialogService
+        .open(SinkDeleteComponent, {
+          context: { sink: this.rowObject },
+          autoFocus: true,
+          closeOnEsc: true,
+        })
+        .onClose.subscribe((confirm) => {
+          if (confirm) {
+            this.sinkService.deleteSink(id).subscribe(deleteCallback);
+          }
+        });
+    }
+  }
+
+  openDuplicate() {
+    const policy = this.rowObject.name;
+    this.dialogService
+      .open(PolicyDuplicateComponent, {
+        context: { policy },
+        autoFocus: true,
+        closeOnEsc: true,
+      })
+      .onClose.subscribe((confirm) => {
+        if (confirm) {
+          this.duplicatePolicy(this.rowObject);
+        }
+      });
+  }
+  duplicatePolicy(agentPolicy: any) {
+    this.agentPoliciesService
+    .duplicateAgentPolicy(agentPolicy.id)
+    .subscribe((newAgentPolicy) => {
+      if (newAgentPolicy?.id) {
+        this.notificationsService.success(
+          'Agent Policy Duplicated',
+          `New Agent Policy Name: ${newAgentPolicy?.name}`,
+        );
+        this.router.navigate([`view/${newAgentPolicy.id}`], {
+          relativeTo: this.route,
+        });
+      }
+    });
+  }
+}
diff --git a/ui/src/app/shared/configurations/configurations_schemas.ts b/ui/src/app/shared/configurations/configurations_schemas.ts
new file mode 100644
index 000000000..173769483
--- /dev/null
+++ b/ui/src/app/shared/configurations/configurations_schemas.ts
@@ -0,0 +1,108 @@
+export const POLICY_OTEL_CONFIG_YAML =
+`receivers:
+  httpcheck:
+    targets:
+      - endpoint: http://orb.community
+        method: GET
+      - endpoint: https://orb.live
+        method: GET
+    collection_interval: 60s
+extensions:
+exporters:
+service:
+  pipelines:
+    metrics:
+      exporters:
+      receivers:
+        - httpcheck
+`;
+
+export const POLICY_PKTVISOR_CONFIG_YAML =
+`handlers:
+  modules:
+    default_dns:
+      type: dns
+    default_net:
+      type: net
+input:
+  input_type: pcap
+  tap: default_pcap
+kind: collection
+`;
+
+export const POLICY_OTEL_CONFIG_JSON =
+`{
+  "receivers": {
+    "httpcheck": {
+      "targets": [
+        {
+          "endpoint": "http://orb.community",
+          "method": "GET"
+        },
+        {
+          "endpoint": "https://orb.live",
+          "method": "GET"
+        }
+      ],
+      "collection_interval": "60s"
+    }
+  },
+  "extensions": null,
+  "exporters": null,
+  "service": {
+    "pipelines": {
+      "metrics": {
+        "exporters": null,
+        "receivers": [
+          "httpcheck"
+        ]
+      }
+    }
+  }
+}`;
+
+export const POLICY_PKTVISOR_CONFIG_JSON =
+`{
+  "handlers": {
+    "modules": {
+      "default_dns": {
+        "type": "dns"
+      },
+      "default_net": {
+        "type": "net"
+      }
+    }
+  },
+  "input": {
+    "input_type": "pcap",
+    "tap": "default_pcap"
+  },
+  "kind": "collection"
+}`;
+
+// yet to be defined
+export const POLICY_DIODE_CONFIG_YAML = ``;
+
+export const POLICY_DIODE_CONFIG_JSON = 
+`{
+  
+}`;
+
+export const SINK_OTLP_CONFIG_YAML =
+`authentication:
+  type: basicauth
+  password: ""
+  username: ""
+exporter:
+  endpoint: ""
+`;
+export const SINK_PROMETHEUS_CONFIG_YAML =
+`authentication:
+  type: basicauth
+  password: ""
+  username: ""
+exporter:
+  remote_host: ""
+`;
+
+
diff --git a/ui/src/app/shared/pipes/list-json.pipe.ts b/ui/src/app/shared/pipes/list-json.pipe.ts
new file mode 100644
index 000000000..1b80623b9
--- /dev/null
+++ b/ui/src/app/shared/pipes/list-json.pipe.ts
@@ -0,0 +1,14 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({name: 'jsonlist'})
+export class JsonListPipe implements PipeTransform {
+
+  transform(object: any): string {
+    if (!object || typeof object !== 'object') {
+      return '';
+    }
+    const entries = Object.entries(object);
+    const formattedList = entries.map(([key, value]) => `${key}: ${value}`).join(', ');
+    return formattedList;
+  }
+}
diff --git a/ui/src/app/shared/pipes/param-format.pipe.ts b/ui/src/app/shared/pipes/param-format.pipe.ts
new file mode 100644
index 000000000..beee3546b
--- /dev/null
+++ b/ui/src/app/shared/pipes/param-format.pipe.ts
@@ -0,0 +1,15 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'paramformatter',
+})
+export class ParamFormatterPipe implements PipeTransform {
+    transform(value: string | string[]): string {
+      if (typeof value === 'string') {
+        return value;
+      } else if (Array.isArray(value)) {
+        return value.join(', ');
+      }
+      return value;
+    }
+  }
diff --git a/ui/src/app/shared/shared.module.ts b/ui/src/app/shared/shared.module.ts
index 28621b2c4..acbb49f06 100644
--- a/ui/src/app/shared/shared.module.ts
+++ b/ui/src/app/shared/shared.module.ts
@@ -66,6 +66,10 @@ import {EmptyInputDirective} from 'app/shared/directives/empty-input.directive';
 import { AgentBackendsComponent } from './components/orb/agent/agent-backends/agent-backends.component';
 import { SinkDetailsComponent } from './components/orb/sink/sink-details/sink-details.component';
 import { SinkConfigComponent } from './components/orb/sink/sink-config/sink-config.component';
+import { TableContextMenuComponent } from './components/tableContexMenu/table-context-menu-component';
+import { JsonListPipe } from './pipes/list-json.pipe';
+import { ParamFormatterPipe } from './pipes/param-format.pipe';
+import { DragDropModule } from '@angular/cdk/drag-drop';
 
 @NgModule({
   imports: [
@@ -99,6 +103,7 @@ import { SinkConfigComponent } from './components/orb/sink/sink-config/sink-conf
     MatToolbarModule,
     NbAutocompleteModule,
     NbTabsetModule,
+    DragDropModule,
   ],
   declarations: [
     ConfirmationComponent,
@@ -108,6 +113,8 @@ import { SinkConfigComponent } from './components/orb/sink/sink-config/sink-conf
     PaginationComponent,
     AdvancedOptionsPipe,
     TagColorPipe,
+    ParamFormatterPipe,
+    JsonListPipe,
     TagChipPipe,
     TaglistChipPipe,
     ValidTagInputDirective,
@@ -136,6 +143,7 @@ import { SinkConfigComponent } from './components/orb/sink/sink-config/sink-conf
     EmptyInputDirective,
     SinkDetailsComponent,
     SinkConfigComponent,
+    TableContextMenuComponent,
   ],
   exports: [
     ThemeModule,
@@ -146,6 +154,8 @@ import { SinkConfigComponent } from './components/orb/sink/sink-config/sink-conf
     PaginationComponent,
     AdvancedOptionsPipe,
     TagColorPipe,
+    ParamFormatterPipe,
+    JsonListPipe,
     TagChipPipe,
     TaglistChipPipe,
     ValidTagInputDirective,
@@ -161,6 +171,7 @@ import { SinkConfigComponent } from './components/orb/sink/sink-config/sink-conf
     PolicyDetailsComponent,
     PolicyInterfaceComponent,
     PolicyDatasetsComponent,
+    TableContextMenuComponent,
     GroupedAgentsComponent,
     PolicyGroupsComponent,
     PrettyYamlPipe,
@@ -180,6 +191,8 @@ import { SinkConfigComponent } from './components/orb/sink/sink-config/sink-conf
     ToMillisecsPipe,
     AdvancedOptionsPipe,
     TagColorPipe,
+    ParamFormatterPipe,
+    JsonListPipe,
     TagChipPipe,
     TaglistChipPipe,
     ValidTagInputDirective,
diff --git a/ui/tslint.json b/ui/tslint.json
index f64dba908..e31c452a7 100644
--- a/ui/tslint.json
+++ b/ui/tslint.json
@@ -62,7 +62,6 @@
     "no-switch-case-fall-through": true,
     "no-trailing-whitespace": true,
     "no-unnecessary-initializer": true,
-    "no-use-before-declare": true,
     "no-var-keyword": true,
     "object-literal-sort-keys": false,
     "one-line": [
@@ -96,7 +95,6 @@
         "variable-declaration": "nospace"
       }
     ],
-    "typeof-compare": true,
     "unified-signatures": true,
     "variable-name": false,
     "whitespace": [
@@ -135,7 +133,6 @@
     "use-lifecycle-interface": true,
     "use-pipe-transform-interface": true,
     "component-class-suffix": true,
-    "directive-class-suffix": true,
-    "no-unused-variable": true
+    "directive-class-suffix": true
   }
 }