diff --git a/bundle/manifests/edp.epam.com_sonargroups.yaml b/bundle/manifests/edp.epam.com_sonargroups.yaml
index 5e28941..a9ee5f1 100644
--- a/bundle/manifests/edp.epam.com_sonargroups.yaml
+++ b/bundle/manifests/edp.epam.com_sonargroups.yaml
@@ -46,15 +46,6 @@ spec:
                 example: sonar-users
                 maxLength: 255
                 type: string
-              permissionTemplates:
-                description: PermissionTemplates is a list of permissions templates
-                  assigned to group.
-                example:
-                - scan
-                items:
-                  type: string
-                nullable: true
-                type: array
               permissions:
                 description: Permissions is a list of permissions assigned to group.
                 example:
diff --git a/bundle/manifests/edp.epam.com_sonarpermissiontemplates.yaml b/bundle/manifests/edp.epam.com_sonarpermissiontemplates.yaml
index 50e595a..797b05b 100644
--- a/bundle/manifests/edp.epam.com_sonarpermissiontemplates.yaml
+++ b/bundle/manifests/edp.epam.com_sonarpermissiontemplates.yaml
@@ -48,6 +48,19 @@ spec:
                 description: Description of sonar permission template.
                 example: Default permission template for new users
                 type: string
+              groupsPermissions:
+                additionalProperties:
+                  items:
+                    type: string
+                  type: array
+                description: GroupsPermissions is a map of groups and permissions
+                  assigned to them.
+                example:
+                  sonar-users:
+                  - codeviewer
+                  - scan
+                nullable: true
+                type: object
               name:
                 description: Name is a name of permission template. Name should be
                   unique across all permission templates. Do not edit this field after
diff --git a/bundle/manifests/sonar-operator.clusterserviceversion.yaml b/bundle/manifests/sonar-operator.clusterserviceversion.yaml
index 9781ce0..0235a04 100644
--- a/bundle/manifests/sonar-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/sonar-operator.clusterserviceversion.yaml
@@ -59,6 +59,9 @@ metadata:
           "spec": {
             "description": "Developers",
             "name": "sonar-developers",
+            "permissions": [
+              "admin"
+            ],
             "sonarRef": {
               "name": "sonar"
             }
@@ -80,6 +83,14 @@ metadata:
           "spec": {
             "default": true,
             "description": "EDP permission templates",
+            "groupsPermissions": {
+              "sonar-developers": [
+                "scan"
+              ],
+              "sonar-users": [
+                "issueadmin"
+              ]
+            },
             "name": "edp-default",
             "projectKeyPattern": ".+",
             "sonarRef": {
@@ -174,13 +185,13 @@ metadata:
       ]
     capabilities: Deep Insights
     categories: Developer Tools
-    containerImage: docker.io/epamedp/sonar-operator:3.0.0
-    createdAt: "2023-09-05T16:43:26Z"
+    containerImage: docker.io/epamedp/sonar-operator:3.1.0
+    createdAt: "2023-09-08T12:53:57Z"
     description: An Operator for managing Sonar entities.
     operators.operatorframework.io/builder: operator-sdk-v1.31.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/epam/edp-sonar-operator
-  name: sonar-operator.v3.0.0
+  name: sonar-operator.v3.1.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -261,7 +272,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: docker.io/epamedp/sonar-operator:3.0.0
+                image: docker.io/epamedp/sonar-operator:3.1.0
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -527,4 +538,4 @@ spec:
   provider:
     name: EPAM Delivery Platform
     url: https://epam.github.io/edp-install/
-  version: 3.0.0
+  version: 3.1.0
diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
index 46989a6..f2ea9f0 100644
--- a/bundle/metadata/annotations.yaml
+++ b/bundle/metadata/annotations.yaml
@@ -3,7 +3,7 @@ annotations:
   operators.operatorframework.io.bundle.mediatype.v1: registry+v1
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.metadata.v1: metadata/
-  operators.operatorframework.io.bundle.package.v1: edp-sonar-operator
+  operators.operatorframework.io.bundle.package.v1: sonar-operator
   operators.operatorframework.io.bundle.channels.v1: alpha
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.31.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
@@ -12,6 +12,3 @@ annotations:
   # Annotations for testing.
   operators.operatorframework.io.test.mediatype.v1: scorecard+v1
   operators.operatorframework.io.test.config.v1: tests/scorecard/
-
-  # Annotations for OpenShift.
-  com.redhat.openshift.versions: "v4.7-v4.13"
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index c67e09c..fa4564c 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: docker.io/epamedp/sonar-operator
-  newTag: 3.0.0
+  newTag: 3.1.0
diff --git a/config/manifests/bases/sonar-operator.clusterserviceversion.yaml b/config/manifests/bases/sonar-operator.clusterserviceversion.yaml
index 65163c2..98dfb19 100644
--- a/config/manifests/bases/sonar-operator.clusterserviceversion.yaml
+++ b/config/manifests/bases/sonar-operator.clusterserviceversion.yaml
@@ -5,10 +5,10 @@ metadata:
     alm-examples: '[]'
     capabilities: Deep Insights
     categories: Developer Tools
-    containerImage: docker.io/epamedp/sonar-operator:3.0.0
+    containerImage: docker.io/epamedp/sonar-operator:3.1.0
     description: An Operator for managing Sonar entities.
     repository: https://github.com/epam/edp-sonar-operator
-  name: sonar-operator.v3.0.0
+  name: sonar-operator.v3.1.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -95,4 +95,4 @@ spec:
   provider:
     name: EPAM Delivery Platform
     url: https://epam.github.io/edp-install/
-  version: 3.0.0
+  version: 3.1.0